mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-30 17:10:19 -05:00
#14488 Surface and intersection improvements
Use I as the default direction when creating an IJK intersection, and center the fixed index on the I axis. Allow multiselect of surfaces for a Surface Curve. The field keyword is changed from Surface1 to Surfaces, with a keyword alias so existing project files are read as before. One curve is drawn per selected surface, each with its own label and color. Use the color defined in the Surfaces collection for Surface Band and Surface Curve. The color is shown as read only, and a Custom Color option allows the user to specify a color. Bands created from an ensemble surface keep the structural uncertainty colors, as the statistics surfaces share the same color.
This commit is contained in:
1 parent
ff7bf6c7c9
commit
b851801cfb
9 files changed
+192
-38
No files matched your search
@@ -44,13 +44,17 @@ public:
|
||||
RimSurfaceIntersectionBand();
|
||||
|
||||
void setSurfaces( RimSurface* surface1, RimSurface* surface2 );
|
||||
void setUseCustomColor( bool useCustomColor );
|
||||
void setBandColor( const cvf::Color3f& color );
|
||||
void setBandOpacity( double opacity );
|
||||
void setPolygonOffsetUnit( double offset );
|
||||
|
||||
RimAnnotationLineAppearance* lineAppearance() const;
|
||||
cvf::Color3f bandColor() const;
|
||||
float bandOpacity() const;
|
||||
|
||||
/// The colors defined in the Surfaces collection are used unless the user has specified a custom color
|
||||
cvf::Color3f bandColor() const;
|
||||
cvf::Color3f lineColor() const;
|
||||
float bandOpacity() const;
|
||||
|
||||
double polygonOffsetUnit() const;
|
||||
|
||||
@@ -66,12 +70,16 @@ private:
|
||||
void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
|
||||
|
||||
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
|
||||
void initAfterRead() override;
|
||||
void onObjectChanged( const caf::SignalEmitter* emitter );
|
||||
|
||||
QString objectName() const;
|
||||
|
||||
void updateColorFromSurface();
|
||||
|
||||
private:
|
||||
caf::PdmChildField<RimAnnotationLineAppearance*> m_lineAppearance;
|
||||
caf::PdmField<bool> m_useCustomColor;
|
||||
caf::PdmField<cvf::Color3f> m_bandColor;
|
||||
caf::PdmField<double> m_bandOpacity;
|
||||
caf::PdmField<double> m_bandPolygonOffsetUnit;
|
||||
|
||||
Reference in new issue
Block a user