OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 09:26:33 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.h
+7 -3
View File
@@ -34,16 +34,20 @@ public:
bool isStacked() const;
bool isStackedWithPhaseColors() const;
void setIsStacked( bool stacked );
Qt::BrushStyle fillStyle() const override;
void defaultUiOrdering( caf::PdmUiOrdering& uiOrdering );
void stackingUiOrdering( caf::PdmUiOrdering& uiOrdering );
protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void stackingUiOrdering( caf::PdmUiOrdering& uiOrdering );
void defaultUiOrdering( caf::PdmUiOrdering& uiOrdering );
private:
void onFillColorChanged( const caf::SignalEmitter* emitter ) override;
protected:
caf::PdmField<bool> m_isStacked;
private:
caf::PdmField<bool> m_isStackedWithPhaseColors;
};