diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp index c54598f23c..7379a33305 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.cpp +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.cpp @@ -165,7 +165,7 @@ RimReservoirView::RimReservoirView() CAF_PDM_InitField(&showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", ""); CAF_PDM_InitField(&showInvalidCells, "ShowInvalidCells", false, "Show Invalid Cells", "", "", ""); cvf::Color3f defBackgColor = preferences->defaultViewerBackgroundColor(); - CAF_PDM_InitField(&backgroundColor, "ViewBackgroundColor", defBackgColor, "Viewer Background", "", "", ""); + CAF_PDM_InitField(&backgroundColor, "ViewBackgroundColor", defBackgColor, "Background", "", "", ""); CAF_PDM_InitField(&cameraPosition, "CameraPosition", cvf::Mat4d::IDENTITY, "", "", "", ""); @@ -1610,3 +1610,23 @@ caf::PdmFieldHandle* RimReservoirView::objectToggleField() return &showWindow; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimReservoirView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +{ + caf::PdmUiGroup* viewGroup = uiOrdering.addNewGroup("Viewer"); + viewGroup->add(&name); + viewGroup->add(&backgroundColor); + + caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Grid Appearance"); + gridGroup->add(&scaleZ); + gridGroup->add(&meshMode); + gridGroup->add(&surfaceMode); + + caf::PdmUiGroup* cellGroup = uiOrdering.addNewGroup("Cell Visibility"); + cellGroup->add(&showMainGrid); + cellGroup->add(&showInactiveCells); + cellGroup->add(&showInvalidCells); +} + diff --git a/ApplicationCode/ProjectDataModel/RimReservoirView.h b/ApplicationCode/ProjectDataModel/RimReservoirView.h index 50626d2ac2..f7212cfb3d 100644 --- a/ApplicationCode/ProjectDataModel/RimReservoirView.h +++ b/ApplicationCode/ProjectDataModel/RimReservoirView.h @@ -191,12 +191,14 @@ public: protected: virtual void initAfterRead(); virtual void setupBeforeSave(); + virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ); // Really private private: void syncronizeWellsWithResults(); void clampCurrentTimestep(); + private: caf::PdmField m_currentTimeStep; QPointer m_viewer;