OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2730 Category and Scalarmapper Legend: Improve the preferred size

Browse Source
This commit is contained in:
Jacob Støren 2018-05-04 13:21:56 +02:00
parent df6c9f69d1
commit d413df0aeb
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivTernarySaturationOverlayItem.cpp
View File

@ -257,5 +257,5 @@ void RivTernarySaturationOverlayItem::setRangeText(const cvf::String& soilRange,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::Vec2ui RivTernarySaturationOverlayItem::preferredSize() cvf::Vec2ui RivTernarySaturationOverlayItem::preferredSize()
{ {
return {120, 150}; // Could do more elaborate text width checks. return {140, 180}; // Could do more elaborate text width checks.
} }

4
Fwk/AppFwk/cafVizExtensions/cafCategoryLegend.cpp
View File

@ -503,7 +503,9 @@ cvf::Vec2ui CategoryLegend::preferredSize()
OverlayColorLegendLayoutInfo layout({200,200}); // Use default size OverlayColorLegendLayoutInfo layout({200,200}); // Use default size
layoutInfo(&layout); layoutInfo(&layout);
float prefferredYSize = 2*layout.margins.y() + (this->titleStrings().size() + m_categoryMapper->categoryCount() + 1)* layout.lineSpacing ; float prefferredYSize = 2 * layout.margins.y()
+ layout.lineSpacing * (this->titleStrings().size())
+ 1.5f * layout.lineSpacing * (m_categoryMapper->categoryCount() + 1);
unsigned int maxTickTextWidth = 0; unsigned int maxTickTextWidth = 0;
for (size_t cIdx = 0; cIdx < m_categoryMapper->categoryCount(); ++cIdx ) for (size_t cIdx = 0; cIdx < m_categoryMapper->categoryCount(); ++cIdx )

4
Fwk/AppFwk/cafVizExtensions/cafOverlayScalarMapperLegend.cpp
View File

@ -687,7 +687,9 @@ cvf::Vec2ui OverlayScalarMapperLegend::preferredSize()
OverlayColorLegendLayoutInfo layout({200,200}); // Use default size OverlayColorLegendLayoutInfo layout({200,200}); // Use default size
layoutInfo(&layout); layoutInfo(&layout);
float prefferredYSize = 2*layout.margins.y() + (this->titleStrings().size() + m_tickValues.size() )* layout.lineSpacing ; float prefferredYSize = 2 * layout.margins.y()
+ layout.lineSpacing * this->titleStrings().size()
+ 1.5f * layout.lineSpacing * m_tickValues.size();
unsigned int maxTickTextWidth = 0; unsigned int maxTickTextWidth = 0;
for (double tickValue : m_tickValues ) for (double tickValue : m_tickValues )