X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM_I%2FGEOM_Object_i.cc;h=2845379c1978992a416c8ffb51bd838cbf1ed4e6;hb=9f730900596e9412f431c23b2bd985063814a750;hp=62aa57a7199a6ad1954309e1ce51baeacd1c3073;hpb=9499b99fe2dcb53e1ea364f97986f8f432b04600;p=modules%2Fgeom.git diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index 62aa57a71..2845379c1 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -1,44 +1,56 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// 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 -// +// // 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 +// License as published by the Free Software Foundation; either +// 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 +// 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 +// 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 -#include -//#include -#include -#include +#include "GEOM_Object_i.hh" -#include "utilities.h" -#include -#include +#include "GEOM_ISubShape.hxx" +#include "GEOMImpl_Types.hxx" +#include "GEOM_BaseDriver.hxx" +#include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include +#include + +#include +#include + +#include +#include -#ifdef WNT +#ifdef _DEBUG_ +#include +#endif + +#ifdef WIN32 #pragma warning( disable:4786 ) #endif @@ -49,10 +61,11 @@ //============================================================================= 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) + Handle(::GEOM_Object) theImpl) : + SALOME::GenericObj_i( thePOA ), + GEOM_BaseObject_i( thePOA, theEngine, theImpl ), + _impl( theImpl ) { - thePOA->activate_object(this); } //============================================================================= @@ -62,160 +75,243 @@ GEOM_Object_i::GEOM_Object_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr //============================================================================= GEOM_Object_i::~GEOM_Object_i() -{} - +{ + //MESSAGE("GEOM_Object_i::~GEOM_Object_i"); +} //============================================================================= /*! - * GetEntry + * GetShapeType */ //============================================================================= -char* GEOM_Object_i::GetEntry() +GEOM::shape_type GEOM_Object_i::GetShapeType() { - const TDF_Label& aLabel = _impl->GetEntry(); - TCollection_AsciiString anEntry; - TDF_Tool::Entry(aLabel, anEntry); - return CORBA::string_dup(anEntry.ToCString()); + TopoDS_Shape _geom = _impl->GetValue(); + if(_geom.IsNull()) return GEOM::SHAPE; + return (GEOM::shape_type)_geom.ShapeType(); } //============================================================================= /*! - * GetStudyID + * GetTopologyType */ //============================================================================= -CORBA::Long GEOM_Object_i::GetStudyID() +GEOM::shape_type GEOM_Object_i::GetTopologyType() { - return _impl->GetDocID(); + TopoDS_Shape shape = _impl->GetValue(); + if(shape.IsNull()) return GEOM::SHAPE; + + if ( shape.ShapeType() == TopAbs_COMPOUND || shape.ShapeType() == TopAbs_COMPSOLID ) { + TopoDS_Shape shape_i; + TopoDS_Iterator It (shape, Standard_True, Standard_False); + for (; It.More(); It.Next()) { + if ( !shape_i.IsNull() ) return (GEOM::shape_type)shape.ShapeType(); + shape_i = It.Value(); + } + if ( !shape_i.IsNull() ) + return (GEOM::shape_type) shape_i.ShapeType(); + } + + return (GEOM::shape_type)shape.ShapeType(); } +static GEOM::shape_type getMinMaxShapeType( const TopoDS_Shape& shape, bool ismin ) +{ + if ( shape.IsNull() ) + return GEOM::SHAPE; + + GEOM::shape_type ret = (GEOM::shape_type)shape.ShapeType(); + + if ( shape.ShapeType() == TopAbs_COMPOUND || shape.ShapeType() == TopAbs_COMPSOLID ) { + TopoDS_Iterator it(shape, Standard_True, Standard_False); + for (; it.More(); it.Next()) { + TopoDS_Shape sub_shape = it.Value(); + if ( sub_shape.IsNull() ) continue; + GEOM::shape_type stype = (GEOM::shape_type)getMinMaxShapeType( sub_shape, ismin ); + if ( stype == GEOM::SHAPE ) continue; + if ( ismin && stype > ret ) + ret = stype; + else if ( !ismin && ( ret < GEOM::SOLID || stype < ret ) ) + ret = stype; + } + } + + return ret; +} //============================================================================= /*! - * GetType + * GetMinShapeType */ //============================================================================= -CORBA::Long GEOM_Object_i::GetType() +GEOM::shape_type GEOM_Object_i::GetMinShapeType() { - return _impl->GetType(); + return getMinMaxShapeType( _impl->GetValue(), true ); } //============================================================================= /*! - * GetShapeType + * GetMaxShapeType */ //============================================================================= -GEOM::shape_type GEOM_Object_i::GetShapeType() +GEOM::shape_type GEOM_Object_i::GetMaxShapeType() { - TopoDS_Shape _geom = _impl->GetValue(); - if(_geom.IsNull()) return GEOM::SHAPE; - return (GEOM::shape_type)_geom.ShapeType(); + return getMinMaxShapeType( _impl->GetValue(), false ); +} + +//================================================================================ +/*! + * GetSubShapeName + */ +//================================================================================ + +char* GEOM_Object_i::GetSubShapeName(CORBA::Long subID) +{ + CORBA::String_var name(""); + + Handle(::GEOM_Function) aMainFun = _impl->GetLastFunction(); + if ( aMainFun.IsNull() ) return name._retn(); + + const TDataStd_ListOfExtendedString& aListEntries = aMainFun->GetSubShapeReferences(); + TDataStd_ListIteratorOfListOfExtendedString anIt( aListEntries ); + for (; anIt.More(); anIt.Next()) + { + TCollection_AsciiString anEntry = anIt.Value(); + Handle(::GEOM_BaseObject) anObj = + GEOM_Engine::GetEngine()->GetObject( anEntry.ToCString(), false ); + if ( anObj.IsNull() ) continue; + + TCollection_AsciiString aSubName = anObj->GetName(); + if ( aSubName.IsEmpty() ) continue; + + Handle(::GEOM_Function) aFun = anObj->GetLastFunction(); + if ( aFun.IsNull() ) continue; + + GEOM_ISubShape ISS( aFun ); + Handle(TColStd_HArray1OfInteger) subIDs = ISS.GetIndices(); + if ( subIDs.IsNull() || subIDs->Length() != 1 ) continue; + + if ( subIDs->Value( subIDs->Lower() ) == subID ) + { + name = aSubName.ToCString(); + break; + } + } + return name._retn(); } //============================================================================= /*! - * SetName + * SetColor */ //============================================================================= -void GEOM_Object_i::SetName(const char* theName) +void GEOM_Object_i::SetColor(const SALOMEDS::Color& theColor) { - _impl->SetName(theName); + ::GEOM_Object::Color aColor; + aColor.R = theColor.R; + aColor.G = theColor.G; + aColor.B = theColor.B; + _impl->SetColor(aColor); } //============================================================================= /*! - * GetName + * GetColor */ //============================================================================= -char* GEOM_Object_i::GetName() +SALOMEDS::Color GEOM_Object_i::GetColor() { - char* aName = _impl->GetName(); - if(aName) return strdup(aName); - return strdup(""); + SALOMEDS::Color aColor; + aColor.R = _impl->GetColor().R; + aColor.G = _impl->GetColor().G; + aColor.B = _impl->GetColor().B; + return aColor; } + //============================================================================= /*! - * SetStudyEntry + * SetAutoColor */ //============================================================================= -void GEOM_Object_i::SetStudyEntry(const char* theEntry) +void GEOM_Object_i::SetAutoColor(CORBA::Boolean theAutoColor) { - _impl->SetAuxData(theEntry); + _impl->SetAutoColor(theAutoColor); } //============================================================================= /*! - * GetStudyEntry + * GetAutoColor */ //============================================================================= -char* GEOM_Object_i::GetStudyEntry() +CORBA::Boolean GEOM_Object_i::GetAutoColor() { - TCollection_AsciiString anEntry = _impl->GetAuxData(); - if(!anEntry.IsEmpty()) return CORBA::string_dup(anEntry.ToCString()); - return CORBA::string_dup(""); + return _impl->GetAutoColor(); } //============================================================================= /*! - * GetDependency + * SetMarkerStd */ //============================================================================= -GEOM::ListOfGO* GEOM_Object_i::GetDependency() +void GEOM_Object_i::SetMarkerStd(GEOM::marker_type theType, GEOM::marker_size theSize) { - GEOM::ListOfGO_var aList = new GEOM::ListOfGO(); - aList->length(0); - - Handle(TColStd_HSequenceOfTransient) aSeq = _impl->GetAllDependency(); - if (aSeq.IsNull()) return aList._retn(); - int aLength = aSeq->Length(); - if (aLength == 0) return aList._retn(); - - aList->length(aLength); - - TCollection_AsciiString anEntry; - - for (int i = 1; i<=aLength; i++) { - 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())); - aList[i-1] = obj; + 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 ); } - - return aList._retn(); } + //============================================================================= /*! - * GetLastDependency + * SetMarkerTexture */ //============================================================================= -GEOM::ListOfGO* GEOM_Object_i::GetLastDependency() +void GEOM_Object_i::SetMarkerTexture(CORBA::Long theTextureId) { - GEOM::ListOfGO_var aList = new GEOM::ListOfGO(); - aList->length(0); + _impl->SetMarkerTexture( theTextureId ); +} - Handle(TColStd_HSequenceOfTransient) aSeq = _impl->GetLastDependency(); - if (aSeq.IsNull()) return aList._retn(); - int aLength = aSeq->Length(); - if (aLength == 0) return aList._retn(); - aList->length(aLength); +//============================================================================= +/*! + * GetMarkerType + */ +//============================================================================= +GEOM::marker_type GEOM_Object_i::GetMarkerType() +{ + return (GEOM::marker_type)( (int)_impl->GetMarkerType()+1 ); +} - TCollection_AsciiString anEntry; - for (int i = 1; i<=aLength; i++) { - 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())); - aList[i-1] = obj; - } +//============================================================================= +/*! + * 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; +} - return aList._retn(); + +//============================================================================= +/*! + * GetMarkerTexture + */ +//============================================================================= +CORBA::Long GEOM_Object_i::GetMarkerTexture() +{ + return _impl->GetMarkerTexture(); } //================================================================================= @@ -229,23 +325,18 @@ SALOMEDS::TMPFile* GEOM_Object_i::GetShapeStream() if(aShape.IsNull()) return NULL; - ostrstream streamShape; + std::ostringstream 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. - int size = streamShape.pcount(); - char* buf = new char [size]; - //Get pointer on internal character array in ostrstream - char* valueOfStream = streamShape.str(); - //Create copy of ostrstream content - memcpy(buf, valueOfStream, size); - //Allow automatic deletion of ostrstream content - streamShape.rdbuf()->freeze(0); - - CORBA::Octet* OctetBuf = (CORBA::Octet*)buf; + int size = streamShape.str().size(); + //Allocate octect buffer of required size + CORBA::Octet* OctetBuf = SALOMEDS::TMPFile::allocbuf(size); + //Copy ostrstream content to the octect buffer + memcpy(OctetBuf, streamShape.str().c_str(), size); + //Create and return TMPFile SALOMEDS::TMPFile_var SeqFile = new SALOMEDS::TMPFile(size,size,OctetBuf,1); return SeqFile._retn(); - } @@ -253,9 +344,9 @@ SALOMEDS::TMPFile* GEOM_Object_i::GetShapeStream() //function : getShape //purpose : return the TopoDS_Shape when client and servant are colocated, be careful //======================================================================= -CORBA::Long GEOM_Object_i::getShape() { +CORBA::LongLong GEOM_Object_i::getShape() { _geom = _impl->GetValue(); - return CORBA::Long(size_t(&_geom)); + return ((CORBA::LongLong)(&_geom)); } //============================================================================= @@ -268,7 +359,7 @@ GEOM::ListOfLong* GEOM_Object_i::GetSubShapeIndices() GEOM::ListOfLong_var anIndices = new GEOM::ListOfLong; if(!_impl->IsMainShape()) { - Handle(GEOM_Function) aFunction = _impl->GetFunction(1); //Get SubShape function (always the first (and last) one) + Handle(::GEOM_Function) aFunction = _impl->GetLastFunction(); //Get Sub-shape function (always the first (and last) one) if(aFunction.IsNull()) return anIndices._retn(); GEOM_ISubShape ISS(aFunction); Handle(TColStd_HArray1OfInteger) anArray = ISS.GetIndices(); @@ -293,7 +384,7 @@ GEOM::GEOM_Object_ptr GEOM_Object_i::GetMainShape() { GEOM::GEOM_Object_var obj; if(!_impl->IsMainShape()) { - Handle(GEOM_Function) aFunction = _impl->GetFunction(1); //Get SubShape function (always the first (and last) one) + Handle(::GEOM_Function) aFunction = _impl->GetFunction(1); //Get Sub-shape function (always the first (and last) one) if(aFunction.IsNull()) return obj._retn(); GEOM_ISubShape ISS(aFunction); @@ -303,7 +394,8 @@ GEOM::GEOM_Object_ptr GEOM_Object_i::GetMainShape() 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 GEOM::GEOM_Object::_narrow + ( _engine->GetObject( anEntry.ToCString()) ); } return obj._retn(); @@ -313,3 +405,21 @@ bool GEOM_Object_i::IsShape() { return !_impl->GetValue().IsNull() && _impl->GetType() != GEOM_MARKER; } + +bool GEOM_Object_i::IsSame(GEOM::GEOM_BaseObject_ptr other) +{ + bool result = false; + + GEOM::GEOM_Object_var shapePtr = GEOM::GEOM_Object::_narrow( other ); + if ( !CORBA::is_nil( shapePtr ) ) { + CORBA::String_var entry = shapePtr->GetEntry(); + Handle(::GEOM_Object) otherObject = Handle(::GEOM_Object)::DownCast + ( GEOM_Engine::GetEngine()->GetObject( entry, false )); + if ( !otherObject.IsNull() ) { + TopoDS_Shape thisShape = _impl->GetValue(); + TopoDS_Shape otherShape = otherObject->GetValue(); + result = !thisShape.IsNull() && !otherShape.IsNull() && thisShape.IsSame( otherShape ); + } + } + return result; +}