Join modifications from branch OCC_development_for_3_2_0a2

[modules/visu.git] / src / VISUGUI / VisuGUI_Tools.h

diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h
index d514b4b3a223fe691bcfc90bbf20f8767653b46c..af166ad68d056b883c06d9573279d5464e73f077 100644 (file)
--- a/src/VISUGUI/VisuGUI_Tools.h
+++ b/src/VISUGUI/VisuGUI_Tools.h
@@ -98,18 +98,12 @@ namespace VISU {
 
   bool                                 IsRemovableSelected(const SalomeApp_Module* theModule);
 
-  // Display/Erase
-  void                                 ErasePrs(const SalomeApp_Module* theModule,
-                                               CORBA::Object_ptr theObject,
-                                               bool theUpdate = true);
   void                                 DeleteSObject(VisuGUI* theModule,
                                                     _PTR(Study)       theStudy,
                                                     _PTR(SObject)     theSObject);
   void                                 DeletePrs3d(VisuGUI* theModule,
                                                   VISU::Prs3d_i* thePrs,
                                                   const Handle(SALOME_InteractiveObject)& theIO);
-  void                                 ErasePrs3d(const SalomeApp_Module* theModule,
-                                                 VISU::Prs3d_i* thePrs);
 
   // Presentation management
   void ChangeRepresentation (const SalomeApp_Module* theModule,
@@ -126,21 +120,11 @@ namespace VISU {
                                                   VISU::Result_var& theResult);
   bool                                 IsSObjectTable(_PTR(SObject) theSObject);
 
-  // Views
-  SUIT_ViewWindow*                     GetActiveView(const SalomeApp_Module* theModule,
-                                                    QString theType = QString::null);
-
-  // VTK View
-  TViewWindows                         GetViews(const SalomeApp_Module* theModule);
-  SVTK_ViewWindow*                     GetViewWindow(const SalomeApp_Module* theModule,
-                                                    const bool theCreate = false );
-  SVTK_ViewWindow*                     GetViewWindow();
-
-  VISU_Actor*                          PublishInView(const SalomeApp_Module* theModule,
-                                                    VISU::Prs3d_i* thePrs);
-  VISU_Actor*                          UpdateViewer(const SalomeApp_Module* theModule,
-                                                   VISU::Prs3d_i* thePrs,
-                                                   bool theDispOnly = false);
+  /*! Display mesh presentation in given VTK view window
+   */
+  VISU_Actor*                          PublishMeshInView(const SalomeApp_Module* theModule,
+                                                        VISU::Prs3d_i* thePrs,
+                                                        SVTK_ViewWindow* theViewWindow);
 
   /*!
    * \brief Repaint all SVTK view windows, where the given object is displayed.
@@ -183,26 +167,32 @@ namespace VISU {
   void                                 CreatePlot( SalomeApp_Module* theModule,
                                                   _PTR(SObject) theSobj );
 
+  /*! Display/Erase/Update a curve presentation.
+   *  Parameter \a frame may be NULL, in this case there is only update without display/erase
+   */
   void                                 UpdateCurve( VISU::Curve_i*,
                                                    Plot2d_ViewFrame* frame,
                                                    SPlot2d_Curve*,
                                                    int theDisplaying );
-  //parameter frame may be 0, in this case there is only update without display/erase 
 
-  // Others
+  /*! Create mesh presentation and display it in \a theViewWindow.
+   *  If \a theViewWindow is NULL, no displaying will be done.
+   */
   void CreateMesh (const SalomeApp_Module* theModule,
-                  const Handle(SALOME_InteractiveObject)& theIO);
+                  const Handle(SALOME_InteractiveObject)& theIO,
+                  SVTK_ViewWindow* theViewWindow = NULL);
 
+  // Others
   std::vector<VISU::Prs3d_i*> GetPrs3dList (const SalomeApp_Module* theModule,
                                            const Handle(SALOME_InteractiveObject)& theIO);
   std::vector<VISU::Prs3d_i*> GetPrs3dList (const SalomeApp_Module* theModule,
                                            _PTR(SObject) theObject);
   
-  int GetFreePositionOfDefaultScalarBar(VisuGUI* theModule);
-  void AddScalarBarPosition(VisuGUI* theModule,VISU::Prs3d_i* thePrs3d, int pos);
-  void RemoveScalarBarPosition(VisuGUI* theModule,VISU::Prs3d_i* thePrs3d);
-  void RemoveScalarBarPosition(VisuGUI* theModule,SVTK_ViewWindow* vw,VISU::Prs3d_i* thePrs3d);
-  void RemoveScalarBarPosition(VisuGUI* theModule,CORBA::Object_ptr theObject);
+  int GetFreePositionOfDefaultScalarBar(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow);
+  void AddScalarBarPosition(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow,
+                           VISU::Prs3d_i* thePrs3d, int pos);
+  void RemoveScalarBarPosition(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow,
+                              VISU::Prs3d_i* thePrs3d);
 }
 
 #endif