Mantis issue 0020853: EDF 1394 GEOM: Partition fails between 2 faces. A patch by...

[modules/geom.git] / src / GEOM_I / GEOM_Gen_i.cc

diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index cbc8935793d884ab8ae6ccbb5a1f2eed60376abc..76f133190a950d5fd09f95c23da7a46c08bd585b 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
@@ -231,6 +232,12 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
   } else if ( aShape->GetType() == GEOM_MARKER ) {
     aPixmap->SetPixMap( "ICON_OBJBROWSER_LCS" );
     aShapeName = "LocalCS_";
+  } else if ( aShape->GetType() > ADVANCED_BASE ) {
+    char buf[20];
+    sprintf( buf, "%d", aShape->GetType() );
+    std::string advId = "ICON_OBJBROWSER_ADVANCED_"; advId += buf;
+    aPixmap->SetPixMap( advId.c_str() );
+    aShapeName = "Advanced_";
   } else if ( aShape->GetShapeType() == GEOM::COMPOUND ) {
     aPixmap->SetPixMap( "ICON_OBJBROWSER_COMPOUND" );
     aShapeName = "Compound_";
@@ -672,7 +679,7 @@ SALOMEDS::SObject_ptr GEOM_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream,
 
   // Retrieve a TopoDS_Shape from byte stream
   TopoDS_Shape aTopology;
-  istrstream aStreamedBrep((char*) &theStream[0], theStream.length());
+  std::istrstream aStreamedBrep((char*) &theStream[0], theStream.length());
   BRep_Builder aBuilder;
   try {
     BRepTools::Read(aTopology, aStreamedBrep, aBuilder);
@@ -1061,7 +1068,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(SALOMEDS::Study_ptr     theStudy,
       }
     } // process arguments
   }
-  set<string> anObjEntryMap;
+  std::set<std::string> anObjEntryMap;
   GEOM::ListOfGO_var aResParts = new GEOM::ListOfGO;
   int nbRes = 0;
   int nb = aParts->length();
@@ -1813,7 +1820,7 @@ char* GEOM_Gen_i::getObjectInfo(CORBA::Long studyId, const char* entry)
        aTypeInfo = "Circle";
        break;
       case GEOM::GEOM_IKindOfShape::ARC_CIRCLE:
-       aTypeInfo = "Ark";
+       aTypeInfo = "Arc Circle";
        break;
       case GEOM::GEOM_IKindOfShape::ELLIPSE:
        aTypeInfo = "Ellipse";