X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMBase%2FGEOMBase.h;h=8d35354dfdab4baab8f30491cf574d351ebf405c;hb=bbafce4b04731f9219f75dc124ec2429d994c202;hp=84ab6ee14f8383ecd317bc83c78f9d747e49df7e;hpb=73555c78ebf12a1fdb85157b8e7934ad566ae90a;p=modules%2Fgeom.git

diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h
index 84ab6ee14..8d35354df 100644
--- a/src/GEOMBase/GEOMBase.h
+++ b/src/GEOMBase/GEOMBase.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,6 +31,7 @@
 
 // SALOME Includes
 #include <GEOM_AISShape.hxx>
+#include "GEOM_GenericObjPtr.h"
 
 // IDL Headers
 #include <SALOMEconfig.h>
@@ -57,37 +58,37 @@ public :
   static int          GetIndex( const TopoDS_Shape& subshape, const TopoDS_Shape& shape );
   static TopoDS_Shape GetShapeFromIOR( const QString& IOR );
   static bool         GetShape( GEOM::GEOM_Object_ptr object,
-				TopoDS_Shape& shape,
-				const TopAbs_ShapeEnum type = TopAbs_SHAPE );
+                                TopoDS_Shape& shape,
+                                const TopAbs_ShapeEnum type = TopAbs_SHAPE );
   static TopoDS_Shape GetTopoFromSelection( const SALOME_ListIO& IObjects );
   static int          GetNameOfSelectedIObjects( const SALOME_ListIO& IObjects,
-						 QString& name,
-						 const bool shapesOnly = false );
+                                                 QString& name,
+                                                 const bool shapesOnly = false );
   static QString      GetShapeTypeString( const TopoDS_Shape& shape );
 
-  /* Convertions */
+  /* Conversions */
   static Handle(GEOM_AISShape)
                       ConvertIOinGEOMAISShape( const Handle(SALOME_InteractiveObject)& IO,
-					       bool onlyInActiveView = false );
+                                               bool onlyInActiveView = false );
 
   static Handle(AIS_InteractiveObject)
                       GetAIS( const Handle(SALOME_InteractiveObject)& IO,
-			      bool onlyInActiveView = false,
-			      bool onlyGeom = false ); 
+                              bool onlyInActiveView = false,
+                              bool onlyGeom = false ); 
   static QStringList  ConvertListOfIOInListOfIOR( const SALOME_ListIO& IObjects ); 
 
   static Handle(GEOM_AISShape) 
                       ConvertIORinGEOMAISShape( const QString& IOR,
-						bool onlyInActiveView = false );
+                                                bool onlyInActiveView = false );
   static GEOM_Actor*  ConvertIORinGEOMActor( const QString& IOR,
-					     bool onlyInActiveView = false );
+                                             bool onlyInActiveView = false );
 
   static GEOM::GEOM_Object_ptr
                       ConvertIOinGEOMObject( const Handle(SALOME_InteractiveObject)& IO );
 
   static void         ConvertListOfIOInListOfGO( const SALOME_ListIO& IObjects,
-						 GEOM::ListOfGO& geomObjects,
-						 bool shapesOnly = false ); 
+                                                 GEOM::ListOfGO& geomObjects,
+                                                 bool shapesOnly = false ); 
 
   static GEOM::GEOM_Object_ptr
                       GetObjectFromIOR( const QString& IOR );
@@ -99,17 +100,17 @@ public :
 
   /* Used just by Plane and Prism */
   static bool         LinearEdgeExtremities( const TopoDS_Shape& shape,
-					     gp_Pnt& point1, gp_Pnt& point2 );
+                                             gp_Pnt& point1, gp_Pnt& point2 );
   static void         GetBipointDxDyDz( const gp_Pnt& point1, const gp_Pnt& point2,
-					double& dx, double& dy, double& dz );
+                                        double& dx, double& dy, double& dz );
 
   /* Simulation management */
   static TopoDS_Shape CreateArrowForLinearEdge( const TopoDS_Shape& tds );
 
   /*  Generates default names */
   static bool         SelectionByNameInDialogs( QWidget* widget,
-						const QString& userObjectName,
-						const SALOME_ListIO& IObjects );
+                                                const QString& userObjectName,
+                                                const SALOME_ListIO& IObjects );
   /* Shows message box with error code */
   static void         DefineDlgPosition( QWidget* dlg, int& x, int& y );
 
@@ -126,13 +127,15 @@ public :
   static bool         IsShape( GEOM::GEOM_Object_ptr object );
 
   /* Get string representation of shape type */
-  static QString      TypeName( TopAbs_ShapeEnum type );
+  static QString      TypeName( TopAbs_ShapeEnum type, bool capitalize = false );
   
   /* Get study entry for the given object  */
   static QString      GetEntry( GEOM::GEOM_Object_ptr object );
 
   /* Publish sub-shape under the main object */
-  static void         PublishSubObject( GEOM::GEOM_Object_ptr object );
+  static void         PublishSubObject( GEOM::GEOM_Object_ptr object, const QString& name = QString() );
+
+  static void         Synchronize( QList<GEOM::GeomObjPtr>& left, QList<GEOM::GeomObjPtr>& right );
 };
 
 #endif // GEOMBASE_H