mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-14 01:12:11 -05:00
(#540) Removed the Visible Cells Sync from Gui.
Moved UpateOverrides from init afterRead to OpenProject
This commit is contained in:
1 parent
44d1aaa3f1
commit
b15b23b856
3 files changed
+15
-3
No files matched your search
@@ -94,6 +94,8 @@
|
|||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#endif
|
#endif
|
||||||
|
#include "RimViewLinkerCollection.h"
|
||||||
|
#include "RimViewLinker.h"
|
||||||
|
|
||||||
namespace caf
|
namespace caf
|
||||||
{
|
{
|
||||||
@@ -402,6 +404,11 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
|
|||||||
caseProgress.incrementProgress();
|
caseProgress.incrementProgress();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
m_project->viewLinkerCollection()->viewLinker()->updateOverrides();
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->wellLogPlotCollection())
|
if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->wellLogPlotCollection())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -71,7 +71,10 @@ RimViewController::RimViewController(void)
|
|||||||
CAF_PDM_InitField(&m_syncCellResult, "SyncCellResult", false, "Cell Result", "", "", "");
|
CAF_PDM_InitField(&m_syncCellResult, "SyncCellResult", false, "Cell Result", "", "", "");
|
||||||
|
|
||||||
CAF_PDM_InitField(&m_syncVisibleCells, "SyncVisibleCells", false, "Visible Cells", "", "", "");
|
CAF_PDM_InitField(&m_syncVisibleCells, "SyncVisibleCells", false, "Visible Cells", "", "", "");
|
||||||
//syncVisibleCells.uiCapability()->setUiHidden(true); // For now
|
/// We do not support this. Consider to remove sometime
|
||||||
|
m_syncVisibleCells.uiCapability()->setUiHidden(true);
|
||||||
|
m_syncVisibleCells.xmlCapability()->setIOWritable(false);
|
||||||
|
m_syncVisibleCells.xmlCapability()->setIOReadable(false);
|
||||||
|
|
||||||
CAF_PDM_InitField(&m_syncRangeFilters, "SyncRangeFilters", true, "Range Filters", "", "", "");
|
CAF_PDM_InitField(&m_syncRangeFilters, "SyncRangeFilters", true, "Range Filters", "", "", "");
|
||||||
CAF_PDM_InitField(&m_syncPropertyFilters, "SyncPropertyFilters", true,"Property Filters", "", "", "");
|
CAF_PDM_InitField(&m_syncPropertyFilters, "SyncPropertyFilters", true,"Property Filters", "", "", "");
|
||||||
@@ -216,8 +219,9 @@ void RimViewController::fieldChangedByUi(const caf::PdmFieldHandle* changedField
|
|||||||
void RimViewController::initAfterRead()
|
void RimViewController::initAfterRead()
|
||||||
{
|
{
|
||||||
updateOptionSensitivity();
|
updateOptionSensitivity();
|
||||||
updateOverrides();
|
|
||||||
updateDisplayNameAndIcon();
|
updateDisplayNameAndIcon();
|
||||||
|
|
||||||
|
// Update overrides is now done on load project in Application
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -59,6 +59,8 @@ public:
|
|||||||
void updateDependentViews();
|
void updateDependentViews();
|
||||||
void removeViewController(RimViewController* viewController);
|
void removeViewController(RimViewController* viewController);
|
||||||
|
|
||||||
|
void updateOverrides();
|
||||||
|
|
||||||
void updateCamera(RimView* sourceView);
|
void updateCamera(RimView* sourceView);
|
||||||
void updateTimeStep(RimView* sourceView, int timeStep);
|
void updateTimeStep(RimView* sourceView, int timeStep);
|
||||||
void updateScaleZ(RimView* sourceView, double scaleZ);
|
void updateScaleZ(RimView* sourceView, double scaleZ);
|
||||||
@@ -89,7 +91,6 @@ protected:
|
|||||||
private:
|
private:
|
||||||
void allViewsForCameraSync(RimView* source, std::vector<RimView*>& views);
|
void allViewsForCameraSync(RimView* source, std::vector<RimView*>& views);
|
||||||
|
|
||||||
void updateOverrides();
|
|
||||||
void removeOverrides();
|
void removeOverrides();
|
||||||
|
|
||||||
static bool isBoundingBoxesOverlappingOrClose(const cvf::BoundingBox& sourceBB, const cvf::BoundingBox& destBB);
|
static bool isBoundingBoxesOverlappingOrClose(const cvf::BoundingBox& sourceBB, const cvf::BoundingBox& destBB);
|
||||||
|
|||||||
Reference in new issue
Block a user