Copyright update 2022

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

diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 0e92034..332b165
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, 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)
 {
@@ -180,9 +180,9 @@ void GEOMBase_Helper::erase( GEOM::GEOM_Object_ptr object, const bool updateView
   if ( !object->_is_nil() ) {
     QString entry = getEntry( object );
     QString name  = GEOMBase::GetName( object );
-    getDisplayer()->Erase ( new SALOME_InteractiveObject(entry.toLatin1().constData(),
+    getDisplayer()->Erase ( new SALOME_InteractiveObject(entry.toUtf8().constData(),
                                                          "GEOM",
-                                                         name.toLatin1().constData() ),
+                                                         name.toUtf8().constData() ),
                             true, updateView );
   }
 }
@@ -223,9 +223,9 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
     QString entry = getEntry( object );
     QString  name = GEOMBase::GetName( object );
     getDisplayer()->Redisplay
-      (new SALOME_InteractiveObject (entry.toLatin1().constData(),
+      (new SALOME_InteractiveObject (entry.toUtf8().constData(),
                                      "GEOM",
-                                     name.toLatin1().constData()),
+                                     name.toUtf8().constData()),
        false);
   }
 
@@ -245,9 +245,9 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
               QString entry = getEntry( aChild );
               QString  name = GEOMBase::GetName( aChild );
               getDisplayer()->Redisplay
-                ( new SALOME_InteractiveObject( entry.toLatin1().constData(),
+                ( new SALOME_InteractiveObject( entry.toUtf8().constData(),
                                                 "GEOM",
-                                                name.toLatin1().constData() ),
+                                                name.toUtf8().constData() ),
                   false );
             }
           }
@@ -489,9 +489,10 @@ 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.toLatin1().constData(),
-                                                      "GEOM", aName.toLatin1().constData() ));
+      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
@@ -702,7 +717,7 @@ QString GEOMBase_Helper::getEntry( GEOM::GEOM_Object_ptr object ) const
   if ( study )  {
     QString objIOR = GEOMBase::GetIORFromObject( object );
     if ( objIOR != "" ) {
-      _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( objIOR.toLatin1().constData() ) );
+      _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( objIOR.toUtf8().constData() ) );
       if ( SO )
         return QString::fromStdString(SO->GetID());
     }
@@ -906,7 +921,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
                   aName = GEOMBase::GetDefaultName( getPrefix( obj ) );
               }
             }
-            anEntryList << addInStudy( obj, aName.toLatin1().constData() );
+            anEntryList << addInStudy( obj, aName.toUtf8().constData() );
             // updateView=false
             if( isDisplayResult() )
               display( obj, false );
@@ -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();
 }
@@ -1145,7 +1160,7 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::findObjectInFather (GEOM::GEOM_Object_ptr
   SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
   _PTR(Study) aDStudy = appStudy->studyDS();
   QString IOR = GEOMBase::GetIORFromObject( theFather );
-  _PTR(SObject) SObj ( aDStudy->FindObjectIOR( IOR.toLatin1().constData() ) );
+  _PTR(SObject) SObj ( aDStudy->FindObjectIOR( IOR.toUtf8().constData() ) );
 
   bool inStudy = false;
   GEOM::GEOM_Object_var aReturnObject;
@@ -1205,7 +1220,7 @@ GEOM::GEOM_Object_ptr GEOMBase_Helper::findObjectInFather( GEOM::GEOM_Object_ptr
 //================================================================
 void GEOMBase_Helper::addSubshapesToStudy()
 {
-  //Impemented in Dialogs, called from Accept method
+  //Implemented in Dialogs, called from Accept method
 }
 
 //================================================================
@@ -1214,7 +1229,7 @@ void GEOMBase_Helper::addSubshapesToStudy()
 //================================================================
 QList<GEOM::GeomObjPtr> GEOMBase_Helper::getSourceObjects()
 {
-  //Impemented in Dialogs, called from Accept method
+  //Implemented in Dialogs, called from Accept method
   QList<GEOM::GeomObjPtr> res;
   return res;
 }