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

#3860 Z scale label. Do not show in contour map

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-12-13 13:20:49 +01:00
parent 1311d4eb4d
commit 01249ace3a
5 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Rim3dView.h
View File

@ -218,11 +218,11 @@ protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void updateViewWidgetAfterCreation() override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
private:
// Overridden ViewWindow methods:
QWidget* createViewWidget(QWidget* mainWindowParent) override;
void updateMdiWindowTitle() override;
void deleteViewWidget() override;
QWidget* viewWidget() override;

15
ApplicationCode/ProjectDataModel/RimContourMapView.cpp
View File

@ -388,3 +388,18 @@ std::set<RivCellSetEnum> RimContourMapView::allVisibleFaultGeometryTypes() const
}
return faultGeoTypes;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* RimContourMapView::createViewWidget(QWidget* mainWindowParent)
{
auto widget = Rim3dView::createViewWidget(mainWindowParent);
if (viewer())
{
viewer()->showZScaleLabel(false);
viewer()->hideZScaleCheckbox(true);
}
return widget;
}

2
ApplicationCode/ProjectDataModel/RimContourMapView.h
View File

@ -54,6 +54,8 @@ protected:
virtual std::set<RivCellSetEnum> allVisibleFaultGeometryTypes() const override;
QWidget* createViewWidget(QWidget* mainWindowParent) override;
private:
cvf::ref<RivContourMapProjectionPartMgr> m_contourMapProjectionPartMgr;
caf::PdmChildField<RimContourMapProjection*> m_contourMapProjection;

9
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -152,6 +152,7 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
m_zScaleLabel->setAlignment(Qt::AlignLeft);
m_zScaleLabel->setText(QString("Z: "));
m_showZScaleLabel = true;
m_hideZScaleCheckbox = false;
QPalette versionInfoPalette = p;
QColor versionInfoLabelColor = p.color(QPalette::Window);
@ -487,6 +488,14 @@ void RiuViewer::setInfoText(QString text)
m_infoLabel->setText(text);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewer::hideZScaleCheckbox(bool hide)
{
m_hideZScaleCheckbox = hide;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/UserInterface/RiuViewer.h
View File

@ -83,6 +83,7 @@ public:
void showInfoText(bool enable);
void setInfoText(QString text);
void hideZScaleCheckbox(bool hide);
void showZScaleLabel(bool enable);
void setZScale(int scale);
@ -158,6 +159,7 @@ private:
QLabel* m_zScaleLabel;
bool m_showZScaleLabel;
bool m_hideZScaleCheckbox;
QProgressBar* m_animationProgress;
bool m_showAnimProgress;