mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-14 17:32:13 -05:00
Added a GUI theme selector in preferences and a new class for handling GUI changes.
Added a new feature for editing style sheets and variable colors and see immediately the result. Made Qwt plots (and items) stylable. Added icons, improved styling possibilities of QMinimizePanel, fixed minor bugs in RicThemeColorEditorFeature.
This commit is contained in:
1 parent
66ec3212c0
commit
87bc6acd65
50 files changed
+3178
-308
No files matched your search
@@ -141,7 +141,7 @@ RimPlotCurve::RimPlotCurve()
|
||||
|
||||
CAF_PDM_InitField( &m_isUsingAutoName, "AutoName", true, "Auto Name", "", "", "" );
|
||||
|
||||
CAF_PDM_InitField( &m_curveColor, "Color", cvf::Color3f( cvf::Color3::BLACK ), "Color", "", "", "" );
|
||||
CAF_PDM_InitField( &m_curveColor, "Color", RiaColorTools::systemPaletteTextColor3f(), "Color", "", "", "" );
|
||||
CAF_PDM_InitField( &m_fillColor, "FillColor", cvf::Color3f( -1.0, -1.0, -1.0 ), "Fill Color", "", "", "" );
|
||||
|
||||
CAF_PDM_InitField( &m_curveThickness, "Thickness", 1, "Line Thickness", "", "", "" );
|
||||
@@ -151,7 +151,13 @@ RimPlotCurve::RimPlotCurve()
|
||||
CAF_PDM_InitFieldNoDefault( &m_lineStyle, "LineStyle", "Line Style", "", "", "" );
|
||||
CAF_PDM_InitFieldNoDefault( &m_fillStyle, "FillStyle", "Area Fill Style", "", "", "" );
|
||||
CAF_PDM_InitFieldNoDefault( &m_pointSymbol, "PointSymbol", "Symbol", "", "", "" );
|
||||
CAF_PDM_InitField( &m_symbolEdgeColor, "SymbolEdgeColor", cvf::Color3f( cvf::Color3::BLACK ), "Symbol Edge Color", "", "", "" );
|
||||
CAF_PDM_InitField( &m_symbolEdgeColor,
|
||||
"SymbolEdgeColor",
|
||||
RiaColorTools::systemPaletteTextColor3f(),
|
||||
"Symbol Edge Color",
|
||||
"",
|
||||
"",
|
||||
"" );
|
||||
|
||||
CAF_PDM_InitField( &m_symbolSkipPixelDistance,
|
||||
"SymbolSkipPxDist",
|
||||
@@ -999,8 +1005,8 @@ void RimPlotCurve::setLineThickness( int thickness )
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimPlotCurve::resetAppearance()
|
||||
{
|
||||
setColor( cvf::Color3f( cvf::Color3::BLACK ) );
|
||||
setSymbolEdgeColor( cvf::Color3f( cvf::Color3::BLACK ) );
|
||||
setColor( RiaColorTools::systemPaletteTextColor3f() );
|
||||
setSymbolEdgeColor( RiaColorTools::systemPaletteTextColor3f() );
|
||||
setLineThickness( 2 );
|
||||
setLineStyle( RiuQwtPlotCurve::STYLE_SOLID );
|
||||
setSymbol( RiuQwtSymbol::SYMBOL_NONE );
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
|
||||
#include "RimEnsembleCurveSet.h"
|
||||
|
||||
#include "RiaColorTools.h"
|
||||
#include "RiaGuiApplication.h"
|
||||
#include "RiaStatisticsTools.h"
|
||||
#include "RiuAbstractLegendFrame.h"
|
||||
|
||||
#include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
#include "RimSummaryFilter.h"
|
||||
#include "RimSummaryPlot.h"
|
||||
|
||||
#include "RiuAbstractLegendFrame.h"
|
||||
#include "RiuCvfOverlayItemWidget.h"
|
||||
#include "RiuDraggableOverlayFrame.h"
|
||||
#include "RiuPlotMainWindow.h"
|
||||
@@ -115,7 +116,7 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
|
||||
|
||||
CAF_PDM_InitField( &m_colorMode, "ColorMode", caf::AppEnum<ColorMode>( ColorMode::SINGLE_COLOR ), "Coloring Mode", "", "", "" );
|
||||
|
||||
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3::BLACK ), "Color", "", "", "" );
|
||||
CAF_PDM_InitField( &m_color, "Color", RiaColorTools::systemPaletteTextColor3f(), "Color", "", "", "" );
|
||||
|
||||
CAF_PDM_InitField( &m_ensembleParameter, "EnsembleParameter", QString( "" ), "Ensemble Parameter", "", "", "" );
|
||||
m_ensembleParameter.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
|
||||
@@ -1033,7 +1034,6 @@ void RimEnsembleCurveSet::updateStatisticsCurves( const std::vector<RimSummaryCa
|
||||
curve->setParentQwtPlotNoReplot( plot->viewer() );
|
||||
m_curves.push_back( curve );
|
||||
curve->setColor( m_statistics->color() );
|
||||
curve->setColor( m_statistics->color() );
|
||||
|
||||
auto symbol = statisticsCurveSymbolFromAddress( address );
|
||||
curve->setSymbol( symbol );
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
|
||||
#include "RimEnsembleStatistics.h"
|
||||
|
||||
#include "RiaColorTools.h"
|
||||
#include "RifSummaryReaderInterface.h"
|
||||
|
||||
#include "RigStatisticsMath.h"
|
||||
|
||||
#include "RimEnsembleCurveSet.h"
|
||||
@@ -46,7 +46,8 @@ RimEnsembleStatistics::RimEnsembleStatistics()
|
||||
CAF_PDM_InitField( &m_includeIncompleteCurves, "IncludeIncompleteCurves", false, "Include Incomplete Curves", "", "", "" );
|
||||
|
||||
CAF_PDM_InitField( &m_warningLabel, "WarningLabel", QString( "Warning: Ensemble time range mismatch" ), "", "", "", "" );
|
||||
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3::BLACK ), "Color", "", "", "" );
|
||||
|
||||
CAF_PDM_InitField( &m_color, "Color", RiaColorTools::systemPaletteTextColor3f(), "Color", "", "", "" );
|
||||
|
||||
m_warningLabel.xmlCapability()->disableIO();
|
||||
m_warningLabel.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
|
||||
|
||||
Reference in new issue
Block a user