Update flags and update() method added

diff --git a/src/SalomeApp/Makefile.in b/src/SalomeApp/Makefile.in
index 832308710a39230b5a2638e82d4fe094592967a8..f5f7ac834faea26e94682cc784d38b66511cb5e8 100755 (executable)
--- a/src/SalomeApp/Makefile.in
+++ b/src/SalomeApp/Makefile.in
@@ -42,7 +42,8 @@ EXPORT_HEADERS= SalomeApp.h \
                SalomeApp_StudyPropertiesDlg.h \
                SalomeApp_CheckFileDlg.h \
                SalomeApp_Operation.h \
-               SalomeApp_Dialog.h
+               SalomeApp_Dialog.h \
+               SalomeApp_UpdateFlags.h
 
 # .po files to transform in .qm
 PO_FILES = SalomeApp_images.po \
@@ -51,7 +52,8 @@ PO_FILES = SalomeApp_images.po \
 # Libraries targets
 LIB = libSalomeApp.la
 
-LIB_SRC= SalomeApp_AboutDlg.cxx \
+LIB_SRC= SalomeApp_Module.cxx \
+        SalomeApp_AboutDlg.cxx \
          SalomeApp_Application.cxx \
         SalomeApp_DataModel.cxx \
         SalomeApp_DataObject.cxx \
@@ -60,7 +62,6 @@ LIB_SRC= SalomeApp_AboutDlg.cxx \
         SalomeApp_VTKSelector.cxx \
         SalomeApp_OBSelector.cxx \
         SalomeApp_GLSelector.cxx \
-        SalomeApp_Module.cxx \
         SalomeApp_Study.cxx \
         SalomeApp_WidgetContainer.cxx \
         SalomeApp_ExceptionHandler.cxx \

diff --git a/src/SalomeApp/SalomeApp_Module.cxx b/src/SalomeApp/SalomeApp_Module.cxx
index 75e3a8491ace5714ffd9bba53357dd49400f5912..caa39a15664fffffd5b9a89390ecb6b5b88474ff 100644 (file)
--- a/src/SalomeApp/SalomeApp_Module.cxx
+++ b/src/SalomeApp/SalomeApp_Module.cxx
@@ -9,6 +9,7 @@
 #include "SalomeApp_DataModel.h"
 #include "SalomeApp_Application.h"
 #include "SalomeApp_Preferences.h"
+#include "SalomeApp_UpdateFlags.h"
 
 #include <OB_Browser.h>
 
@@ -19,6 +20,13 @@
 
 #include <QtxPopupMgr.h>
 
+#include <SVTK_ViewWindow.h>
+#include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewPort3d.h>
+#include <GLViewer_ViewFrame.h>
+#include <GLViewer_ViewPort.h>
+#include <Plot2d_ViewWindow.h>
+
 SalomeApp_Module::SalomeApp_Module( const QString& name )
 : CAM_Module( name ),
 myPopupMgr( 0 )
@@ -174,3 +182,54 @@ void SalomeApp_Module::setPreferenceProperty( const int id, const QString& prop,
   if ( pref )
     pref->setProperty( id, prop, var );
 }
