Merge branch 'V9_11_BR'

[modules/geom.git] / src / GEOMBase / GEOMBase_Helper.cxx

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index dee0457ece999e888c6e4abf24e32ddbcbc1fae7..a304693fb704133602f5dca81ced07b50176606a 100644 (file)
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  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
@@ -88,8 +88,8 @@ GEOM::GEOM_Gen_ptr GEOMBase_Helper::getGeomEngine()
 // Function : GEOMBase_Helper
 // Purpose  :
 //================================================================
-GEOMBase_Helper::GEOMBase_Helper( SUIT_Desktop* desktop )
-  : myDisplayer( 0 ), myCommand( 0 ), myViewWindow( 0 ), isPreview( false ), myDesktop( desktop ),
+GEOMBase_Helper::GEOMBase_Helper( SUIT_Desktop* desktop, SUIT_ViewWindow* aVW )
+  : myDisplayer( 0 ), myCommand( 0 ), myViewWindow( aVW ), isPreview( false ), myDesktop( desktop ),
     myIsApplyAndClose( false ), myIsOptimizedBrowsing( false ), myIsWaitCursorEnabled( true ),
     myIsDisableBrowsing(false), myIsDisplayResult(true)
 {
@@ -489,6 +489,7 @@ void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const std::list
     QString anEntry = getEntry( anObj );
     if ( anEntry != "" )
     {
+      //MESSAGE("anEntry: "<< anEntry.toStdString().c_str());
       QString aName = GEOMBase::GetName( anObj );
       aListOfIO.Append( new SALOME_InteractiveObject( anEntry.toUtf8().constData(),
                                                       "GEOM", aName.toUtf8().constData() ));
@@ -540,6 +541,20 @@ void GEOMBase_Helper::localSelection( GEOM::GEOM_Object_ptr obj, const int mode
   localSelection( obj, modes );
 }
 
+//================================================================
+// Function : localSelection
+// Purpose  : Activate selection of sub-shapes in accordance with mode
+//            mode is from TopAbs_ShapeEnum
+//================================================================
+void GEOMBase_Helper::localSelection( const std::string& entry,  const std::string& name, const std::list<int> modes)
+{
+  SALOME_ListIO aListOfIO;
+  QString aName = name.c_str();
+  aListOfIO.Append( new SALOME_InteractiveObject( entry.c_str(),
+                                                  "GEOM", aName.toUtf8().constData() ));
+  getDisplayer()->LocalSelection( aListOfIO, modes );
+}
+
 //================================================================
 // Function : localSelection
 // Purpose  : Activate selection of sub-shapes in accordance with mode
@@ -739,7 +754,7 @@ bool GEOMBase_Helper::openCommand()
   bool res = false;
   if ( !getStudy() || hasCommand() )
   {
-    MESSAGE("Getting out from openCommand()")
+    MESSAGE("Getting out from openCommand()");
       return res;
   }
 
@@ -751,8 +766,8 @@ bool GEOMBase_Helper::openCommand()
   }
   else
   {
-    MESSAGE("anOp->_is_nil() = true")
-      }
+    MESSAGE("anOp->_is_nil() = true");
+  }
 
   return res;
 }
@@ -842,7 +857,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
   if ( !appStudy )
   {
-    MESSAGE("appStudy is empty")
+    MESSAGE("appStudy is empty");
       return false;
   }
   _PTR(Study) aStudy = appStudy->studyDS();
@@ -953,13 +968,13 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
   catch( const SALOME::SALOME_Exception& e ) {
     SalomeApp_Tools::QtCatchCorbaException( e );
     abortCommand();
-    MESSAGE("Exception caught")
-      }
+    MESSAGE("Exception caught");
+  }
 
   updateViewer();
 
-  MESSAGE("result ="<<result)
-    return result;
+  MESSAGE("result ="<<result);
+  return result;
 }
 
 
@@ -1023,7 +1038,7 @@ bool GEOMBase_Helper::isValid( QString& )
 //            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.
 //================================================================
-bool GEOMBase_Helper::execute( ObjectList& objects )
+bool GEOMBase_Helper::execute( ObjectList& )
 {
   return false;
 }
@@ -1034,7 +1049,7 @@ bool GEOMBase_Helper::execute( ObjectList& objects )
 //            for <theObj> or a nil reference if <theObj> should be published
 //            as a top-level object.
 //================================================================
-GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr theObj )
+GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr )
 {
   return GEOM::GEOM_Object::_nil();
 }
@@ -1043,7 +1058,7 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::getFather( GEOM::GEOM_Object_ptr theObj )
 // Function : getObjectName
 // Purpose  : Redefine this method to return proper name for the given object
 //================================================================
-QString GEOMBase_Helper::getObjectName(GEOM::GEOM_Object_ptr object) const
+QString GEOMBase_Helper::getObjectName( GEOM::GEOM_Object_ptr ) const
 {
   return QString();
 }
@@ -1052,7 +1067,7 @@ QString GEOMBase_Helper::getObjectName(GEOM::GEOM_Object_ptr object) const
 // Function : getNewObjectName
 // Purpose  : Redefine this method to return proper name for a new object
 //================================================================
-QString GEOMBase_Helper::getNewObjectName (int) const
+QString GEOMBase_Helper::getNewObjectName( int ) const
 {
   return QString();
 }