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

#2479 2dIntersectionView. Remove 2dIntersectionViewCollection toggle in project tree

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-03-13 15:15:02 +01:00
parent 28830d3a1b
commit 15e242d1e3
3 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
View File

@ -361,16 +361,7 @@ int Rim2dIntersectionView::timeStepCount()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool Rim2dIntersectionView::isWindowVisible() bool Rim2dIntersectionView::isWindowVisible()
{ {
if (m_showWindow()) return m_showWindow();
{
Rim2dIntersectionViewCollection* viewColl = nullptr;
this->firstAncestorOrThisOfTypeAsserted(viewColl);
return viewColl->isActive();
}
else
{
return false;
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

18
ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.cpp
View File

@ -31,8 +31,6 @@ Rim2dIntersectionViewCollection::Rim2dIntersectionViewCollection()
{ {
CAF_PDM_InitObject("2D Intersection Views", ":/CrossSection16x16.png", "", ""); CAF_PDM_InitObject("2D Intersection Views", ":/CrossSection16x16.png", "", "");
CAF_PDM_InitField(&m_isActive, "IsActive", true, "Show", "","","");
CAF_PDM_InitFieldNoDefault(&m_intersectionViews, "IntersectionViews", "Intersection Views", ":/CrossSection16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_intersectionViews, "IntersectionViews", "Intersection Views", ":/CrossSection16x16.png", "", "");
m_intersectionViews.uiCapability()->setUiTreeHidden(true); m_intersectionViews.uiCapability()->setUiTreeHidden(true);
} }
@ -116,19 +114,3 @@ void Rim2dIntersectionViewCollection::syncFromExistingIntersections( bool doUpda
if (rimCase) rimCase->updateConnectedEditors(); if (rimCase) rimCase->updateConnectedEditors();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim2dIntersectionViewCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue)
{
if (changedField == &m_isActive)
{
for (auto view : m_intersectionViews)
{
view->updateMdiWindowVisibility();
}
}
}

5
ApplicationCode/ProjectDataModel/Rim2dIntersectionViewCollection.h
View File

@ -31,16 +31,11 @@ public:
Rim2dIntersectionViewCollection(); Rim2dIntersectionViewCollection();
virtual ~Rim2dIntersectionViewCollection(); virtual ~Rim2dIntersectionViewCollection();
bool isActive() { return m_isActive();}
void syncFromExistingIntersections( bool doUpdate ); void syncFromExistingIntersections( bool doUpdate );
std::vector<Rim2dIntersectionView*> views(); std::vector<Rim2dIntersectionView*> views();
private: private:
virtual caf::PdmFieldHandle* objectToggleField() override { return &m_isActive; }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmField<bool> m_isActive;
caf::PdmChildArrayField<Rim2dIntersectionView*> m_intersectionViews; caf::PdmChildArrayField<Rim2dIntersectionView*> m_intersectionViews;
}; };