Dump Python extension

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

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index 2af09b20943192aafa6de5fb5d537faa4f236c5d..97ad13b5cc74d8ff7dff73d086344965d4237ec6 100644 (file)
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -1,24 +1,47 @@
-using namespace std;
-
-#include "GEOM_Object_i.hh"
-#include "GEOM_Gen_i.hh"
-#include "GEOM_ISubShape.hxx"
-#include "GEOMImpl_Types.hxx"
+// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 
+// 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.
+// 
+// This library is distributed in the hope that it will be useful 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+#include <Standard_OStream.hxx>
+
+#include <GEOM_Object_i.hh>
+//#include <GEOM_Gen_i.hh>
+#include <GEOM_ISubShape.hxx>
+#include <GEOMImpl_Types.hxx>
 
 #include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <fstream>
+#include <strstream>
+
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
 #include <TDF_Tool.hxx>
 #include <TDF_Label.hxx>
 #include <TCollection_AsciiString.hxx>
 
-#include <fstream.h>
-#include <strstream>
-
 #include <BRepTools_ShapeSet.hxx>
 #include <BRepTools.hxx>
 #include <TopAbs.hxx>
 
+#ifdef WNT
+#pragma warning( disable:4786 )
+#endif
+
 //=============================================================================
 /*!
  *   constructor:
@@ -27,9 +50,8 @@ using namespace std;
 
 GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine,
                              Handle(GEOM_Object) theImpl)
-:SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
+: SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
 {
-  thePOA->activate_object(this);
 }
 
 //=============================================================================
@@ -39,7 +61,9 @@ GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr
 //=============================================================================
 
 GEOM_Object_i::~GEOM_Object_i()
-{}
+{
+  GEOM_Engine::GetEngine()->RemoveObject(_impl);
+}
 
 
 //=============================================================================
@@ -52,7 +76,8 @@ char* GEOM_Object_i::GetEntry()
   const TDF_Label& aLabel = _impl->GetEntry();
   TCollection_AsciiString anEntry;
   TDF_Tool::Entry(aLabel, anEntry);
-  return CORBA::string_dup(anEntry.ToCString());
+  const char* anEntstr = anEntry.ToCString();
+  return CORBA::string_dup(anEntstr);
 }
 
 //=============================================================================
@@ -107,10 +132,55 @@ void GEOM_Object_i::SetName(const char* theName)
 char* GEOM_Object_i::GetName()
 {
   char* aName = _impl->GetName();
-  if(aName) return strdup(aName);
+  if (aName)
+    return aName; // this is already copy of pointer (see implementation of _impl)
   return strdup("");
 }
 
+//=============================================================================
+/*!
+ *  SetColor
+ */
+//=============================================================================
+void GEOM_Object_i::SetColor(const SALOMEDS::Color& theColor)
+{
+  _impl->SetColor(theColor);
+}
+
+
+//=============================================================================
+/*!
+ *  GetColor
+ */
+//=============================================================================
+SALOMEDS::Color GEOM_Object_i::GetColor()
+{
+  return _impl->GetColor();
+}
+
+
+//=============================================================================
+/*!
+ *  SetAutoColor
+ */
+//=============================================================================
+void GEOM_Object_i::SetAutoColor(CORBA::Boolean theAutoColor)
+{
+  _impl->SetAutoColor(theAutoColor);
+}
+
+
+//=============================================================================
+/*!
+ *  GetAutoColor
+ */
+//=============================================================================
+CORBA::Boolean GEOM_Object_i::GetAutoColor()
+{
+  return _impl->GetAutoColor();
+}
+
+
 //=============================================================================
 /*!
  *  SetStudyEntry
@@ -129,9 +199,9 @@ void GEOM_Object_i::SetStudyEntry(const char* theEntry)
 //=============================================================================
 char* GEOM_Object_i::GetStudyEntry()
 {
-  char* anEntry = _impl->GetAuxData();
-  if(anEntry) return strdup(anEntry);
-  return strdup("");
+  TCollection_AsciiString anEntry = _impl->GetAuxData();
+  if(!anEntry.IsEmpty()) return CORBA::string_dup(anEntry.ToCString());
+  return CORBA::string_dup("");
 }
 
 
@@ -230,9 +300,9 @@ SALOMEDS::TMPFile* GEOM_Object_i::GetShapeStream()
 //function : getShape
 //purpose  : return the TopoDS_Shape when client and servant are colocated, be careful
 //=======================================================================
-long GEOM_Object_i::getShape() {
+CORBA::LongLong GEOM_Object_i::getShape() {
   _geom = _impl->GetValue();
-  return((long)(&_geom));
+  return ((CORBA::LongLong)(&_geom));
 }
 
 //=============================================================================
@@ -290,3 +360,14 @@ bool GEOM_Object_i::IsShape()
 {
   return !_impl->GetValue().IsNull() && _impl->GetType() != GEOM_MARKER;
 }
+
+void GEOM_Object_i::SetParameters(const char* theParameters)
+{
+  _impl->SetParameters((char*)theParameters);
+}
+
+char* GEOM_Object_i::GetParameters()
+{
+  return CORBA::string_dup(_impl->GetParameters().ToCString());
+}
+