X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMBase%2FGEOMBase_Helper.h;h=a49a4dd6b9fd53eda0b41af4bf6aa2e3addc854e;hb=bbafce4b04731f9219f75dc124ec2429d994c202;hp=44f424def63df72ff4fb0dd39a3b20dfbaaf20be;hpb=29dfaa447450872cc5f5fbb57419e83aa9fd2cff;p=modules%2Fgeom.git

diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h
old mode 100755
new mode 100644
index 44f424def..a49a4dd6b
--- a/src/GEOMBase/GEOMBase_Helper.h
+++ b/src/GEOMBase/GEOMBase_Helper.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -35,10 +35,13 @@
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
+#include <TColStd_MapOfInteger.hxx>
+
 #include <QString>
 #include <QMap>
 
 #include <list>
+#include <string>
 
 typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
 
@@ -47,7 +50,6 @@ class SUIT_Desktop;
 class SUIT_ViewWindow;
 class SALOME_Prs;
 class GEOM_Operation;
-class TColStd_MapOfInteger;
 
 //================================================================
 // Class       : GEOMBase_Helper
@@ -59,11 +61,13 @@ class TColStd_MapOfInteger;
 class GEOMBASE_EXPORT GEOMBase_Helper
 {
 public:
-  GEOMBase_Helper( SUIT_Desktop* );
+  GEOMBase_Helper( SUIT_Desktop*, SUIT_ViewWindow* aVW = 0);
   virtual ~GEOMBase_Helper();
   static SUIT_ViewWindow* getActiveView();
 
 protected:
+  typedef std::list<SALOME_Prs*> PrsList;
+
   static GEOM::GEOM_Gen_ptr getGeomEngine();
 
   void display         ( const ObjectList&, const bool = true );
@@ -96,10 +100,13 @@ protected:
                          const bool = true );
   void erasePreview    ( const bool = true );
 
+  const PrsList& getPreview() const { return myPreview; }
+
   void localSelection( const ObjectList&, const std::list<int> );
   void localSelection( const ObjectList&, const int );
   void localSelection( GEOM::GEOM_Object_ptr, const std::list<int> );
   void localSelection( GEOM::GEOM_Object_ptr, const int );
+  void localSelection( const std::string&, const std::string&, const std::list<int> );
   void localSelection( const std::list<int> );
   void localSelection( const int );
   void activate( const int );
@@ -119,7 +126,6 @@ protected:
   bool hasCommand      () const;
 
   void updateObjBrowser() const;
-  int  getStudyId      () const;
   SalomeApp_Study* getStudy  () const;
   bool checkViewWindow ();
 
@@ -129,7 +135,7 @@ protected:
   // should be published in a study.
 
   void showError();
-  // Shows a message box with infromation about an error taken from getOperation()->GetErrorCode()
+  // Shows a message box with information about an error taken from getOperation()->GetErrorCode()
   void showError( const QString& msg );
   // Shows a error message followed by <msg>
 
@@ -161,7 +167,7 @@ protected:
   // It should perform the required operation and put all new or modified objects into
   // <objects> argument.Should return <false> if some error occurs during its execution.
 
-  virtual void restoreSubShapes( SALOMEDS::Study_ptr theStudy, SALOMEDS::SObject_ptr theSObject );
+  virtual void restoreSubShapes( SALOMEDS::SObject_ptr theSObject );
   // This method is called by addInStudy().
 
   virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr theObj );
@@ -209,7 +215,6 @@ private:
   void                        clearShapeBuffer( GEOM::GEOM_Object_ptr );
 
 private:
-  typedef std::list<SALOME_Prs*> PrsList;
 
   PrsList                     myPreview;
   GEOM_Displayer*             myDisplayer;