+
+void SalomeApp_Module::update( const int flags )
+{
+  if ( flags & UF_Model )
+  {
+    if( CAM_DataModel* aDataModel = dataModel() )
+      if( SalomeApp_DataModel* aModel = dynamic_cast<SalomeApp_DataModel*>( aDataModel ) )
+        aModel->update( 0, dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );
+  }
+  else if ( flags & UF_ObjBrowser )
+    getApp()->objectBrowser()->updateTree( 0 );
+  else if ( flags & UF_Controls )
+    updateControls();
+  else if ( flags & UF_Viewer )
+  {
+    if ( SUIT_ViewManager* viewMgr = getApp()->activeViewManager() )
+      if ( SUIT_ViewWindow* viewWnd = viewMgr->getActiveView() )
+      {
+        if ( viewWnd->inherits( "SVTK_ViewWindow" ) )
+          ( (SVTK_ViewWindow*)viewWnd )->Repaint();
+        else if ( viewWnd->inherits( "OCCViewer_ViewWindow" ) )
+          ( (OCCViewer_ViewWindow*)viewWnd )->getViewPort()->onUpdate();
+        else if ( viewWnd->inherits( "Plot2d_ViewWindow" ) )
+          ( (Plot2d_ViewWindow*)viewWnd )->getViewFrame()->Repaint();
+        else if ( viewWnd->inherits( "GLViewer_ViewFrame" ) )
+          ( (GLViewer_ViewFrame*)viewWnd )->getViewPort()->onUpdate();
+      }
+  }
+  
+}
+
+void SalomeApp_Module::updateControls()
+{
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/src/SalomeApp/SalomeApp_Module.h b/src/SalomeApp/SalomeApp_Module.h
index 7ac60246213037c116f0bc6601f8ba9eff094085..4ae6bea4c92eb76e4e21be0d7b72f534b01bb9b5 100644 (file)
--- a/src/SalomeApp/SalomeApp_Module.h
+++ b/src/SalomeApp/SalomeApp_Module.h
@@ -58,12 +58,19 @@ public:
   virtual void                        contextMenuPopup( const QString&, QPopupMenu*, QString& );
 
   virtual void                        createPreferences();
-
+  
   // Convenient shortcuts
   SalomeApp_Application*              getApp() const;
-  
-  void                                updateObjBrowser( bool = true, SUIT_DataObject* = 0 );
 
+  virtual void                        update( const int );
+  // Update viewer or/and object browser etc. in accordance with update flags
+  // ( see SalomeApp_UpdateFlags enumeration ). Derived modules can redefine this method
+  // for their own purposes
+    
+  void                                updateObjBrowser( bool = true, SUIT_DataObject* = 0 );
+  // Update object bropwser ( for updating model or whole object browser use update() method
+  // can be used )
+  
   virtual void                        selectionChanged();
   virtual void                        preferencesChanged( const QString&, const QString& );
 
@@ -86,11 +93,12 @@ protected:
 
   virtual CAM_DataModel*              createDataModel();
   virtual SalomeApp_Selection*        createSelection() const;
+  virtual void                        updateControls();
 
   int                                 addPreference( const QString& label );
   int                                 addPreference( const QString& label, const int pId, const int = -1,
-                                                    const QString& section = QString::null,
-                                                    const QString& param = QString::null );
+                                                     const QString& section = QString::null,
+                                                     const QString& param = QString::null );
   QVariant                            preferenceProperty( const int, const QString& ) const;
   void                                setPreferenceProperty( const int, const QString&, const QVariant& );
 

diff --git a/src/SalomeApp/SalomeApp_Operation.cxx b/src/SalomeApp/SalomeApp_Operation.cxx
index b9d32c464af5adf5f989a97c62e8081a267e2236..d5ca2fea777432b8f3d68da5f0c05d15baf93173 100755 (executable)
--- a/src/SalomeApp/SalomeApp_Operation.cxx
+++ b/src/SalomeApp/SalomeApp_Operation.cxx
@@ -208,8 +208,15 @@ bool SalomeApp_Operation::eventFilter( QObject* obj, QEvent* e )
   return SUIT_Operation::eventFilter( obj, e );
 }
 
-
-
+//=======================================================================
+// name    : eventFilter
+// Purpose : Block mouse and key events if operator is not active one
+//=======================================================================
+void SalomeApp_Operation::update( const int flags )
+{
+  if ( myModule != 0 )
+    myModule->update( flags );
+}
 
 
 

diff --git a/src/SalomeApp/SalomeApp_Operation.h b/src/SalomeApp/SalomeApp_Operation.h
index 0f767ad816ee65fe2a13728cbd97ad416646d407..c6c1875b7f79ffb1cc84b8ff306a5068d2f724e7 100755 (executable)
--- a/src/SalomeApp/SalomeApp_Operation.h
+++ b/src/SalomeApp/SalomeApp_Operation.h
@@ -89,6 +89,9 @@ protected:
   SalomeApp_SelectionMgr*   selectionMgr() const;
   // Get selection manager
 
+  void                      update( const int );
+  // Call update() method of module ( see SalomeApp_Module for description )
+
 private slots:
 
   virtual void              onSelectionDone();

diff --git a/src/SalomeApp/SalomeApp_UpdateFlags.h b/src/SalomeApp/SalomeApp_UpdateFlags.h
new file mode 100755 (executable)
index 0000000..7943ac2
--- /dev/null
+++ b/src/SalomeApp/SalomeApp_UpdateFlags.h
@@ -0,0 +1,37 @@
+//  SALOME SalomeApp
+//
+//  Copyright (C) 2005  CEA/DEN, EDF R&D
+//
+//
+//
+//  File   : SalomeApp_UpdateFlags.h
+//  Author : Sergey LITONIN
+//  Module : SALOME
+
+
+#ifndef SalomeApp_UpdateFlags_H
+#define SalomeApp_UpdateFlags_H
+
+/*
+  Enum        : UpdateFlags
+  Description : Enumeration for update flags. First byte is reserved for SalomeApp_Module.
+                Modules derived from this model must use other 3 bytes to define their
+                own update flags
+*/
+
+typedef enum
+{
+  UF_Forced       = 0x00000001,
+  UF_Model        = 0x00000002,
+  UF_Viewer       = 0x00000004,
+  UF_ObjBrowser   = 0x00000008,
+  UF_Controls     = 0x00000010,
+} UpdateFlags;
+
+#endif
+
+
+
+
+
+