diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp index da58fa2922..537d94952c 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp @@ -35,7 +35,7 @@ #include -CAF_PDM_XML_ABSTRACT_SOURCE_INIT(Rim2dIntersectionView, "Intersection2dView"); +CAF_PDM_SOURCE_INIT(Rim2dIntersectionView, "Intersection2dView"); const cvf::Mat4d defaultIntersectinoViewMatrix(1, 0, 0, 0, 0, 0, 1, 0, @@ -55,11 +55,13 @@ Rim2dIntersectionView::Rim2dIntersectionView(void) m_showWindow = false; m_scaleTransform = new cvf::Transform(); m_intersectionVizModel = new cvf::ModelBasicList; + hasUserRequestedAnimation = true; - isPerspectiveView = false; ((RiuViewerToViewInterface*)this)->setCameraPosition(defaultIntersectinoViewMatrix ); - disableGridBox(); + + disableGridBoxField(); + disablePerspectiveProjectionField(); } //-------------------------------------------------------------------------------------------------- @@ -257,6 +259,7 @@ void Rim2dIntersectionView::createDisplayModel() if ( this->hasUserRequestedAnimation() ) { m_viewer->setCurrentFrame(m_currentTimeStep); + updateCurrentTimeStep(); } if ( this->viewer()->mainCamera()->viewMatrix() == defaultIntersectinoViewMatrix ) diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.cpp b/ApplicationCode/ProjectDataModel/Rim3dView.cpp index b7dbbee695..1aed74ce86 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dView.cpp @@ -863,9 +863,21 @@ void Rim3dView::forceShowWindowOn() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void Rim3dView::disableGridBox() +void Rim3dView::disableGridBoxField() { m_showGridBox = false; + m_showGridBox.uiCapability()->setUiHidden(true); + m_showGridBox.xmlCapability()->setIOWritable(false); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void Rim3dView::disablePerspectiveProjectionField() +{ + isPerspectiveView = false; + isPerspectiveView.uiCapability()->setUiHidden(true); + isPerspectiveView.xmlCapability()->setIOWritable(false); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.h b/ApplicationCode/ProjectDataModel/Rim3dView.h index 5aa6f4a69b..06166f50b9 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dView.h +++ b/ApplicationCode/ProjectDataModel/Rim3dView.h @@ -148,7 +148,8 @@ public: protected: virtual void setDefaultView(); - void disableGridBox(); + void disableGridBoxField(); + void disablePerspectiveProjectionField(); RimWellPathCollection* wellPathCollection(); void addWellPathsToModel(cvf::ModelBasicList* wellPathModelBasicList, diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp index 1d26e788c5..34b94d6fc2 100644 --- a/ApplicationCode/ProjectDataModel/RimCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimCase.cpp @@ -55,7 +55,6 @@ RimCase::RimCase() : m_isInActiveDestruction(false) CAF_PDM_InitFieldNoDefault(&m_2dIntersectionViewCollection, "IntersectionViewCollection", "2D Intersection Views", ":/CrossSections16x16.png", "", ""); m_2dIntersectionViewCollection.uiCapability()->setUiTreeHidden(true); - m_2dIntersectionViewCollection.xmlCapability()->setIOWritable(false); // Temporarily until something of value are present. m_2dIntersectionViewCollection = new Rim2dIntersectionViewCollection(); }