X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM%2FGEOM_Engine.cxx;h=dd7fefae6afb03f4a8dbfb025a7ca14d3af57f7a;hb=d617faae6bc5aeb91b63796618a20c7c13037b6c;hp=003a55332912566dcbf17ee4916798a0c7fdbaee;hpb=3f9390adf4628a2ed448be3bd6f85546bf056457;p=modules%2Fgeom.git diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 003a55332..dd7fefae6 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2023 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 @@ -20,24 +20,24 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#ifdef WNT +#ifdef WIN32 #pragma warning( disable:4786 ) #endif #include "GEOM_Engine.hxx" -#include "GEOM_Solver.hxx" +#include "GEOM_Field.hxx" #include "GEOM_Function.hxx" #include "GEOM_ISubShape.hxx" -#include "GEOM_SubShapeDriver.hxx" -#include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx" #include "GEOM_PythonDump.hxx" - -#include +#include "GEOM_Solver.hxx" +#include "GEOM_SubShapeDriver.hxx" +#include "Sketcher_Profile.hxx" #include "utilities.h" #include +#include #include #include @@ -61,15 +61,15 @@ #include #include -#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 -#include #include -#else -#include -#include -#endif +#if OCC_VERSION_LARGE < 0x07050000 #include +#endif + +#include +#include +#include #include @@ -83,50 +83,43 @@ #define C_SQR_BRACKET ']' #define PY_NULL "None" -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif +// VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +// Next macro, when defined, causes appearing of SubShapeAllIDs(), SubShapeAllSortedIDs(), GetSameIDs() +// and other such commands in Python dump. +// See also GEOMImpl_IShapesOperations.cxx. +// --------------------------------------- +// #define DUMP_SUBSHAPE_IDS +// --------------------------------------- typedef std::map< TCollection_AsciiString, TCollection_AsciiString > TSting2StringMap; typedef std::map< TCollection_AsciiString, TObjectData > TSting2ObjDataMap; typedef std::map< TCollection_AsciiString, TObjectData* > TSting2ObjDataPtrMap; +typedef std::map< int, std::list < int > > TIntToListIntMap; static GEOM_Engine* TheEngine = NULL; -static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_Object)& theObject) +static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_BaseObject)& theObject) { - TCollection_AsciiString anID(theObject->GetDocID()), anEntry; + TCollection_AsciiString anEntry; TDF_Tool::Entry(theObject->GetEntry(), anEntry); - anID+=(TCollection_AsciiString("_")+anEntry); - return anID; -} - -static TCollection_AsciiString BuildID(Standard_Integer theDocID, char* theEntry) -{ - TCollection_AsciiString anID(theDocID); - anID+=(TCollection_AsciiString("_")+theEntry); - return anID; -} - -static Standard_Integer ExtractDocID(TCollection_AsciiString& theID) -{ - TCollection_AsciiString aDocID = theID.Token("_"); - if(aDocID.Length() < 1) return -1; - return aDocID.IntegerValue(); + return anEntry; } bool ProcessFunction(Handle(GEOM_Function)& theFunction, TCollection_AsciiString& theScript, TCollection_AsciiString& theAfterScript, const TVariablesList& theVariables, - const bool theIsPublished, + const bool /*theIsPublished*/, TDF_LabelMap& theProcessed, std::set& theIgnoreObjs, bool& theIsDumpCollected); +static int GetTag(const TCollection_AsciiString &theEntry); + +static void FillMapOfRef(const Handle(GEOM_Function) &theFunction, + TIntToListIntMap &theRefMap); + void ReplaceVariables(TCollection_AsciiString& theCommand, const TVariablesList& theVariables); @@ -139,11 +132,10 @@ void ReplaceEntriesByNames (TCollection_AsciiString& theScript, Standard_Integer& objectCounter, Resource_DataMapOfAsciiStringAsciiString& aNameToEntry); -void AddObjectColors (int theDocID, - TCollection_AsciiString& theScript, +void AddObjectColors (TCollection_AsciiString& theScript, const TSting2ObjDataMap& theEntry2ObjData); -void AddTextures (int theDocID, TCollection_AsciiString& theScript); +void AddTextures (TCollection_AsciiString& theScript); void PublishObject (TObjectData& theObjectData, TSting2ObjDataMap& theEntry2ObjData, @@ -152,30 +144,36 @@ void PublishObject (TObjectData& theObjectData, std::map< int, TCollection_AsciiString >& theEntryToCmdMap, std::set& theMapOfPublished); -namespace +static TCollection_AsciiString GetPublishCommands + (const int theTag, + const std::map< int, TCollection_AsciiString > &theEntryToCmdMap, + const TIntToListIntMap &theMapRefs, + std::set< int > &thePublished); + +void Prettify(TCollection_AsciiString& theScript); + +//================================================================================ +/*! + * \brief Fix up the name of python variable + */ +//================================================================================ + +void GEOM_Engine::healPyName( TCollection_AsciiString& pyName, + const TCollection_AsciiString& anEntry, + Resource_DataMapOfAsciiStringAsciiString& aNameToEntry) { - //================================================================================ - /*! - * \brief Fix up the name of python variable - */ - //================================================================================ - - void healPyName( TCollection_AsciiString& pyName, - const TCollection_AsciiString& anEntry, - Resource_DataMapOfAsciiStringAsciiString& aNameToEntry) - { - const TCollection_AsciiString allowedChars - ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"); + const TCollection_AsciiString allowedChars + ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"); - if ( pyName.IsIntegerValue() ) { // pyName must not start with a digit - pyName.Insert( 1, 'a' ); - } - int p, p2=1; // replace not allowed chars - while ((p = pyName.FirstLocationNotInSet(allowedChars, p2, pyName.Length()))) { - pyName.SetValue(p, '_'); - p2=p; - } - if ( aNameToEntry.IsBound( pyName ) && anEntry != aNameToEntry( pyName )) + if ( pyName.IsIntegerValue() ) { // pyName must not start with a digit + pyName.Insert( 1, 'a' ); + } + int p, p2=1; // replace not allowed chars + while ((p = pyName.FirstLocationNotInSet(allowedChars, p2, pyName.Length()))) { + pyName.SetValue(p, '_'); + p2=p; + } + if ( aNameToEntry.IsBound( pyName ) && anEntry != aNameToEntry( pyName )) { // diff objects have same name - make a new name by appending a digit TCollection_AsciiString aName2; Standard_Integer i = 0; @@ -184,7 +182,6 @@ namespace } while ( aNameToEntry.IsBound( aName2 ) && anEntry != aNameToEntry( aName2 )); pyName = aName2; } - } } //======================================================================= @@ -221,7 +218,10 @@ GEOM_Engine::GEOM_Engine() TFunction_DriverTable::Get()->AddDriver(GEOM_Object::GetSubShapeID(), new GEOM_SubShapeDriver()); _OCAFApp = new GEOM_Application(); - _UndoLimit = 10; + _OCAFApp->DefineFormat("SALOME_GEOM", "GEOM Document Version 1.0", "sgd", + new StdDrivers_DocumentRetrievalDriver, 0); + BinDrivers::DefineFormat(_OCAFApp); + _UndoLimit = 0; } /*! @@ -237,18 +237,8 @@ GEOM_Engine::~GEOM_Engine() for(objit = objs.begin(); objit != objs.end(); ++objit) RemoveObject(*objit); - //Close all documents not closed -#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 - TColStd_DataMapIteratorOfDataMapOfIntegerTransient anItr (_mapIDDocument); -#else - Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr (_mapIDDocument); -#endif - for (; anItr.More(); anItr.Next()) - { - Close(anItr.Key()); - anItr.Initialize( _mapIDDocument ); // anItr becomes invalid at _mapIDDocument.UnBind(docId) - } - _mapIDDocument.Clear(); + //Close document + Close(); _objects.Clear(); } @@ -257,61 +247,47 @@ GEOM_Engine::~GEOM_Engine() * GetDocument */ //============================================================================= -Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID, bool force) +Handle(TDocStd_Document) GEOM_Engine::GetDocument(bool force) { Handle(TDocStd_Document) aDoc; - if(_mapIDDocument.IsBound(theDocID)) { - aDoc = Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID)); + if (_document) { + aDoc = _document; } else if (force) { - _OCAFApp->NewDocument("SALOME_GEOM", aDoc); + _OCAFApp->NewDocument("BinOcaf", aDoc); aDoc->SetUndoLimit(_UndoLimit); - _mapIDDocument.Bind(theDocID, aDoc); - TDataStd_Integer::Set(aDoc->Main(), theDocID); + _document = aDoc; } return aDoc; } -//============================================================================= -/*! - * GetDocID - */ -//============================================================================= -int GEOM_Engine::GetDocID(Handle(TDocStd_Document) theDocument) -{ - if (theDocument.IsNull()) return -1; -#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 - TColStd_DataMapIteratorOfDataMapOfIntegerTransient anItr (_mapIDDocument); -#else - Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr (_mapIDDocument); -#endif - for (; anItr.More(); anItr.Next()) - if (anItr.Value() == theDocument) return anItr.Key(); - - return -1; -} - //============================================================================= /*! * GetObject */ //============================================================================= -Handle(GEOM_Object) GEOM_Engine::GetObject(int theDocID, char* theEntry, bool force) -{ - Handle(GEOM_Object) anObject; - TCollection_AsciiString anID = BuildID(theDocID, theEntry); +Handle(GEOM_BaseObject) GEOM_Engine::GetObject(const char* theEntry, bool force) +{ + Handle(GEOM_BaseObject) anObject; - if (_objects.IsBound(anID)) { - anObject = Handle(GEOM_Object)::DownCast(_objects(anID)); + if (_objects.IsBound(theEntry)) { + anObject = Handle(GEOM_BaseObject)::DownCast(_objects(theEntry)); } else if (force) { - Handle(TDocStd_Document) aDoc = GetDocument(theDocID, force); + Handle(TDocStd_Document) aDoc = GetDocument(force); if ( !aDoc.IsNull()) { TDF_Label aLabel; TDF_Tool::Label(aDoc->Main().Data(), theEntry, aLabel, Standard_True); - anObject = new GEOM_Object(aLabel); - _objects.Bind(anID, anObject); + if ( !aLabel.IsNull() ) { + int objType = GEOM_BaseObject::GetType( aLabel ); + switch ( objType ) { + case GEOM_FIELD_OBJTYPE: anObject = new GEOM_Field (aLabel); break; + case GEOM_FIELD_STEP_OBJTYPE: anObject = new GEOM_FieldStep(aLabel); break; + default: anObject = new GEOM_Object (aLabel); + } + _objects.Bind(theEntry, anObject); + } } } @@ -320,32 +296,35 @@ Handle(GEOM_Object) GEOM_Engine::GetObject(int theDocID, char* theEntry, bool fo //============================================================================= /*! - * AddObject + * AddBaseObject */ //============================================================================= -Handle(GEOM_Object) GEOM_Engine::AddObject(int theDocID, int theType) + +Handle(GEOM_BaseObject) GEOM_Engine::AddBaseObject(int theType) { - Handle(TDocStd_Document) aDoc = GetDocument(theDocID); + Handle(TDocStd_Document) aDoc = GetDocument(); Handle(TDataStd_TreeNode) aRoot = TDataStd_TreeNode::Set(aDoc->Main()); // NPAL18604: use existing label to decrease memory usage, // if this label has been freed (object deleted) bool useExisting = false; TDF_Label aChild; - if (_freeLabels.find(theDocID) != _freeLabels.end()) { - std::list& aFreeLabels = _freeLabels[theDocID]; - if (!aFreeLabels.empty()) { - useExisting = true; - aChild = aFreeLabels.front(); - aFreeLabels.pop_front(); - } + if (!_freeLabels.empty()) { + useExisting = true; + aChild = _freeLabels.front(); + _freeLabels.pop_front(); } if (!useExisting) { // create new label aChild = TDF_TagSource::NewChild(aDoc->Main()); } - Handle(GEOM_Object) anObject = new GEOM_Object(aChild, theType); + Handle(GEOM_BaseObject) anObject; + switch ( theType ) { + case GEOM_FIELD_OBJTYPE: anObject = new GEOM_Field (aChild, theType); break; + case GEOM_FIELD_STEP_OBJTYPE: anObject = new GEOM_FieldStep(aChild, theType); break; + default: anObject = new GEOM_Object (aChild, theType); + } //Put an object in the map of created objects TCollection_AsciiString anID = BuildIDFromObject(anObject); @@ -355,32 +334,40 @@ Handle(GEOM_Object) GEOM_Engine::AddObject(int theDocID, int theType) return anObject; } +//================================================================================ +/*! + * \brief Adds a new object of the type theType in the OCAF document + */ +//================================================================================ + +Handle(GEOM_Object) GEOM_Engine::AddObject(int theType) +{ + return Handle(GEOM_Object)::DownCast( AddBaseObject(theType) ); +} + //============================================================================= /*! * AddSubShape */ //============================================================================= -Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape, + +Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape, Handle(TColStd_HArray1OfInteger) theIndices, bool isStandaloneOperation) { if (theMainShape.IsNull() || theIndices.IsNull()) return NULL; - Handle(TDocStd_Document) aDoc = GetDocument(theMainShape->GetDocID()); + Handle(TDocStd_Document) aDoc = GetDocument(); Handle(TDataStd_TreeNode) aRoot = TDataStd_TreeNode::Set(aDoc->Main()); // NPAL18604: use existing label to decrease memory usage, // if this label has been freed (object deleted) bool useExisting = false; - TDF_Label aChild; - int aDocID = theMainShape->GetDocID(); - if (_freeLabels.find(aDocID) != _freeLabels.end()) { - std::list& aFreeLabels = _freeLabels[aDocID]; - if (!aFreeLabels.empty()) { - useExisting = true; - aChild = aFreeLabels.front(); - aFreeLabels.pop_front(); - } + TDF_Label aChild;; + if (!_freeLabels.empty()) { + useExisting = true; + aChild = _freeLabels.front(); + _freeLabels.pop_front(); } if (!useExisting) { // create new label @@ -396,18 +383,15 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape, aSSI.SetIndices(theIndices); try { -#if OCC_VERSION_LARGE > 0x06010000 OCC_CATCH_SIGNALS; -#endif GEOM_Solver aSolver (GEOM_Engine::GetEngine()); if (!aSolver.ComputeFunction(aFunction)) { MESSAGE("GEOM_Engine::AddSubShape Error: Can't build a sub shape"); return NULL; } } - catch (Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - MESSAGE("GEOM_Engine::AddSubShape Error: " << aFail->GetMessageString()); + catch (Standard_Failure& aFail) { + MESSAGE("GEOM_Engine::AddSubShape Error: " << aFail.GetMessageString()); return NULL; } @@ -440,20 +424,29 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape, * RemoveObject */ //============================================================================= -bool GEOM_Engine::RemoveObject(Handle(GEOM_Object) theObject) +bool GEOM_Engine::RemoveObject(Handle(GEOM_BaseObject)& theObject) { if (theObject.IsNull()) return false; - int aDocID = theObject->GetDocID(); - if(!_mapIDDocument.IsBound(aDocID)) + if(!_document) return false; // document is closed... + TDF_Label aLabel = theObject->GetEntry(); + if ( aLabel == aLabel.Root() ) + return false; // already removed object + //Remove an object from the map of available objects TCollection_AsciiString anID = BuildIDFromObject(theObject); - if (_objects.IsBound(anID)) _objects.UnBind(anID); + if (_objects.IsBound(anID)) { + Handle(GEOM_BaseObject) anObject = Handle(GEOM_BaseObject)::DownCast(_objects(anID)); + if ( anObject != theObject ) + anObject->_label = anObject->_label.Root(); + _objects.UnBind(anID); + } // If sub-shape, remove it from the list of sub-shapes of its main shape - if (!theObject->IsMainShape()) { + Handle(GEOM_Object) aGO = Handle(GEOM_Object)::DownCast( theObject ); + if ( !aGO.IsNull() && !aGO->IsMainShape()) { Handle(GEOM_Function) aFunction = theObject->GetFunction(1); GEOM_ISubShape aSSI (aFunction); Handle(GEOM_Function) aMainShape = aSSI.GetMainShape(); @@ -470,12 +463,17 @@ bool GEOM_Engine::RemoveObject(Handle(GEOM_Object) theObject) aNode->Remove(); } - TDF_Label aLabel = theObject->GetEntry(); aLabel.ForgetAllAttributes(Standard_True); // Remember the label to reuse it then - std::list& aFreeLabels = _freeLabels[aDocID]; - aFreeLabels.push_back(aLabel); + if ( _freeLabels.empty() || _freeLabels.back() != aLabel ) + _freeLabels.push_back(aLabel); + + // we can't explicitly delete theObject. At least prevent its functioning + // as an alive object when aLabel is reused for a new object + theObject->_label = aLabel.Root(); + theObject->_ior.Clear(); + theObject->_parameters.Clear();; theObject.Nullify(); @@ -487,9 +485,9 @@ bool GEOM_Engine::RemoveObject(Handle(GEOM_Object) theObject) * Undo */ //============================================================================= -void GEOM_Engine::Undo(int theDocID) +void GEOM_Engine::Undo() { - GetDocument(theDocID)->Undo(); + GetDocument()->Undo(); } //============================================================================= @@ -497,9 +495,9 @@ void GEOM_Engine::Undo(int theDocID) * Redo */ //============================================================================= -void GEOM_Engine::Redo(int theDocID) +void GEOM_Engine::Redo() { - GetDocument(theDocID)->Redo(); + GetDocument()->Redo(); } //============================================================================= @@ -507,14 +505,17 @@ void GEOM_Engine::Redo(int theDocID) * Save */ //============================================================================= -bool GEOM_Engine::Save(int theDocID, char* theFileName) +bool GEOM_Engine::Save(const char* theFileName) { - if(!_mapIDDocument.IsBound(theDocID)) return false; - Handle(TDocStd_Document) aDoc = Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID)); + if(!_document) return false; - _OCAFApp->SaveAs(aDoc, theFileName); +#if defined(WIN32) && defined(UNICODE) + std::wstring aFileName = Kernel_Utils::utf8_decode_s(theFileName); +#else + std::string aFileName = theFileName; +#endif - return true; + return _OCAFApp->SaveAs( _document, aFileName.c_str() ) == PCDM_SS_OK; } //============================================================================= @@ -522,23 +523,26 @@ bool GEOM_Engine::Save(int theDocID, char* theFileName) * Load */ //============================================================================= -bool GEOM_Engine::Load(int theDocID, char* theFileName) +bool GEOM_Engine::Load(const char* theFileName) { - Handle(TDocStd_Document) aDoc; -#if OCC_VERSION_LARGE > 0x06050100 // For OCCT6.5.2 and higher - if (_OCAFApp->Open(theFileName, aDoc) != PCDM_RS_OK) { +#if defined(WIN32) && defined(UNICODE) + std::wstring aFileName = Kernel_Utils::utf8_decode_s(theFileName); #else - if (_OCAFApp->Open(theFileName, aDoc) != CDF_RS_OK) { + std::string aFileName = theFileName; #endif + Handle(TDocStd_Document) aDoc; + if (_OCAFApp->Open(aFileName.c_str(), aDoc) != PCDM_RS_OK) { return false; } - aDoc->SetUndoLimit(_UndoLimit); + // Replace old document format by the new one. + if (aDoc->StorageFormat().IsEqual("SALOME_GEOM")) { + aDoc->ChangeStorageFormat("BinOcaf"); + } - if(_mapIDDocument.IsBound(theDocID)) _mapIDDocument.UnBind(theDocID); - _mapIDDocument.Bind(theDocID, aDoc); + aDoc->SetUndoLimit(_UndoLimit); - TDataStd_Integer::Set(aDoc->Main(), theDocID); + _document = aDoc; return true; } @@ -548,30 +552,24 @@ bool GEOM_Engine::Load(int theDocID, char* theFileName) * Close */ //============================================================================= -void GEOM_Engine::Close(int theDocID) +void GEOM_Engine::Close() { - if (_mapIDDocument.IsBound(theDocID)) { - Handle(TDocStd_Document) aDoc = Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID)); - - //Remove all GEOM Objects associated to the given document + if (_document) { + //Remove all GEOM Objects associated to the document TColStd_SequenceOfAsciiString aSeq; GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient It (_objects); for (; It.More(); It.Next()) { - TCollection_AsciiString anObjID (It.Key()); - Standard_Integer anID = ExtractDocID(anObjID); - if (theDocID == anID) aSeq.Append(It.Key()); + aSeq.Append(It.Key()); } - for (Standard_Integer i=1; i<=aSeq.Length(); i++) _objects.UnBind(aSeq.Value(i)); - - // Forget free labels for this document - TFreeLabelsList::iterator anIt = _freeLabels.find(theDocID); - if (anIt != _freeLabels.end()) { - _freeLabels.erase(anIt); + for (Standard_Integer i=1; i<=aSeq.Length(); i++) { + _objects.UnBind(aSeq.Value(i)); } - _mapIDDocument.UnBind(theDocID); - _OCAFApp->Close(aDoc); - aDoc.Nullify(); + // Forget free labels for document + _freeLabels.clear(); + + _OCAFApp->Close(_document); + _document.Nullify(); } } @@ -580,8 +578,7 @@ void GEOM_Engine::Close(int theDocID) * DumpPython */ //============================================================================= -TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, - std::vector& theObjectData, +TCollection_AsciiString GEOM_Engine::DumpPython(std::vector& theObjectData, TVariablesList theVariables, bool isPublished, bool isMultiFile, @@ -591,33 +588,36 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, Kernel_Utils::Localizer loc; TCollection_AsciiString aScript; - Handle(TDocStd_Document) aDoc = GetDocument(theDocID); + Handle(TDocStd_Document) aDoc = GetDocument(); if (aDoc.IsNull()) { TCollection_AsciiString anEmptyScript; if( isMultiFile ) - anEmptyScript = "def RebuildData(theStudy): pass\n"; + anEmptyScript = "def RebuildData(): pass\n"; return anEmptyScript; } + + if( isMultiFile ) + aScript = "import salome\n"; - aScript = "import GEOM\n"; + aScript += "import GEOM\n"; aScript += "from salome.geom import geomBuilder\n"; aScript += "import math\n"; aScript += "import SALOMEDS\n\n"; if( isMultiFile ) - aScript += "def RebuildData(theStudy):"; + aScript += "def RebuildData():"; - aScript += "\n\tgeompy = geomBuilder.New(theStudy)\n"; + aScript += "\n\tgeompy = geomBuilder.New()\n"; - AddTextures(theDocID, aScript); + AddTextures(aScript); Standard_Integer posToInsertGlobalVars = aScript.Length() + 1; // a map containing copies of TObjectData from theObjectData TSting2ObjDataMap aEntry2ObjData; // contains pointers to TObjectData of either aEntry2ObjData or theObjectData; the latter - // occures when several StudyEntries correspond to one Entry + // occurs when several StudyEntries correspond to one Entry TSting2ObjDataPtrMap aStEntry2ObjDataPtr; //Resource_DataMapOfAsciiStringAsciiString aEntry2StEntry, aStEntry2Entry, theObjectNames; @@ -628,7 +628,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, TDF_Label L; TDF_Tool::Label( aDoc->GetData(), data._entry, L ); if ( L.IsNull() ) continue; - Handle(GEOM_Object) obj = GEOM_Object::GetObject( L ); + Handle(GEOM_BaseObject) obj = GEOM_BaseObject::GetObject( L ); // fill maps if ( !obj.IsNull() ) { TSting2ObjDataMap::iterator ent2Data = @@ -655,6 +655,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, // Mantis issue 0020768 Standard_Integer objectCounter = 0; Resource_DataMapOfAsciiStringAsciiString aNameToEntry; + TIntToListIntMap aRefMap; if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) { TDataStd_ChildNodeIterator Itr(aRoot); @@ -683,6 +684,10 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, continue; // aCurScript is already at the end of aFuncScript aFuncScript += aCurScript; } + + // Fill the map of references. + FillMapOfRef(aFunction, aRefMap); + if (isDumpCollected ) { // Replace entries by the names ReplaceEntriesByNames( aFuncScript, aEntry2ObjData, isPublished, @@ -698,9 +703,16 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, aNameToEntry, anEntryToCmdMap, anIgnoreObjMap ); } // add publishing commands to the script + std::set< int > aPublished; std::map< int, TCollection_AsciiString >::iterator anEntryToCmd = anEntryToCmdMap.begin(); - for ( ; anEntryToCmd != anEntryToCmdMap.end(); ++anEntryToCmd ) - aFuncScript += anEntryToCmd->second; + + for ( ; anEntryToCmd != anEntryToCmdMap.end(); ++anEntryToCmd ) { + const TCollection_AsciiString aPublishCmds = + GetPublishCommands(anEntryToCmd->first, anEntryToCmdMap, + aRefMap, aPublished); + + aFuncScript += aPublishCmds; + } // PTv, 0020001 add result objects from RestoreGivenSubShapes into ignore list, // because they will be published during command execution @@ -734,7 +746,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, aScript += aFuncScript; // ouv : NPAL12872 - AddObjectColors( theDocID, aScript, aEntry2ObjData ); + AddObjectColors(aScript, aEntry2ObjData ); // Make script to publish in study TSting2ObjDataPtrMap::iterator aStEntry2ObjDataPtrIt; @@ -753,9 +765,16 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, aNameToEntry, anEntryToCmdMap, anIgnoreObjMap ); } // add publishing commands to the script + std::set< int > aPublished; std::map< int, TCollection_AsciiString >::iterator anEntryToCmd = anEntryToCmdMap.begin(); - for ( ; anEntryToCmd != anEntryToCmdMap.end(); ++anEntryToCmd ) - aScript += anEntryToCmd->second; + + for ( ; anEntryToCmd != anEntryToCmdMap.end(); ++anEntryToCmd ) { + const TCollection_AsciiString aPublishCmds = + GetPublishCommands(anEntryToCmd->first, anEntryToCmdMap, + aRefMap, aPublished); + + aScript += aPublishCmds; + } } //RNV: issue 16219: EDF PAL 469: "RemoveFromStudy" Function @@ -771,7 +790,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, { TObjectData* data = aStEntry2ObjDataPtrIt->second; if ( data->_unpublished && !data->_pyName.IsEmpty() ) { - aScript += unpublishCmd + data->_pyName + ")"; + aScript += unpublishCmd + data->_pyName + ")"; } } @@ -798,6 +817,11 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, aScript.Insert( posToInsertGlobalVars, globalVars ); } + // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump +#ifndef DUMP_SUBSHAPE_IDS + Prettify(aScript); +#endif + return aScript; } @@ -837,28 +861,21 @@ Handle(TColStd_HSequenceOfAsciiString) GEOM_Engine::GetAllDumpNames() const #define TEXTURE_LABEL_HEIGHT 4 #define TEXTURE_LABEL_DATA 5 -int GEOM_Engine::addTexture(int theDocID, int theWidth, int theHeight, -#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 +int GEOM_Engine::addTexture(int theWidth, int theHeight, const Handle(TColStd_HArray1OfByte)& theTexture, -#else - const Handle(TDataStd_HArray1OfByte)& theTexture, -#endif const TCollection_AsciiString& theFileName) { - Handle(TDocStd_Document) aDoc = GetDocument(theDocID); + Handle(TDocStd_Document) aDoc = GetDocument(); Handle(TDataStd_TreeNode) aRoot = TDataStd_TreeNode::Set(aDoc->Main()); // NPAL18604: use existing label to decrease memory usage, // if this label has been freed (object deleted) bool useExisting = false; TDF_Label aChild; - if (_freeLabels.find(theDocID) != _freeLabels.end()) { - std::list& aFreeLabels = _freeLabels[theDocID]; - if (!aFreeLabels.empty()) { - useExisting = true; - aChild = aFreeLabels.front(); - aFreeLabels.pop_front(); - } + if (!_freeLabels.empty()) { + useExisting = true; + aChild = _freeLabels.front(); + _freeLabels.pop_front(); } if (!useExisting) { // create new label @@ -887,22 +904,14 @@ int GEOM_Engine::addTexture(int theDocID, int theWidth, int theHeight, return aTextureID; } -#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 -Handle(TColStd_HArray1OfByte) GEOM_Engine::getTexture(int theDocID, int theTextureID, -#else -Handle(TDataStd_HArray1OfByte) GEOM_Engine::getTexture(int theDocID, int theTextureID, -#endif +Handle(TColStd_HArray1OfByte) GEOM_Engine::getTexture(int theTextureID, int& theWidth, int& theHeight, TCollection_AsciiString& theFileName) { -#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 Handle(TColStd_HArray1OfByte) anArray; -#else - Handle(TDataStd_HArray1OfByte) anArray; -#endif theWidth = theHeight = 0; - Handle(TDocStd_Document) aDoc = GetDocument(theDocID); + Handle(TDocStd_Document) aDoc = GetDocument(); TDF_ChildIterator anIterator(aDoc->Main(), Standard_True); bool found = false; @@ -936,11 +945,11 @@ Handle(TDataStd_HArray1OfByte) GEOM_Engine::getTexture(int theDocID, int theText return anArray; } -std::list GEOM_Engine::getAllTextures(int theDocID) +std::list GEOM_Engine::getAllTextures() { std::list id_list; - Handle(TDocStd_Document) aDoc = GetDocument(theDocID); + Handle(TDocStd_Document) aDoc = GetDocument(); TDF_ChildIterator anIterator(aDoc->Main(), Standard_True); for (; anIterator.More(); anIterator.Next()) { @@ -961,98 +970,15 @@ std::list GEOM_Engine::getAllTextures(int theDocID) //============================================================================= /*! - * ProcessFunction: Dump function description into script + * MakeCommandfor3DSketcher: Make new command for 3DSketcher */ //============================================================================= -bool ProcessFunction(Handle(GEOM_Function)& theFunction, - TCollection_AsciiString& theScript, - TCollection_AsciiString& theAfterScript, - const TVariablesList& theVariables, - const bool theIsPublished, - TDF_LabelMap& theProcessed, - std::set& theIgnoreObjs, - bool& theIsDumpCollected) +TCollection_AsciiString MakeCommandfor3DSketcher (const TCollection_AsciiString& theDescr ) { - theIsDumpCollected = false; - if (theFunction.IsNull()) return false; - - if (theProcessed.Contains(theFunction->GetEntry())) return false; - - // pass functions, that depends on nonexisting ones - bool doNotProcess = false; - TDF_LabelSequence aSeq; - theFunction->GetDependency(aSeq); - Standard_Integer aLen = aSeq.Length(); - for (Standard_Integer i = 1; i <= aLen && !doNotProcess; i++) { - TDF_Label aRefLabel = aSeq.Value(i); - Handle(TDF_Reference) aRef; - if (!aRefLabel.FindAttribute(TDF_Reference::GetID(), aRef)) { - doNotProcess = true; - } - else { - if (aRef.IsNull() || aRef->Get().IsNull()) { - doNotProcess = true; - } - else { - Handle(TDataStd_TreeNode) aT; - if (!TDataStd_TreeNode::Find(aRef->Get(), aT)) { - doNotProcess = true; - } - else { - TDF_Label aDepLabel = aT->Label(); - Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(aDepLabel); - - if (aFunction.IsNull()) doNotProcess = true; - else if (!theProcessed.Contains(aDepLabel)) doNotProcess = true; - } - } - } - } - - if (doNotProcess) { - TCollection_AsciiString anObjEntry; - TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry); - theIgnoreObjs.insert(anObjEntry); - return false; - } - theProcessed.Add(theFunction->GetEntry()); - - TCollection_AsciiString aDescr = theFunction->GetDescription(); - if(aDescr.Length() == 0) return false; - - //Check if its internal function which doesn't requires dumping - if(aDescr == "None") return false; - - //Check the very specific case of RestoreShape function, - //which is not dumped, but the result can be published by the user. - //We do not publish such objects to decrease danger of dumped script failure. - if(aDescr.Value(1) == '#') { - TCollection_AsciiString anObjEntry; - TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry); - theIgnoreObjs.insert(anObjEntry); - return false; - } - - // 0020001 PTv, check for critical functions, which require dump of objects - if (theIsPublished) - { - // currently, there is only one function "RestoreGivenSubShapes", - // later this check could be replaced by iterations on list of such functions - if (aDescr.Search( "RestoreGivenSubShapes" ) != -1) - theIsDumpCollected = true; - else if (aDescr.Search( "RestoreSubShapes" ) != -1) - theIsDumpCollected = true; - } - - //Replace parameter by notebook variables - ReplaceVariables(aDescr,theVariables); - - //Process sketcher functions, replacing string command by calls to Sketcher interface - if (aDescr.Search( "Make3DSketcher" ) != -1) { TCollection_AsciiString aNewDescr; int i = 1; - TCollection_AsciiString aSubStr = aDescr.Token("\n\t", i); - for (; !aSubStr.IsEmpty(); aSubStr = aDescr.Token("\n\t", i)) { + TCollection_AsciiString aSubStr = theDescr.Token("\n\t", i); + for (; !aSubStr.IsEmpty(); aSubStr = theDescr.Token("\n\t", i)) { if (aSubStr.Search( "Make3DSketcherCommand" ) != -1) { TCollection_AsciiString aResult = aSubStr.Token(" ", 1); // "3DSketcher:CMD[:CMD[:CMD...]]" @@ -1073,7 +999,7 @@ bool ProcessFunction(Handle(GEOM_Function)& theFunction, if (i > 1) aNewDescr += "\n\t"; - aNewDescr += "sk = geompy.Sketcher3D()"; + aNewDescr += "\nsk = geompy.Sketcher3D()"; int nbCMDs = aSequence.Length(); for (icmd = 1; icmd <= nbCMDs; icmd++) { aNewDescr += "\n\t"; @@ -1126,7 +1052,7 @@ bool ProcessFunction(Handle(GEOM_Function)& theFunction, aCommand = aCommand.Token("]", 1); if (i > 1) aNewDescr += "\n\t"; - aNewDescr += "sk = geompy.Sketcher3D()"; + aNewDescr += "\nsk = geompy.Sketcher3D()"; aNewDescr += "\n\t"; aNewDescr += "sk.addPointsAbsolute("; aNewDescr += aCommand + ")"; @@ -1138,10 +1064,107 @@ bool ProcessFunction(Handle(GEOM_Function)& theFunction, aNewDescr += "\n\t"; aNewDescr += aSubStr; } - i++; } - aDescr = aNewDescr; + return aNewDescr; +} + +//============================================================================= +/*! + * ProcessFunction: Dump function description into script + */ +//============================================================================= +bool ProcessFunction(Handle(GEOM_Function)& theFunction, + TCollection_AsciiString& theScript, + TCollection_AsciiString& theAfterScript, + const TVariablesList& theVariables, + const bool theIsPublished, + TDF_LabelMap& theProcessed, + std::set& theIgnoreObjs, + bool& theIsDumpCollected) +{ + theIsDumpCollected = false; + if (theFunction.IsNull()) return false; + + if (theProcessed.Contains(theFunction->GetEntry())) return false; + + // pass functions, that depends on nonexisting ones + bool doNotProcess = false; + TDF_LabelSequence aSeq; + theFunction->GetDependency(aSeq); + Standard_Integer aLen = aSeq.Length(); + for (Standard_Integer i = 1; i <= aLen && !doNotProcess; i++) { + TDF_Label aRefLabel = aSeq.Value(i); + Handle(TDF_Reference) aRef; + if (!aRefLabel.FindAttribute(TDF_Reference::GetID(), aRef)) { + doNotProcess = true; + } + else { + if (aRef.IsNull() || aRef->Get().IsNull()) { + doNotProcess = true; + } + else { + Handle(TDataStd_TreeNode) aT; + if (!TDataStd_TreeNode::Find(aRef->Get(), aT)) { + doNotProcess = true; + } + else { + TDF_Label aDepLabel = aT->Label(); + Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(aDepLabel); + + if (aFunction.IsNull()) doNotProcess = true; + else if (!theProcessed.Contains(aDepLabel)) doNotProcess = true; + } + } + } + } + + if (doNotProcess) { + TCollection_AsciiString anObjEntry; + TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry); + theIgnoreObjs.insert(anObjEntry); + return false; + } + theProcessed.Add(theFunction->GetEntry()); + + TCollection_AsciiString aDescr = theFunction->GetDescription(); + if(aDescr.Length() == 0) return false; + + //Check if its internal function which doesn't requires dumping + if(aDescr == "None") return false; + + //Check the very specific case of RestoreShape function, + //which is not dumped, but the result can be published by the user. + //We do not publish such objects to decrease danger of dumped script failure. + if(aDescr.Value(1) == '#') { + TCollection_AsciiString anObjEntry; + TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry); + theIgnoreObjs.insert(anObjEntry); + return false; + } + + // 0020001 PTv, check for critical functions, which require dump of objects + if (theIsPublished) + { + // currently, there is only one function "RestoreGivenSubShapes", + // later this check could be replaced by iterations on list of such functions + if (aDescr.Search( "RestoreGivenSubShapes" ) != -1) + theIsDumpCollected = true; + else if (aDescr.Search( "RestoreSubShapes" ) != -1) + theIsDumpCollected = true; + } + + //Replace parameter by notebook variables + ReplaceVariables(aDescr,theVariables); + + //Process sketcher functions, replacing string command by calls to Sketcher interface + if ( ( aDescr.Search( "MakeSketcherOnPlane" ) != -1 ) || ( aDescr.Search( "MakeSketcher" ) != -1 ) ) { + Sketcher_Profile aProfile( aDescr.ToCString()); + // Make new command for SketcherOnPlane and for Sketcher + aDescr = aProfile.GetDump(); + } + if (aDescr.Search( "Make3DSketcher" ) != -1) { + aDescr = MakeCommandfor3DSketcher ( aDescr ); } if ( theIsDumpCollected ) { @@ -1165,6 +1188,67 @@ bool ProcessFunction(Handle(GEOM_Function)& theFunction, return true; } +//============================================================================= +/*! + * GetTag: Returns the tag from entry + */ +//============================================================================= +int GetTag(const TCollection_AsciiString &theEntry) +{ + const int aGeomObjDepth = 3; + const int aTag = theEntry.Token(":", aGeomObjDepth).IntegerValue(); + + return aTag; +} + +//============================================================================= +/*! + * FillMapOfRef: Fill the map of references + */ +//============================================================================= +void FillMapOfRef(const Handle(GEOM_Function) &theFunction, + TIntToListIntMap &theRefMap) +{ + TDF_LabelSequence aSeq; + TCollection_AsciiString anObjEntry; + int anObjTag; + + TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry); + anObjTag = GetTag(anObjEntry); + theFunction->GetDependency(aSeq); + + const Standard_Integer aLen = aSeq.Length(); + Standard_Integer i; + + for (i = 1; i <= aLen; i++) { + TDF_Label aRefLabel = aSeq.Value(i); + Handle(TDF_Reference) aRef; + + if (aRefLabel.FindAttribute(TDF_Reference::GetID(), aRef)) { + if (!aRef.IsNull() && !aRef->Get().IsNull()) { + Handle(TDataStd_TreeNode) aT; + + if (TDataStd_TreeNode::Find(aRef->Get(), aT)) { + TDF_Label aDepLabel = aT->Label(); + Handle(GEOM_Function) aRefFunct = GEOM_Function::GetFunction(aDepLabel); + + if (!aRefFunct.IsNull()) { + // Get entry of the referenced object. + TDF_Tool::Entry(aRefFunct->GetOwnerEntry(), anObjEntry); + + const int aRefTag = GetTag(anObjEntry); + + if (anObjTag != aRefTag) { + // Avoid making references for operations without copy. + theRefMap[anObjTag].push_back(aRefTag); + } + } + } + } + } + } +} + //============================================================================= /*! * FindEntries: Returns a sequence of start/end positions of entries in the string @@ -1190,7 +1274,7 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin if(c == 58) isFound = Standard_True; } - if(isFound && arr[j-2] != 58) { // last char should be a diggit + if(isFound && arr[j-2] != 58) { // last char should be a digit aSeq->Append(i+1); // +1 because AsciiString starts from 1 aSeq->Append(j-1); } @@ -1211,14 +1295,14 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin void ReplaceVariables(TCollection_AsciiString& theCommand, const TVariablesList& theVariables) { - if (MYDEBUG) - cout<<"Command : "<GetCurrectState(); - if(MYDEBUG) { - cout<<"Variables from SObject:"<= aVariables.size()) continue; @@ -1402,28 +1488,31 @@ void ReplaceVariables(TCollection_AsciiString& theCommand, aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'"); } - if(MYDEBUG) - cout<<"aSection before : "<IncrementState(); } - if (MYDEBUG) - cout<<"Command : "<Length(), aStart = 1, aScriptLength = theScript.Length(); @@ -1489,10 +1579,10 @@ void ReplaceEntriesByNames (TCollection_AsciiString& theScript, theObjListToPublish.Append( anEntry ); TObjectData& data = aEntry2ObjData[ anEntry ]; - if ( data._pyName.IsEmpty() ) { // encounted for the 1st time + if ( data._pyName.IsEmpty() ) { // encountered for the 1st time if ( !data._name.IsEmpty() ) { // published object data._pyName = data._name; - healPyName( data._pyName, anEntry, aNameToEntry); + engine->healPyName( data._pyName, anEntry, aNameToEntry); } else { do { @@ -1519,12 +1609,11 @@ void ReplaceEntriesByNames (TCollection_AsciiString& theScript, * AddObjectColors: Add color to objects */ //============================================================================= -void AddObjectColors (int theDocID, - TCollection_AsciiString& theScript, +void AddObjectColors (TCollection_AsciiString& theScript, const TSting2ObjDataMap& theEntry2ObjData) { GEOM_Engine* engine = GEOM_Engine::GetEngine(); - Handle(TDocStd_Document) aDoc = engine->GetDocument(theDocID); + Handle(TDocStd_Document) aDoc = engine->GetDocument(); TSting2ObjDataMap::const_iterator anEntryToNameIt; for (anEntryToNameIt = theEntry2ObjData.begin(); @@ -1567,16 +1656,16 @@ void AddObjectColors (int theDocID, case Aspect_TOM_POINT: aCommand += "GEOM.MT_POINT"; break; case Aspect_TOM_PLUS: aCommand += "GEOM.MT_PLUS"; break; case Aspect_TOM_STAR: aCommand += "GEOM.MT_STAR"; break; - case Aspect_TOM_O: aCommand += "GEOM.MT_O"; break; case Aspect_TOM_X: aCommand += "GEOM.MT_X"; break; + case Aspect_TOM_O: aCommand += "GEOM.MT_O"; break; case Aspect_TOM_O_POINT: aCommand += "GEOM.MT_O_POINT"; break; case Aspect_TOM_O_PLUS: aCommand += "GEOM.MT_O_PLUS"; break; case Aspect_TOM_O_STAR: aCommand += "GEOM.MT_O_STAR"; break; case Aspect_TOM_O_X: aCommand += "GEOM.MT_O_X"; break; - case Aspect_TOM_BALL: aCommand += "GEOM.MT_BALL"; break; case Aspect_TOM_RING1: aCommand += "GEOM.MT_RING1"; break; case Aspect_TOM_RING2: aCommand += "GEOM.MT_RING2"; break; case Aspect_TOM_RING3: aCommand += "GEOM.MT_RING3"; break; + case Aspect_TOM_BALL: aCommand += "GEOM.MT_BALL"; break; default: aCommand += "GEOM.MT_NONE"; break; // just for completeness, should not get here } aCommand += ", "; @@ -1613,11 +1702,7 @@ void AddObjectColors (int theDocID, } } -#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 static TCollection_AsciiString pack_data (const Handle(TColStd_HArray1OfByte)& aData) -#else -static TCollection_AsciiString pack_data (const Handle(TDataStd_HArray1OfByte)& aData) -#endif { TCollection_AsciiString stream; if (!aData.IsNull()) { @@ -1632,10 +1717,10 @@ static TCollection_AsciiString pack_data (const Handle(TDataStd_HArray1OfByte)& return stream; } -void AddTextures (int theDocID, TCollection_AsciiString& theScript) +void AddTextures (TCollection_AsciiString& theScript) { GEOM_Engine* engine = GEOM_Engine::GetEngine(); - std::list allTextures = engine->getAllTextures(theDocID); + std::list allTextures = engine->getAllTextures(); std::list::const_iterator it; if (allTextures.size() > 0) { @@ -1645,12 +1730,8 @@ void AddTextures (int theDocID, TCollection_AsciiString& theScript) if (*it <= 0) continue; Standard_Integer aWidth, aHeight; TCollection_AsciiString aFileName; -#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1 Handle(TColStd_HArray1OfByte) aTexture = -#else - Handle(TDataStd_HArray1OfByte) aTexture = -#endif - engine->getTexture(theDocID, *it, aWidth, aHeight, aFileName); + engine->getTexture(*it, aWidth, aHeight, aFileName); if (aWidth > 0 && aHeight > 0 && !aTexture.IsNull() && aTexture->Length() > 0 ) { TCollection_AsciiString aCommand = "\n\t"; aCommand += "texture_map["; aCommand += *it; aCommand += "] = "; @@ -1684,6 +1765,7 @@ void PublishObject (TObjectData& theObjectData, std::map< int, TCollection_AsciiString >& theEntryToCmdMap, std::set< TCollection_AsciiString>& theIgnoreMap) { + GEOM_Engine* engine = GEOM_Engine::GetEngine(); if ( theObjectData._studyEntry.IsEmpty() ) return; // was not published if ( theIgnoreMap.count( theObjectData._entry ) ) @@ -1700,8 +1782,6 @@ void PublishObject (TObjectData& theObjectData, if ( stEntry2DataPtr != theStEntry2ObjDataPtr.end() ) aFatherData = stEntry2DataPtr->second; - const int geomObjDepth = 3; - // treat multiply published object if ( theObjectData._pyName.IsEmpty() ) { @@ -1709,14 +1789,14 @@ void PublishObject (TObjectData& theObjectData, if ( data0._pyName.IsEmpty() ) return; // something wrong theObjectData._pyName = theObjectData._name; - healPyName( theObjectData._pyName, theObjectData._entry, theNameToEntry); + engine->healPyName( theObjectData._pyName, theObjectData._entry, theNameToEntry); TCollection_AsciiString aCreationCommand("\n\t"); aCreationCommand += theObjectData._pyName + " = " + data0._pyName; // store aCreationCommand before publishing commands - int tag = theObjectData._entry.Token( ":", geomObjDepth ).IntegerValue(); - theEntryToCmdMap.insert( std::make_pair( tag + 2*theEntry2ObjData.size(), aCreationCommand )); + int tag = GetTag(theObjectData._entry); + theEntryToCmdMap.insert( std::make_pair( tag + -2*theEntry2ObjData.size(), aCreationCommand )); } // make a command @@ -1730,12 +1810,94 @@ void PublishObject (TObjectData& theObjectData, aCommand += theObjectData._pyName + ", '" + theObjectData._name + "' )"; // bind a command to the study entry - int tag = theObjectData._entry.Token( ":", geomObjDepth ).IntegerValue(); + int tag = GetTag(theObjectData._entry); theEntryToCmdMap.insert( std::make_pair( tag, aCommand )); theObjectData._studyEntry.Clear(); // not to publish any more } +//================================================================================ +/*! + * \brief Returns the string of publishing commands. Take into account that + * references should be published prior to the objects refer to them. + */ +//================================================================================ +TCollection_AsciiString GetPublishCommands + (const int theTag, + const std::map< int, TCollection_AsciiString > &theEntryToCmdMap, + const TIntToListIntMap &theMapRefs, + std::set< int > &thePublished) +{ + TCollection_AsciiString aResult; + + if (!thePublished.count(theTag)) { + // This object is not published yet. + thePublished.insert(theTag); + + std::map< int, TCollection_AsciiString >::const_iterator anIt = + theEntryToCmdMap.find(theTag); + + if (anIt != theEntryToCmdMap.end()) { + // There is a pubish cmd. + TIntToListIntMap::const_iterator aRefIt = theMapRefs.find(theTag); + + if (aRefIt != theMapRefs.end()) { + // Recursively publish all references. + std::list< int >::const_iterator aRefTagIt = aRefIt->second.begin(); + + for(; aRefTagIt != aRefIt->second.end(); ++aRefTagIt) { + const TCollection_AsciiString aRefCmd = GetPublishCommands + (*aRefTagIt, theEntryToCmdMap, theMapRefs, thePublished); + + aResult += aRefCmd; + } + } + + // Add the object command. + aResult += anIt->second; + } + } + + return aResult; +} + +void Prettify(TCollection_AsciiString& theScript) +{ + TCollection_AsciiString output; + static std::list ToRemove; + if (ToRemove.empty()) { + ToRemove.push_back("geompy.SubShapeAllIDs"); + ToRemove.push_back("geompy.SubShapeAllSortedCentresIDs"); + ToRemove.push_back("geompy.SubShapeAllSortedIDs"); + ToRemove.push_back("geompy.GetFreeFacesIDs"); + ToRemove.push_back("geompy.GetShapesOnBoxIDs"); + ToRemove.push_back("geompy.GetShapesOnShapeIDs"); + ToRemove.push_back("geompy.GetShapesOnPlaneIDs"); + ToRemove.push_back("geompy.GetShapesOnPlaneWithLocationIDs"); + ToRemove.push_back("geompy.GetShapesOnCylinderIDs"); + ToRemove.push_back("geompy.GetShapesOnCylinderWithLocationIDs"); + ToRemove.push_back("geompy.GetShapesOnSphereIDs"); + ToRemove.push_back("geompy.GetShapesOnQuadrangleIDs"); + ToRemove.push_back("geompy.GetSameIDs"); + } + + int start = 1; + while (start <= theScript.Length()) { + int end = theScript.Location("\n", start, theScript.Length()); + if (end == -1) end = theScript.Length(); + TCollection_AsciiString line = theScript.SubString(start, end); + bool found = false; + for (std::list::const_iterator it = ToRemove.begin(); it != ToRemove.end() && !found; ++it) + found = line.Search( *it ) != -1; + if (!found) + output += line; + start = end + 1; + } + theScript = output; + + //OK @@@@@@@@@@@@@@@@@@@@@@@@@@@ +} + //================================================================================ /*! * \brief Constructor @@ -1763,7 +1925,7 @@ ObjectStates::~ObjectStates() //================================================================================ TState ObjectStates::GetCurrectState() const { - if(_states.size() > _dumpstate) + if((int)_states.size() > _dumpstate) return _states[_dumpstate]; return TState(); }