Convert to Unix format

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Module.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index 2c95f19a24fc043d7caf3b9aea7e251de8ba35a5..c436594d9192a536fec78d1c26fbd8b50dcebfe8 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -117,6 +117,8 @@ bool HYDROGUI_Module::deactivateModule( SUIT_Study* theStudy )
       getApp()->removeViewManager( aViewManager );
   myViewManagerMap.clear();
 
+  myObjectStateMap.clear();
+
   setMenuShown( false );
   setToolShown( false );
 
@@ -149,6 +151,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
 
   bool anIsImage = false;
   bool anIsCompositeImage = false;
+  bool anIsMustBeUpdatedImage = false;
   bool anIsPolyline = false;
   bool anIsVisualState = false;
 
@@ -160,7 +163,7 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
     {
       anIsSelection = true;
 
-      bool aVisibility = anObject->IsVisible( aViewId );
+      bool aVisibility = isObjectVisible( aViewId, anObject );
       anIsVisibleInSelection |= aVisibility;
       anIsHiddenInSelection |= !aVisibility;
 
@@ -169,7 +172,10 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
         anIsImage = true;
         Handle(HYDROData_Image) anImage = Handle(HYDROData_Image)::DownCast( anObject );
         if( !anImage.IsNull() )
+        {
           anIsCompositeImage = anImage->NbReferences() > 0;
+          anIsMustBeUpdatedImage = anImage->MustBeUpdated();
+        }
       }
       else if( anObject->GetKind() == KIND_POLYLINE )
         anIsPolyline = true;
@@ -183,7 +189,14 @@ void HYDROGUI_Module::contextMenuPopup( const QString& theClient,
     theMenu->addAction( action( SaveVisualStateId ) );
     theMenu->addSeparator();
   }
-  else if( anIsSelection && aSeq.Length() == 1 )
+
+  if( anIsSelection && anIsMustBeUpdatedImage )
+  {
+    theMenu->addAction( action( UpdateImageId ) );
+    theMenu->addSeparator();
+  }
+
+  if( anIsSelection && aSeq.Length() == 1 )
   {
     if( anIsImage )
     {
@@ -237,15 +250,25 @@ void HYDROGUI_Module::update( const int flags )
   // from one of the methods called below
   setUpdateEnabled( false );
 
-  if( ( flags & UF_Model ) && getDataModel() )
+  if( ( flags & UF_Viewer ) )
+    updateGV( flags & UF_GV_Init,
+              flags & UF_GV_Forced );
+
+  if( ( flags & UF_Model ) && getDataModel() && getApp() )
+  {
     getDataModel()->update( getStudyId() );
 
-  if( ( flags & UF_ObjBrowser ) && getApp() )
+    // Temporary workaround to prevent breaking
+    // the selection in the object browser.
+    // Note: processEvents() should be called after updateGV(),
+    // otherwise the application crashes from time to time.
+    qApp->processEvents(); 
     getApp()->updateObjectBrowser( true );
+  }
 
-  if( ( flags & UF_Viewer ) )
-    updateGV( flags & UF_GV_Init,
-              flags & UF_GV_Forced );
+  // Object browser is currently updated by using UF_Model flag
+  //if( ( flags & UF_ObjBrowser ) && getApp() )
+  //  getApp()->updateObjectBrowser( true );
 
   if( ( flags & UF_Controls ) && getApp() )
     getApp()->updateActions();
@@ -323,6 +346,38 @@ void HYDROGUI_Module::setViewManagerRole( SUIT_ViewManager* theViewManager,
   }
 }
 
+bool HYDROGUI_Module::isObjectVisible( const int theViewId,
+                                       const Handle(HYDROData_Object)& theObject )
+{
+  if( theObject.IsNull() )
+    return false;
+
+  ViewId2Name2ObjectStateMap::const_iterator anIter1 = myObjectStateMap.find( theViewId );
+  if( anIter1 != myObjectStateMap.end() )
+  {
+    const Name2ObjectStateMap& aName2ObjectStateMap = anIter1.value();
+    Name2ObjectStateMap::const_iterator anIter2 = aName2ObjectStateMap.find( theObject->GetName());
+    if( anIter2 != aName2ObjectStateMap.end() )
+    {
+      const ObjectState& anObjectState = anIter2.value();
+      return anObjectState.Visibility;
+    }
+  }
+  return false;
+}
+
+void HYDROGUI_Module::setObjectVisible( const int theViewId,
+                                        const Handle(HYDROData_Object)& theObject,
+                                        const bool theState )
+{
+  if( !theObject.IsNull() )
+  {
+    Name2ObjectStateMap& aName2ObjectStateMap = myObjectStateMap[ theViewId ];
+    ObjectState& anObjectState = aName2ObjectStateMap[ theObject->GetName() ];
+    anObjectState.Visibility = theState;
+  }
+}
+
 CAM_DataModel* HYDROGUI_Module::createDataModel()
 {
   return new HYDROGUI_DataModel( this );
@@ -338,13 +393,6 @@ void HYDROGUI_Module::customEvent( QEvent* e )
     {
       if( GraphicsView_Viewer* aViewer = dynamic_cast<GraphicsView_Viewer*>( aViewFrame->getViewer() ) )
       {
-        SUIT_ViewManager* aViewManager = aViewer->getViewManager();
-        ViewManagerRole aRole = getViewManagerRole( aViewManager );
-        if( aRole == VMR_General )
-          update( UF_Viewer );
-
-        aViewer->activateTransform( GraphicsView_Viewer::FitAll );
-
         if( GraphicsView_ViewPort* aViewPort = aViewer->getActiveViewPort() )
         {
           aViewPort->setInteractionFlag( GraphicsView_ViewPort::TraceBoundingRect );
@@ -354,6 +402,13 @@ void HYDROGUI_Module::customEvent( QEvent* e )
           //ouv: temporarily commented
           //aViewPort->setViewLabelPosition( GraphicsView_ViewPort::VLP_BottomLeft, true );
         }
+
+        SUIT_ViewManager* aViewManager = aViewer->getViewManager();
+        ViewManagerRole aRole = getViewManagerRole( aViewManager );
+        if( aRole != VMR_TransformImage )
+          update( UF_Viewer );
+
+        aViewer->activateTransform( GraphicsView_Viewer::FitAll );
       }
     }
   }