Renaming in the aftermath of the MDI window control refactorization. Aligned fieldChangedByUi in that respact as well.

ApplicationCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp

@@ -39,7 +39,7 @@ RimWellLogPlot* RicNewWellLogPlotFeatureImpl::createWellLogPlot()
     CVF_ASSERT(wellLogPlotColl);
 
     RimWellLogPlot* plot = new RimWellLogPlot();
-    plot->setAsPlotMDI();
+    plot->setAsPlotMdiWindow();
     wellLogPlotColl->wellLogPlots().push_back(plot);
 
     // Make sure the summary plot window is created and visible

ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp

@@ -53,7 +53,7 @@ RimWellAllocationPlot::RimWellAllocationPlot()
     m_accumulatedWellFlowPlot.uiCapability()->setUiHidden(true);
 
     m_accumulatedWellFlowPlot = new RimWellLogPlot;
-    this->setAsPlotMDI();
+    this->setAsPlotMdiWindow();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -61,7 +61,7 @@ RimWellAllocationPlot::RimWellAllocationPlot()
 //--------------------------------------------------------------------------------------------------
 RimWellAllocationPlot::~RimWellAllocationPlot()
 {
-    removeWidgetFromMDI();
+    removeMdiWindowFromMdiArea();
     
     delete m_accumulatedWellFlowPlot();
 
@@ -198,14 +198,21 @@ void RimWellAllocationPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedF
 {
     if (changedField == &m_showWindow)
     {
-        updateViewerWidgetBasic();
+        if (m_showWindow)
+        {
+            loadDataAndUpdate();
+        }
+        else
+        {
+            updateMdiWindowVisibility();
+        }
 
         uiCapability()->updateUiIconFromToggleField();
     }
     else if (changedField == &m_userName ||
         changedField == &m_showPlotTitle)
     {
-        updateViewerWidgetWindowTitle();
+        updateMdiWindowTitle();
     }
     else if (changedField == &m_simulationWell)
     {
@@ -232,7 +239,7 @@ QImage RimWellAllocationPlot::snapshotWindowContent()
 void RimWellAllocationPlot::setDescription(const QString& description)
 {
     m_userName = description;
-    this->updateViewerWidgetWindowTitle();
+    this->updateMdiWindowTitle();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -248,7 +255,7 @@ QString RimWellAllocationPlot::description() const
 //--------------------------------------------------------------------------------------------------
 void RimWellAllocationPlot::loadDataAndUpdate()
 {
-    updateViewerWidgetBasic();
+    updateMdiWindowVisibility();
     updateFromWell();
 }
 

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -187,24 +187,11 @@ void RimEclipseView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
     {
         if (showWindow)
         {
-            bool generateDisplayModel = (viewer() == NULL);
+            loadDataAndUpdate();
-            updateViewerWidgetBasic();
-
-            if (generateDisplayModel)
-            {
-                updateDisplayModelForWellResults();
-            }
         }
         else
         {
-            if (m_viewer)
+            updateMdiWindowVisibility();
-            {
-                this->setMdiWindowGeometry( RiuMainWindow::instance()->windowGeometryForViewer(m_viewer->layoutWidget()));
-                
-                RiuMainWindow::instance()->removeViewer(m_viewer->layoutWidget());
-                delete m_viewer;
-                m_viewer = NULL;
-            }
         }
 
         this->updateUiIconFromToggleField();
@@ -689,7 +676,7 @@ void RimEclipseView::loadDataAndUpdate()
 
     this->faultResultSettings()->customFaultResult()->loadResult();
 
-    updateViewerWidgetBasic();
+    updateMdiWindowVisibility();
 
     this->m_propertyFilterCollection()->loadAndInitializePropertyFilters();
 
@@ -697,6 +684,8 @@ void RimEclipseView::loadDataAndUpdate()
     this->faultCollection()->syncronizeFaults();
 
     m_reservoirGridPartManager->clearGeometryCache();
+    m_pipesPartManager->clearGeometryCache();
+    m_wellSpheresPartManager->clearGeometryCache();
 
     syncronizeWellsWithResults();
 

ApplicationCode/ProjectDataModel/RimGeoMechView.cpp

@@ -134,7 +134,7 @@ void RimGeoMechView::loadDataAndUpdate()
     progress.incrementProgress();
     progress.setProgressDescription("Create Display model");
    
-    updateViewerWidgetBasic();
+    updateMdiWindowVisibility();
 
     this->geoMechPropertyFilterCollection()->loadAndInitializePropertyFilters();
     
@@ -481,24 +481,11 @@ void RimGeoMechView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
     {
         if (showWindow)
         {
-            bool generateDisplayModel = (viewer() == NULL);
+            loadDataAndUpdate();
-            updateViewerWidgetBasic();
-
-            if (generateDisplayModel)
-            {
-                scheduleCreateDisplayModelAndRedraw();
-            }
         }
         else
         {
-            if (m_viewer)
+            updateMdiWindowVisibility();
-            {
-                this->setMdiWindowGeometry( RiuMainWindow::instance()->windowGeometryForViewer(m_viewer->layoutWidget()));
-
-                RiuMainWindow::instance()->removeViewer(m_viewer->layoutWidget());
-                delete m_viewer;
-                m_viewer = NULL;
-            }
         }
 
         this->updateUiIconFromToggleField();

ApplicationCode/ProjectDataModel/RimMdiWindowController.cpp

@@ -174,7 +174,7 @@ void RimMdiWindowController::updateViewerWidget()
             mainWindow->setActiveViewer(viewWidget());
         }
 
-        viewPdmObject()->updateViewerWidgetWindowTitle();
+        viewPdmObject()->updateMdiWindowTitle();
     }
     else
     {

ApplicationCode/ProjectDataModel/RimView.cpp

@@ -141,7 +141,7 @@ RimView::RimView(void)
     m_wellPathPipeVizModel = new cvf::ModelBasicList;
     m_wellPathPipeVizModel->setName("WellPathPipeModel");
 
-    this->setAs3DMDI();
+    this->setAs3DViewMdiWindow();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -171,7 +171,7 @@ RimView::~RimView(void)
 
     delete this->m_overlayInfoConfig();
 
-    removeWidgetFromMDI();
+    removeMdiWindowFromMdiArea();
 
     deleteViewWidget();
 
@@ -231,7 +231,7 @@ void RimView::updateViewWidgetAfterCreation()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimView::updateViewerWidgetWindowTitle()
+void RimView::updateMdiWindowTitle()
 {
     if (m_viewer)
     {
@@ -595,7 +595,7 @@ void RimView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QV
     }
     else if (changedField == &name)
     {
-        updateViewerWidgetWindowTitle();
+        updateMdiWindowTitle();
 
         if (viewController())
         {

ApplicationCode/ProjectDataModel/RimView.h

@@ -220,7 +220,7 @@ protected:
     virtual caf::PdmField<bool>*            getShowWindowField() override { return &showWindow; } 
     virtual QWidget*                        createViewWidget(QWidget* mainWindowParent) override; 
     virtual void                            updateViewWidgetAfterCreation() override; 
-    virtual void                            updateViewerWidgetWindowTitle() override;
+    virtual void                            updateMdiWindowTitle() override;
     virtual void                            deleteViewWidget() override;
 
     cvf::ref<cvf::UByteArray>               m_currentReservoirCellVisibility;

ApplicationCode/ProjectDataModel/RimViewWindow.cpp

@@ -33,9 +33,9 @@ RimViewWindow::RimViewWindow(void)
     m_windowController.uiCapability()->setUiTreeChildrenHidden(true);
 
     // Obsolete field
-    CAF_PDM_InitFieldNoDefault(&m_windowGeometry, "WindowGeometry", "", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&obsoleteField_windowGeometry, "WindowGeometry", "", "", "", "");
-    m_windowGeometry.uiCapability()->setUiHidden(true);
+    obsoleteField_windowGeometry.uiCapability()->setUiHidden(true);
-    m_windowGeometry.xmlCapability()->setIOWritable(false);
+    obsoleteField_windowGeometry.xmlCapability()->setIOWritable(false);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -49,7 +49,7 @@ RimViewWindow::~RimViewWindow(void)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimViewWindow::removeWidgetFromMDI()
+void RimViewWindow::removeMdiWindowFromMdiArea()
 {
     if ( m_windowController() ) m_windowController->removeWindowFromMDI();
 }
@@ -57,7 +57,7 @@ void RimViewWindow::removeWidgetFromMDI()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimViewWindow::handleViewerDeletion()
+void RimViewWindow::handleMdiWindowClosed()
 {
     if ( m_windowController() ) m_windowController->handleViewerDeletion();
 }
@@ -65,7 +65,7 @@ void RimViewWindow::handleViewerDeletion()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimViewWindow::updateViewerWidgetBasic()
+void RimViewWindow::updateMdiWindowVisibility()
 {
     if ( m_windowController() ) m_windowController->updateViewerWidget();
 }
@@ -110,7 +110,7 @@ void RimViewWindow::fieldChangedByUi(const caf::PdmFieldHandle* changedField, co
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimViewWindow::updateViewerWidgetWindowTitle()
+void RimViewWindow::updateMdiWindowTitle()
 {
     if ( viewWidget() )
     {
@@ -126,7 +126,7 @@ void RimViewWindow::updateViewerWidgetWindowTitle()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimViewWindow::setAsMDI(int mainWindowID)
+void RimViewWindow::setAsMdiWindow(int mainWindowID)
 {
     if ( !m_windowController() )
     {
@@ -145,7 +145,7 @@ void RimViewWindow::setAsMDI(int mainWindowID)
 
 void RimViewWindow::initAfterRead()
 {
-   if (m_windowGeometry.value().size() == 5)
+   if (obsoleteField_windowGeometry.value().size() == 5)
    {
        RimMdiWindowGeometry wg;
        int mainWindowID = -1;
@@ -156,13 +156,13 @@ void RimViewWindow::initAfterRead()
           mainWindowID = 1;
 
        wg.mainWindowID = mainWindowID; 
-       wg.x = m_windowGeometry.value()[0];
+       wg.x = obsoleteField_windowGeometry.value()[0];
-       wg.y = m_windowGeometry.value()[1];
+       wg.y = obsoleteField_windowGeometry.value()[1];
-       wg.width = m_windowGeometry.value()[2];
+       wg.width = obsoleteField_windowGeometry.value()[2];
-       wg.height = m_windowGeometry.value()[3];
+       wg.height = obsoleteField_windowGeometry.value()[3];
-       wg.isMaximized = m_windowGeometry.value()[4];
+       wg.isMaximized = obsoleteField_windowGeometry.value()[4];
 
-       setAsMDI(mainWindowID);
+       setAsMdiWindow(mainWindowID);
        setMdiWindowGeometry(wg);
    }
 }

ApplicationCode/ProjectDataModel/RimViewWindow.h

@@ -47,24 +47,23 @@ public:
     RimViewWindow(void);
     virtual ~RimViewWindow(void);
 
-    void                 removeWidgetFromMDI(); 
+    void                         handleMdiWindowClosed();
-    void                 handleViewerDeletion();
+                                 
-    void                 updateViewerWidgetBasic(); 
+    void                         setAs3DViewMdiWindow()  { setAsMdiWindow(0); }
-
+    void                         setAsPlotMdiWindow()    { setAsMdiWindow(1); }
-    void                 setAs3DMDI()   { setAsMDI(0); }
+                                 
-    void                 setAsPlotMDI() { setAsMDI(1); }
+    void                         setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry);
-
+    RimMdiWindowGeometry         mdiWindowGeometry();
-    void                 setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry);
+                                 
-    RimMdiWindowGeometry mdiWindowGeometry();
+    virtual QWidget*             viewWidget() = 0;
-
+                                 
-    virtual QImage       snapshotWindowContent() = 0;
+    virtual QImage               snapshotWindowContent() = 0;
-    virtual QWidget*     viewWidget() = 0;
+    virtual void                 zoomAll() = 0;
-
+                                 
-    virtual void         zoomAll() = 0;
+protected:                       
-
+                                 
-protected:
+    void                         removeMdiWindowFromMdiArea(); 
-    virtual void         fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
+    void                         updateMdiWindowVisibility(); 
-
 
     ///////// Interface for the Window controller
     friend class RimMdiWindowController;
@@ -72,20 +71,19 @@ protected:
     virtual caf::PdmField<bool>* getShowWindowField() = 0; 
     virtual QWidget*             createViewWidget(QWidget* mainWindowParent) = 0; 
     virtual void                 updateViewWidgetAfterCreation() {};
-    virtual void                 updateViewerWidgetWindowTitle(); // Has real default implementation
+    virtual void                 updateMdiWindowTitle(); // Has real default implementation
     virtual void                 deleteViewWidget() = 0; 
-
-
     //////////
 
-    void                 setAsMDI(int mainWindowID);
+    virtual void                 fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
+    virtual void                 initAfterRead() override;
+                                 
+private:                         
+    void                         setAsMdiWindow(int mainWindowID);
 
     caf::PdmChildField<RimMdiWindowController*> m_windowController;
 
     // Obsoleted field
-    virtual void initAfterRead() override;
+    caf::PdmField< std::vector<int> > obsoleteField_windowGeometry;
-    caf::PdmField< std::vector<int> > m_windowGeometry;
-
-
 };
 

ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp

@@ -86,7 +86,7 @@ RimWellLogPlot::RimWellLogPlot()
 //--------------------------------------------------------------------------------------------------
 RimWellLogPlot::~RimWellLogPlot()
 {
-    removeWidgetFromMDI();
+    removeMdiWindowFromMdiArea();
     
     m_tracks.deleteAllChildObjects();
 
@@ -106,7 +106,7 @@ void RimWellLogPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
         }
         else
         {
-            updateViewerWidgetBasic();
+            updateMdiWindowVisibility();
         }
 
         uiCapability()->updateUiIconFromToggleField();
@@ -123,7 +123,7 @@ void RimWellLogPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
     }
     else if (changedField == &m_userName)
     {
-        updateViewerWidgetWindowTitle();
+        updateMdiWindowTitle();
     }
     if (changedField == &m_depthType ||
         changedField == &m_depthUnit)
@@ -390,7 +390,7 @@ void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
 //--------------------------------------------------------------------------------------------------
 void RimWellLogPlot::loadDataAndUpdate()
 {
-    updateViewerWidgetBasic();
+    updateMdiWindowVisibility();
     updateTracks();
 }
 

ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp

@@ -86,7 +86,7 @@ RimSummaryPlot::RimSummaryPlot()
     CAF_PDM_InitField(&m_isAutoZoom, "AutoZoom", true, "Auto Zoom", "", "", "");
     m_isAutoZoom.uiCapability()->setUiHidden(true);
 
-    setAsPlotMDI();
+    setAsPlotMdiWindow();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -94,7 +94,7 @@ RimSummaryPlot::RimSummaryPlot()
 //--------------------------------------------------------------------------------------------------
 RimSummaryPlot::~RimSummaryPlot()
 {
-    removeWidgetFromMDI();
+    removeMdiWindowFromMdiArea();
 
     deleteViewWidget();
 
@@ -483,7 +483,7 @@ void RimSummaryPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
         }
         else
         {
-            updateViewerWidgetBasic();
+            updateMdiWindowVisibility();
         }
 
         uiCapability()->updateUiIconFromToggleField();
@@ -491,7 +491,7 @@ void RimSummaryPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
     else if (changedField == &m_userName || 
              changedField == &m_showPlotTitle)
     {
-        updateViewerWidgetWindowTitle();
+        updateMdiWindowTitle();
     }
 }
 
@@ -539,7 +539,7 @@ void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
 //--------------------------------------------------------------------------------------------------
 void RimSummaryPlot::loadDataAndUpdate()
 {
-   updateViewerWidgetBasic();    
+   updateMdiWindowVisibility();    
 
    for (RimSummaryCurveFilter* curveFilter: m_curveFilters)
    {
@@ -667,7 +667,7 @@ void RimSummaryPlot::deleteViewWidget()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimSummaryPlot::updateViewerWidgetWindowTitle()
+void RimSummaryPlot::updateMdiWindowTitle()
 {
     if (m_qwtPlot)
     {

ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h

@@ -108,7 +108,7 @@ private:
 
     virtual caf::PdmField<bool>*                    getShowWindowField() override { return &m_showWindow; } 
     virtual QWidget*                                createViewWidget(QWidget* mainWindowParent) override; 
-    void                                            updateViewerWidgetWindowTitle() override;
+    void                                            updateMdiWindowTitle() override;
     virtual void                                    deleteViewWidget() override; 
 
 private:

ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp

@@ -152,7 +152,7 @@ RiuSummaryQwtPlot::~RiuSummaryQwtPlot()
     if (m_plotDefinition)
     {
         m_plotDefinition->detachAllCurves();
-        m_plotDefinition->handleViewerDeletion();
+        m_plotDefinition->handleMdiWindowClosed();
     }
 
     m_plotMarker->detach();

ApplicationCode/UserInterface/RiuViewer.cpp

@@ -182,7 +182,7 @@ RiuViewer::~RiuViewer()
 {
     if (m_rimView)
     {
-        m_rimView->handleViewerDeletion();
+        m_rimView->handleMdiWindowClosed();
 
         m_rimView->cameraPosition = m_mainCamera->viewMatrix();
         m_rimView->cameraPointOfInterest = pointOfInterest();

ApplicationCode/UserInterface/RiuWellAllocationPlot.cpp

@@ -53,7 +53,7 @@ RiuWellAllocationPlot::~RiuWellAllocationPlot()
 {
     if (m_plotDefinition)
     {
-        m_plotDefinition->handleViewerDeletion();
+        m_plotDefinition->handleMdiWindowClosed();
     }
 }
 

ApplicationCode/UserInterface/RiuWellLogPlot.cpp

@@ -66,7 +66,7 @@ RiuWellLogPlot::~RiuWellLogPlot()
     if (m_plotDefinition)
     {
         m_plotDefinition->detachAllCurves();
-        m_plotDefinition->handleViewerDeletion();
+        m_plotDefinition->handleMdiWindowClosed();
     }
 }