+// Copyright (C) 2007-2008 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
+//
+// 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 <fstream>
#include <strstream>
+//#include <sstream>
#include <OpUtil.hxx>
#include <Utils_ExceptHandlers.hxx>
Handle(GEOM_Object) theImpl)
: SALOME::GenericObj_i( thePOA ), _engine(theEngine), _impl(theImpl)
{
- thePOA->activate_object(this);
}
//=============================================================================
//=============================================================================
GEOM_Object_i::~GEOM_Object_i()
-{}
+{
+ MESSAGE("GEOM_Object_i::~GEOM_Object_i");
+ GEOM_Engine::GetEngine()->RemoveObject(_impl);
+}
//=============================================================================
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);
}
//=============================================================================
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();
+}
+
+
+//=============================================================================
+/*!
+ * SetMarkerStd
+ */
+//=============================================================================
+void GEOM_Object_i::SetMarkerStd(GEOM::marker_type theType, GEOM::marker_size theSize)
+{
+ if ( theType == GEOM::MT_NONE || theSize == GEOM::MS_NONE ) {
+ _impl->UnsetMarker();
+ }
+ else {
+ Aspect_TypeOfMarker aType = (Aspect_TypeOfMarker)( (int)theType-1 );
+ double aSize = ((int)theSize+1)*0.5;
+ _impl->SetMarkerStd( aType, aSize );
+ }
+}
+
+
+//=============================================================================
+/*!
+ * SetMarkerTexture
+ */
+//=============================================================================
+void GEOM_Object_i::SetMarkerTexture(CORBA::Long theTextureId)
+{
+ _impl->SetMarkerTexture( theTextureId );
+}
+
+
+//=============================================================================
+/*!
+ * GetMarkerType
+ */
+//=============================================================================
+GEOM::marker_type GEOM_Object_i::GetMarkerType()
+{
+ return (GEOM::marker_type)( (int)_impl->GetMarkerType()+1 );
+}
+
+
+//=============================================================================
+/*!
+ * GetMarkerSize
+ */
+//=============================================================================
+GEOM::marker_size GEOM_Object_i::GetMarkerSize()
+{
+ int aSize = (int)( _impl->GetMarkerSize()/0.5 ) - 1;
+ return aSize < GEOM::MS_10 || aSize > GEOM::MS_70 ? GEOM::MS_NONE : (GEOM::marker_size)aSize;
+}
+
+
+//=============================================================================
+/*!
+ * GetMarkerTexture
+ */
+//=============================================================================
+CORBA::Long GEOM_Object_i::GetMarkerTexture()
+{
+ return _impl->GetMarkerTexture();
+}
+
+
//=============================================================================
/*!
* SetStudyEntry
char* GEOM_Object_i::GetStudyEntry()
{
TCollection_AsciiString anEntry = _impl->GetAuxData();
- if(!anEntry.IsEmpty()) return strdup(anEntry.ToCString());
- return strdup("");
+ if(!anEntry.IsEmpty()) return CORBA::string_dup(anEntry.ToCString());
+ return CORBA::string_dup("");
}
Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(aSeq->Value(i));
if (anObj.IsNull()) continue;
TDF_Tool::Entry(anObj->GetEntry(), anEntry);
- GEOM::GEOM_Object_var obj = GEOM::GEOM_Object::_duplicate(_engine->GetObject(anObj->GetDocID(), anEntry.ToCString()));
+ GEOM::GEOM_Object_var obj = _engine->GetObject(anObj->GetDocID(), anEntry.ToCString());
aList[i-1] = obj;
}
if(aShape.IsNull()) return NULL;
- ostrstream streamShape;
+ std::ostrstream streamShape;
//Write TopoDS_Shape in ASCII format to the stream
BRepTools::Write(aShape, streamShape);
//Returns the number of bytes that have been stored in the stream's buffer.
//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));
}
//=============================================================================
if(aLabel.IsNull()) return obj._retn();
TCollection_AsciiString anEntry;
TDF_Tool::Entry(aLabel, anEntry);
- return GEOM::GEOM_Object::_duplicate(_engine->GetObject(_impl->GetDocID(), anEntry.ToCString()));
+ return _engine->GetObject(_impl->GetDocID(), anEntry.ToCString());
}
return obj._retn();
{
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());
+}
+
