-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 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
+// 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 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.
+// 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
+// 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
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#ifdef WNT
#pragma warning( disable:4786 )
#include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx"
#include "GEOM_PythonDump.hxx"
+#include <Basics_OCCTVersion.hxx>
+
#include "utilities.h"
+#include <Basics_Utils.hxx>
+
#include <TDF_Tool.hxx>
#include <TDF_Data.hxx>
#include <TDF_Reference.hxx>
#include <TDataStd_ChildNodeIterator.hxx>
#include <TFunction_Driver.hxx>
#include <TFunction_DriverTable.hxx>
+#include <TDataStd_ByteArray.hxx>
+#include <TDataStd_UAttribute.hxx>
+#include <TDF_ChildIterator.hxx>
+#include <TDataStd_Comment.hxx>
#include <TopExp.hxx>
#include <TopTools_IndexedMapOfShape.hxx>
#include <TColStd_MapOfTransient.hxx>
#include <TColStd_HSequenceOfInteger.hxx>
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#include <TColStd_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
+#else
+#include <TDataStd_HArray1OfByte.hxx>
#include <Interface_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
+#endif
+
#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
#include <set>
-#include <map>
-#include <string>
-#include <vector>
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
static int MYDEBUG = 0;
#endif
+typedef std::map< TCollection_AsciiString, TCollection_AsciiString > TSting2StringMap;
+typedef std::map< TCollection_AsciiString, TObjectData > TSting2ObjDataMap;
+typedef std::map< TCollection_AsciiString, TObjectData* > TSting2ObjDataPtrMap;
+
static GEOM_Engine* TheEngine = NULL;
-using namespace std;
static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_Object)& theObject)
{
return aDocID.IntegerValue();
}
-bool ProcessFunction(Handle(GEOM_Function)& theFunction,
- TCollection_AsciiString& theScript,
- TCollection_AsciiString& theAfterScript,
- const TVariablesList& theVariables,
- const bool theIsPublished,
- TDF_LabelMap& theProcessed,
- std::set<std::string>& theIgnoreObjs,
- bool& theIsDumpCollected);
+bool ProcessFunction(Handle(GEOM_Function)& theFunction,
+ TCollection_AsciiString& theScript,
+ TCollection_AsciiString& theAfterScript,
+ const TVariablesList& theVariables,
+ const bool theIsPublished,
+ TDF_LabelMap& theProcessed,
+ std::set<TCollection_AsciiString>& theIgnoreObjs,
+ bool& theIsDumpCollected);
-void ReplaceVariables(TCollection_AsciiString& theCommand,
+void ReplaceVariables(TCollection_AsciiString& theCommand,
const TVariablesList& theVariables);
Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theString);
void ReplaceEntriesByNames (TCollection_AsciiString& theScript,
- Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
- const bool theIsPublished,
- Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
- TColStd_SequenceOfAsciiString& theObjListToPublish);
-
-void AddObjectColors (const Handle(TDocStd_Document)& theDoc,
- TCollection_AsciiString& theScript,
- const Resource_DataMapOfAsciiStringAsciiString& theObjectNames);
-
-void PublishObject (const TCollection_AsciiString& theEntry,
- const TCollection_AsciiString& theName,
- const Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
- const Resource_DataMapOfAsciiStringAsciiString& theEntry2StEntry,
- const Resource_DataMapOfAsciiStringAsciiString& theStEntry2Entry,
- const Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
- std::map< int, std::string >& theEntryToCommandMap,
- std::set<std::string>& theMapOfPublished);
+ TSting2ObjDataMap& aEntry2ObjData,
+ const bool theIsPublished,
+ TColStd_SequenceOfAsciiString& theObjListToPublish,
+ Standard_Integer& objectCounter,
+ Resource_DataMapOfAsciiStringAsciiString& aNameToEntry);
+
+void AddObjectColors (int theDocID,
+ TCollection_AsciiString& theScript,
+ const TSting2ObjDataMap& theEntry2ObjData);
+
+void AddTextures (int theDocID, TCollection_AsciiString& theScript);
+
+void PublishObject (TObjectData& theObjectData,
+ TSting2ObjDataMap& theEntry2ObjData,
+ const TSting2ObjDataPtrMap& theStEntry2ObjDataPtr,
+ Resource_DataMapOfAsciiStringAsciiString& theNameToEntry,
+ std::map< int, TCollection_AsciiString >& theEntryToCmdMap,
+ std::set<TCollection_AsciiString>& theMapOfPublished);
+
+namespace
+{
+ //================================================================================
+ /*!
+ * \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_");
+
+ 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;
+ do {
+ aName2 = pyName + "_" + ++i;
+ } while ( aNameToEntry.IsBound( aName2 ) && anEntry != aNameToEntry( aName2 ));
+ pyName = aName2;
+ }
+ }
+}
+
+//=======================================================================
+//function : GetTextureGUID
+//purpose :
+//=======================================================================
+const Standard_GUID& GEOM_Engine::GetTextureGUID()
+{
+ static Standard_GUID anID("FF1BBB01-5D14-4df2-980B-3A668264EA17");
+ return anID;
+}
//=============================================================================
/*!
GEOM_Engine::GEOM_Engine()
{
TFunction_DriverTable::Get()->AddDriver(GEOM_Object::GetSubShapeID(), new GEOM_SubShapeDriver());
-
+
_OCAFApp = new GEOM_Application();
_UndoLimit = 10;
}
GEOM_Engine::~GEOM_Engine()
{
GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient It(_objects);
+ std::list< Handle(GEOM_Object) > objs;
for(; It.More(); It.Next())
- {
- RemoveObject(Handle(GEOM_Object)::DownCast(It.Value()));
- }
+ objs.push_back( Handle(GEOM_Object)::DownCast(It.Value()) );
+ std::list< Handle(GEOM_Object) >::iterator objit;
+ for(objit = objs.begin(); objit != objs.end(); ++objit)
+ RemoveObject(*objit);
//Close all documents not closed
- for(Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr(_mapIDDocument); anItr.More(); anItr.Next())
+#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());
_mapIDDocument.Clear();
* GetDocument
*/
//=============================================================================
-Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID)
+Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID, bool force)
{
Handle(TDocStd_Document) aDoc;
- if(!_mapIDDocument.IsBound(theDocID)) {
+ if(_mapIDDocument.IsBound(theDocID)) {
+ aDoc = Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID));
+ }
+ else if (force) {
_OCAFApp->NewDocument("SALOME_GEOM", aDoc);
aDoc->SetUndoLimit(_UndoLimit);
_mapIDDocument.Bind(theDocID, aDoc);
TDataStd_Integer::Set(aDoc->Main(), theDocID);
}
-
- return Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID));
+ return aDoc;
}
//=============================================================================
//=============================================================================
int GEOM_Engine::GetDocID(Handle(TDocStd_Document) theDocument)
{
- if(theDocument.IsNull()) return -1;
- for(Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr(_mapIDDocument); anItr.More(); anItr.Next())
- if(anItr.Value() == theDocument) return anItr.Key();
+ 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)
+Handle(GEOM_Object) GEOM_Engine::GetObject(int theDocID, char* theEntry, bool force)
{
- TCollection_AsciiString anID = BuildID(theDocID, theEntry);
- if(_objects.IsBound(anID)) return Handle(GEOM_Object)::DownCast(_objects(anID));
+ Handle(GEOM_Object) anObject;
- TDF_Label aLabel;
- Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
- TDF_Tool::Label(aDoc->Main().Data(), theEntry, aLabel, Standard_True);
- Handle(GEOM_Object) anObject = new GEOM_Object(aLabel);
+ TCollection_AsciiString anID = BuildID(theDocID, theEntry);
- _objects.Bind(anID, anObject);
+ if (_objects.IsBound(anID)) {
+ anObject = Handle(GEOM_Object)::DownCast(_objects(anID));
+ }
+ else if (force) {
+ Handle(TDocStd_Document) aDoc = GetDocument(theDocID, 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);
+ }
+ }
return anObject;
}
Handle(TColStd_HArray1OfInteger) theIndices,
bool isStandaloneOperation)
{
- if(theMainShape.IsNull() || theIndices.IsNull()) return NULL;
+ if (theMainShape.IsNull() || theIndices.IsNull()) return NULL;
Handle(TDocStd_Document) aDoc = GetDocument(theMainShape->GetDocID());
Handle(TDataStd_TreeNode) aRoot = TDataStd_TreeNode::Set(aDoc->Main());
// if this label has been freed (object deleted)
bool useExisting = false;
TDF_Label aChild;
- /*
- if (!_lastCleared.IsNull()) {
- if (_lastCleared.Root() == aDoc->Main().Root()) {
- useExisting = true;
- aChild = _lastCleared;
- // 0020229: if next label exists and is empty, try to reuse it
- Standard_Integer aNextTag = aChild.Tag() + 1;
- TDF_Label aNextL = aDoc->Main().FindChild(aNextTag, Standard_False);
- if (!aNextL.IsNull() && !aNextL.HasAttribute())
- _lastCleared = aNextL;
- else
- _lastCleared.Nullify();
- }
- }
- */
int aDocID = theMainShape->GetDocID();
if (_freeLabels.find(aDocID) != _freeLabels.end()) {
std::list<TDF_Label>& aFreeLabels = _freeLabels[aDocID];
}
Handle(GEOM_Function) aMainShape = theMainShape->GetLastFunction();
- Handle(GEOM_Object) anObject = new GEOM_Object(aChild, 28); //28 is SUBSHAPE type
+ Handle(GEOM_Object) anObject = new GEOM_Object (aChild, 28); //28 is SUBSHAPE type
Handle(GEOM_Function) aFunction = anObject->AddFunction(GEOM_Object::GetSubShapeID(), 1);
- GEOM_ISubShape aSSI(aFunction);
+ GEOM_ISubShape aSSI (aFunction);
aSSI.SetMainShape(aMainShape);
aSSI.SetIndices(theIndices);
try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
#endif
GEOM_Solver aSolver (GEOM_Engine::GetEngine());
return NULL;
}
- //Put an object in the map of created objects
+ // Put an object in the map of created objects
TCollection_AsciiString anID = BuildIDFromObject(anObject);
- if(_objects.IsBound(anID)) _objects.UnBind(anID);
+ if (_objects.IsBound(anID)) _objects.UnBind(anID);
_objects.Bind(anID, anObject);
+ // Put this sub-shape in the list of sub-shapes of theMainShape
+ aMainShape->AddSubShapeReference(aFunction);
+
GEOM::TPythonDump pd (aFunction);
if (isStandaloneOperation) {
//=============================================================================
bool GEOM_Engine::RemoveObject(Handle(GEOM_Object) theObject)
{
- if (!theObject) return false;
+ if (theObject.IsNull()) return false;
int aDocID = theObject->GetDocID();
+ if(!_mapIDDocument.IsBound(aDocID))
+ return false; // document is closed...
//Remove an object from the map of available objects
TCollection_AsciiString anID = BuildIDFromObject(theObject);
if (_objects.IsBound(anID)) _objects.UnBind(anID);
+ // If sub-shape, remove it from the list of sub-shapes of its main shape
+ if (!theObject->IsMainShape()) {
+ Handle(GEOM_Function) aFunction = theObject->GetFunction(1);
+ GEOM_ISubShape aSSI (aFunction);
+ Handle(GEOM_Function) aMainShape = aSSI.GetMainShape();
+ //If main shape is not null, then remove
+ if(!aMainShape.IsNull())
+ aMainShape->RemoveSubShapeReference(aFunction);
+ }
+
int nb = theObject->GetNbFunctions();
Handle(TDataStd_TreeNode) aNode;
- for (int i = 1; i<=nb; i++) {
+ for (int i = 1; i <= nb; i++) {
Handle(GEOM_Function) aFunction = theObject->GetFunction(i);
if (aFunction->GetEntry().FindAttribute(GEOM_Function::GetFunctionTreeID(), aNode))
aNode->Remove();
bool GEOM_Engine::Load(int theDocID, char* theFileName)
{
Handle(TDocStd_Document) aDoc;
- if(_OCAFApp->Open(theFileName, aDoc) != CDF_RS_OK) {
+#if OCC_VERSION_LARGE > 0x06050100 // For OCCT6.5.2 and higher
+ if (_OCAFApp->Open(theFileName, aDoc) != PCDM_RS_OK) {
+#else
+ if (_OCAFApp->Open(theFileName, aDoc) != CDF_RS_OK) {
+#endif
return false;
}
*/
//=============================================================================
TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
- Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+ std::vector<TObjectData>& theObjectData,
TVariablesList theVariables,
bool isPublished,
+ bool isMultiFile,
bool& aValidScript)
{
+ // Set "C" numeric locale to save numbers correctly
+ Kernel_Utils::Localizer loc;
+
TCollection_AsciiString aScript;
Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
- if (aDoc.IsNull()) return TCollection_AsciiString("def RebuildData(theStudy): pass\n");
+ if (aDoc.IsNull())
+ {
+ TCollection_AsciiString anEmptyScript;
+ if( isMultiFile )
+ anEmptyScript = "def RebuildData(theStudy): pass\n";
+ return anEmptyScript;
+ }
- aScript = "import geompy\n";
+ aScript = "import GEOM\n";
+ aScript += "import geompy\n";
aScript += "import math\n";
aScript += "import SALOMEDS\n\n";
- aScript += "def RebuildData(theStudy):";
- aScript += "\n\tgeompy.init_geom(theStudy)";
+ if( isMultiFile )
+ aScript += "def RebuildData(theStudy):";
+
+ aScript += "\n\tgeompy.init_geom(theStudy)\n";
+
+ AddTextures(theDocID, aScript);
Standard_Integer posToInsertGlobalVars = aScript.Length() + 1;
- Resource_DataMapOfAsciiStringAsciiString aEntry2StEntry, aStEntry2Entry;
- Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString anEntryToNameIt;
- // build maps entry <-> studyEntry
- for (anEntryToNameIt.Initialize( theObjectNames );
- anEntryToNameIt.More();
- anEntryToNameIt.Next())
+ // 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
+ TSting2ObjDataPtrMap aStEntry2ObjDataPtr;
+
+ //Resource_DataMapOfAsciiStringAsciiString aEntry2StEntry, aStEntry2Entry, theObjectNames;
+ for (unsigned i = 0; i < theObjectData.size(); ++i )
{
- const TCollection_AsciiString& aEntry = anEntryToNameIt.Key();
+ TObjectData& data = theObjectData[i];
// look for an object by entry
TDF_Label L;
- TDF_Tool::Label( aDoc->GetData(), aEntry, L );
+ TDF_Tool::Label( aDoc->GetData(), data._entry, L );
if ( L.IsNull() ) continue;
Handle(GEOM_Object) obj = GEOM_Object::GetObject( L );
// fill maps
if ( !obj.IsNull() ) {
- TCollection_AsciiString aStudyEntry (obj->GetAuxData());
- aEntry2StEntry.Bind( aEntry, aStudyEntry);
- aStEntry2Entry.Bind( aStudyEntry, aEntry );
+ TSting2ObjDataMap::iterator ent2Data =
+ aEntry2ObjData.insert( std::make_pair( data._entry, data )).first;
+
+ if ( ent2Data->second._studyEntry == data._studyEntry ) // Entry encounters 1st time
+ aStEntry2ObjDataPtr.insert( std::make_pair( data._studyEntry, & ent2Data->second ));
+ else
+ aStEntry2ObjDataPtr.insert( std::make_pair( data._studyEntry, & data ));
}
}
// collect objects entries to be published
TColStd_SequenceOfAsciiString aObjListToPublish;
-
+
// iterates on functions till critical (that requiers publication of objects)
Handle(TDataStd_TreeNode) aNode, aRoot;
Handle(GEOM_Function) aFunction;
TDF_LabelMap aCheckedFuncMap;
- std::set<std::string> anIgnoreObjMap;
+ std::set< TCollection_AsciiString > anIgnoreObjMap;
TCollection_AsciiString aFuncScript;
- Resource_DataMapOfAsciiStringAsciiString anEntryToBadName;
+
+ // Mantis issue 0020768
+ Standard_Integer objectCounter = 0;
+ Resource_DataMapOfAsciiStringAsciiString aNameToEntry;
if (aDoc->Main().FindAttribute(GEOM_Function::GetFunctionTreeID(), aRoot)) {
TDataStd_ChildNodeIterator Itr(aRoot);
bool isDumpCollected = false;
TCollection_AsciiString aCurScript, anAfterScript;
if (!ProcessFunction(aFunction, aCurScript, anAfterScript, theVariables,
- isPublished, aCheckedFuncMap, anIgnoreObjMap,
- isDumpCollected ))
+ isPublished, aCheckedFuncMap, anIgnoreObjMap,
+ isDumpCollected ))
continue;
// add function description before dump
if (!aCurScript.IsEmpty())
+ {
+ if ( aFunction->GetDriverGUID() == GEOM_Object::GetSubShapeID() )
+ // avoid repeated SubShape...() command at the end
+ if (aFuncScript.Location( aCurScript,
+ aFuncScript.Length() - aCurScript.Length(),
+ aFuncScript.Length()))
+ continue;
aFuncScript += aCurScript;
+ }
if (isDumpCollected ) {
- // Replace entries by the names
- ReplaceEntriesByNames( aFuncScript, theObjectNames,
- isPublished, anEntryToBadName, aObjListToPublish );
-
- // publish collected objects
- std::map< int, std::string > anEntryToCommandMap; // sort publishing commands by object entry
+ // Replace entries by the names
+ ReplaceEntriesByNames( aFuncScript, aEntry2ObjData, isPublished,
+ aObjListToPublish, objectCounter, aNameToEntry );
+
+ // publish collected objects
+ std::map< int, TCollection_AsciiString > anEntryToCmdMap; // sort publishing commands by study entry
int i = 1, n = aObjListToPublish.Length();
- for ( ; i <= n; i++ )
+ for ( ; i <= n; i++ )
{
const TCollection_AsciiString& aEntry = aObjListToPublish.Value(i);
- if (!theObjectNames.IsBound( aEntry ))
- continue;
- PublishObject( aEntry, theObjectNames.Find(aEntry),
- theObjectNames, aEntry2StEntry, aStEntry2Entry,
- anEntryToBadName, anEntryToCommandMap, anIgnoreObjMap );
+ PublishObject( aEntry2ObjData[aEntry], aEntry2ObjData, aStEntry2ObjDataPtr,
+ aNameToEntry, anEntryToCmdMap, anIgnoreObjMap );
}
- // add publishing commands to the script
- std::map< int, std::string >::iterator anEntryToCommand = anEntryToCommandMap.begin();
- for ( ; anEntryToCommand != anEntryToCommandMap.end(); ++anEntryToCommand )
- aFuncScript += (char*)anEntryToCommand->second.c_str();
-
- // PTv, 0020001 add result objects from RestoreSubShapes into ignore list,
+ // add publishing commands to the script
+ std::map< int, TCollection_AsciiString >::iterator anEntryToCmd = anEntryToCmdMap.begin();
+ for ( ; anEntryToCmd != anEntryToCmdMap.end(); ++anEntryToCmd )
+ aFuncScript += anEntryToCmd->second;
+
+ // PTv, 0020001 add result objects from RestoreGivenSubShapes into ignore list,
// because they will be published during command execution
- int indx = anAfterScript.Search( "RestoreSubShapes" );
+ int indx = anAfterScript.Search( "RestoreGivenSubShapes" );
+ if ( indx == -1 )
+ indx = anAfterScript.Search( "RestoreSubShapes" );
if ( indx != -1 ) {
TCollection_AsciiString aSubStr = anAfterScript.SubString(1, indx);
Handle(TColStd_HSequenceOfInteger) aSeq = FindEntries(aSubStr);
for ( ; i <= n; i+=2) {
TCollection_AsciiString anEntry =
aSubStr.SubString(aSeq->Value(i), aSeq->Value(i+1));
- if (!anIgnoreObjMap.count(anEntry.ToCString()))
- anIgnoreObjMap.insert(anEntry.ToCString());
+ anIgnoreObjMap.insert(anEntry.ToCString());
}
}
- aObjListToPublish.Clear();
- aScript += aFuncScript;
- aFuncScript.Clear();
+ aObjListToPublish.Clear();
+ aScript += aFuncScript;
+ aFuncScript.Clear();
}
aFuncScript += anAfterScript;
}
// Replace entries by the names
aObjListToPublish.Clear();
- ReplaceEntriesByNames( aFuncScript, theObjectNames,
- isPublished, anEntryToBadName, aObjListToPublish );
-
+ ReplaceEntriesByNames( aFuncScript, aEntry2ObjData, isPublished, aObjListToPublish,
+ objectCounter, aNameToEntry );
+
aScript += aFuncScript;
// ouv : NPAL12872
- AddObjectColors( aDoc, aScript, theObjectNames );
+ AddObjectColors( theDocID, aScript, aEntry2ObjData );
// Make script to publish in study
+ TSting2ObjDataPtrMap::iterator aStEntry2ObjDataPtrIt;
if ( isPublished )
{
- std::map< int, std::string > anEntryToCommandMap; // sort publishing commands by object entry
- for (anEntryToNameIt.Initialize( theObjectNames );
- anEntryToNameIt.More();
- anEntryToNameIt.Next())
+ std::map< int, TCollection_AsciiString > anEntryToCmdMap; // sort publishing commands by object entry
+
+ for (aStEntry2ObjDataPtrIt = aStEntry2ObjDataPtr.begin();
+ aStEntry2ObjDataPtrIt != aStEntry2ObjDataPtr.end();
+ ++aStEntry2ObjDataPtrIt)
{
- const TCollection_AsciiString& aEntry = anEntryToNameIt.Key();
- if (anIgnoreObjMap.count(aEntry.ToCString()))
+ TObjectData* data = aStEntry2ObjDataPtrIt->second;
+ if ( anIgnoreObjMap.count( data->_entry ))
continue; // should not be dumped
- const TCollection_AsciiString& aName = anEntryToNameIt.Value();
- PublishObject( aEntry, aName, theObjectNames,
- aEntry2StEntry, aStEntry2Entry,
- anEntryToBadName, anEntryToCommandMap, anIgnoreObjMap );
+ PublishObject( *data, aEntry2ObjData, aStEntry2ObjDataPtr,
+ aNameToEntry, anEntryToCmdMap, anIgnoreObjMap );
}
// add publishing commands to the script
- std::map< int, std::string >::iterator anEntryToCommand = anEntryToCommandMap.begin();
- for ( ; anEntryToCommand != anEntryToCommandMap.end(); ++anEntryToCommand )
- aScript += (char*)anEntryToCommand->second.c_str();
+ std::map< int, TCollection_AsciiString >::iterator anEntryToCmd = anEntryToCmdMap.begin();
+ for ( ; anEntryToCmd != anEntryToCmdMap.end(); ++anEntryToCmd )
+ aScript += anEntryToCmd->second;
}
+ //RNV: issue 16219: EDF PAL 469: "RemoveFromStudy" Function
+ //Add unpublish command if need
+ TCollection_AsciiString unpublishCmd("\n");
+ if(isMultiFile)
+ unpublishCmd += "\t";
+ unpublishCmd += "geompy.hideInStudy(";
+
+ for (aStEntry2ObjDataPtrIt = aStEntry2ObjDataPtr.begin();
+ aStEntry2ObjDataPtrIt != aStEntry2ObjDataPtr.end();
+ ++aStEntry2ObjDataPtrIt)
+ {
+ TObjectData* data = aStEntry2ObjDataPtrIt->second;
+ if ( data->_unpublished && !data->_pyName.IsEmpty() ) {
+ aScript += unpublishCmd + data->_pyName + ")";
+ }
+ }
+
//aScript += "\n\tpass\n";
aScript += "\n";
aValidScript = true;
// fill _studyEntry2NameMap and build globalVars
TCollection_AsciiString globalVars;
_studyEntry2NameMap.Clear();
- Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString aStEntryToEntryIt;
- for (aStEntryToEntryIt.Initialize( aStEntry2Entry );
- aStEntryToEntryIt.More();
- aStEntryToEntryIt.Next() )
+ for (aStEntry2ObjDataPtrIt = aStEntry2ObjDataPtr.begin();
+ aStEntry2ObjDataPtrIt != aStEntry2ObjDataPtr.end();
+ ++aStEntry2ObjDataPtrIt)
{
- const TCollection_AsciiString & name = theObjectNames( aStEntryToEntryIt.Value() );
- _studyEntry2NameMap.Bind (aStEntryToEntryIt.Key(), name );
+ const TCollection_AsciiString& studyEntry = aStEntry2ObjDataPtrIt->first;
+ const TObjectData* data = aStEntry2ObjDataPtrIt->second;
+ _studyEntry2NameMap.Bind ( studyEntry, data->_pyName );
if ( !globalVars.IsEmpty() )
globalVars += ", ";
- globalVars += name;
+ globalVars += data->_pyName;
}
- if ( !globalVars.IsEmpty() ) {
+ if ( isMultiFile && !globalVars.IsEmpty() ) {
globalVars.Insert( 1, "\n\tglobal " );
aScript.Insert( posToInsertGlobalVars, globalVars );
}
return aRetSeq;
}
+#define TEXTURE_LABEL_ID 1
+#define TEXTURE_LABEL_FILE 2
+#define TEXTURE_LABEL_WIDTH 3
+#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
+ const Handle(TColStd_HArray1OfByte)& theTexture,
+#else
+ const Handle(TDataStd_HArray1OfByte)& theTexture,
+#endif
+ const TCollection_AsciiString& theFileName)
+{
+ Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
+ 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<TDF_Label>& aFreeLabels = _freeLabels[theDocID];
+ if (!aFreeLabels.empty()) {
+ useExisting = true;
+ aChild = aFreeLabels.front();
+ aFreeLabels.pop_front();
+ }
+ }
+ if (!useExisting) {
+ // create new label
+ aChild = TDF_TagSource::NewChild(aDoc->Main());
+ }
+
+ aChild.ForgetAllAttributes(Standard_True);
+ Handle(TDataStd_TreeNode) node;
+ if ( !aChild.FindAttribute(TDataStd_TreeNode::GetDefaultTreeID(), node ) )
+ node = TDataStd_TreeNode::Set(aChild);
+ TDataStd_UAttribute::Set(aChild, GetTextureGUID());
+
+ static int aTextureID = 0;
+
+ TDataStd_Integer::Set(aChild.FindChild(TEXTURE_LABEL_ID), ++aTextureID);
+ TDataStd_Comment::Set(aChild.FindChild(TEXTURE_LABEL_FILE), theFileName);
+ TDataStd_Integer::Set(aChild.FindChild(TEXTURE_LABEL_WIDTH), theWidth);
+ TDataStd_Integer::Set(aChild.FindChild(TEXTURE_LABEL_HEIGHT), theHeight);
+
+ Handle(TDataStd_ByteArray) anAttr =
+ TDataStd_ByteArray::Set(aChild.FindChild(TEXTURE_LABEL_DATA),
+ theTexture.IsNull() ? 0 : theTexture->Lower(),
+ theTexture.IsNull() ? 0 : theTexture->Upper());
+ anAttr->ChangeArray(theTexture);
+
+ 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
+ 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);
+
+ TDF_ChildIterator anIterator(aDoc->Main(), Standard_True);
+ bool found = false;
+ for (; anIterator.More() && !found; anIterator.Next()) {
+ TDF_Label aTextureLabel = anIterator.Value();
+ if (aTextureLabel.IsAttribute( GetTextureGUID())) {
+ TDF_Label anIDLabel = aTextureLabel.FindChild(TEXTURE_LABEL_ID, Standard_False);
+ Handle(TDataStd_Integer) anIdAttr;
+ if(!anIDLabel.IsNull() && anIDLabel.FindAttribute(TDataStd_Integer::GetID(), anIdAttr) &&
+ anIdAttr->Get() == theTextureID) {
+ TDF_Label aFileLabel = aTextureLabel.FindChild(TEXTURE_LABEL_FILE, Standard_False);
+ TDF_Label aWidthLabel = aTextureLabel.FindChild(TEXTURE_LABEL_WIDTH, Standard_False);
+ TDF_Label aHeightLabel = aTextureLabel.FindChild(TEXTURE_LABEL_HEIGHT, Standard_False);
+ TDF_Label aDataLabel = aTextureLabel.FindChild(TEXTURE_LABEL_DATA, Standard_False);
+ Handle(TDataStd_Integer) aWidthAttr, aHeightAttr;
+ Handle(TDataStd_ByteArray) aTextureAttr;
+ Handle(TDataStd_Comment) aFileAttr;
+ if (!aWidthLabel.IsNull() && aWidthLabel.FindAttribute(TDataStd_Integer::GetID(), aWidthAttr) &&
+ !aHeightLabel.IsNull() && aHeightLabel.FindAttribute(TDataStd_Integer::GetID(), aHeightAttr) &&
+ !aDataLabel.IsNull() && aDataLabel.FindAttribute(TDataStd_ByteArray::GetID(), aTextureAttr)) {
+ theWidth = aWidthAttr->Get();
+ theHeight = aHeightAttr->Get();
+ anArray = aTextureAttr->InternalArray();
+ }
+ if (!aFileLabel.IsNull() && aFileLabel.FindAttribute(TDataStd_Comment::GetID(), aFileAttr))
+ theFileName = aFileAttr->Get();
+ found = true;
+ }
+ }
+ }
+ return anArray;
+}
+
+std::list<int> GEOM_Engine::getAllTextures(int theDocID)
+{
+ std::list<int> id_list;
+
+ Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
+
+ TDF_ChildIterator anIterator(aDoc->Main(), Standard_True);
+ for (; anIterator.More(); anIterator.Next()) {
+ TDF_Label aTextureLabel = anIterator.Value();
+ if (aTextureLabel.IsAttribute( GetTextureGUID())) {
+ TDF_Label anIDLabel = aTextureLabel.FindChild(TEXTURE_LABEL_ID, Standard_False);
+ Handle(TDataStd_Integer) anIdAttr;
+ if(!anIDLabel.IsNull() && anIDLabel.FindAttribute(TDataStd_Integer::GetID(), anIdAttr))
+ id_list.push_back((int)anIdAttr->Get());
+ }
+ }
+ return id_list;
+}
//===========================================================================
// Internal functions
* ProcessFunction: Dump fucntion 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<std::string>& theIgnoreObjs,
- bool& theIsDumpCollected)
+bool ProcessFunction(Handle(GEOM_Function)& theFunction,
+ TCollection_AsciiString& theScript,
+ TCollection_AsciiString& theAfterScript,
+ const TVariablesList& theVariables,
+ const bool theIsPublished,
+ TDF_LabelMap& theProcessed,
+ std::set<TCollection_AsciiString>& theIgnoreObjs,
+ bool& theIsDumpCollected)
{
theIsDumpCollected = false;
if (theFunction.IsNull()) return false;
if (doNotProcess) {
TCollection_AsciiString anObjEntry;
TDF_Tool::Entry(theFunction->GetOwnerEntry(), anObjEntry);
- theIgnoreObjs.insert(anObjEntry.ToCString());
+ theIgnoreObjs.insert(anObjEntry);
return false;
}
theProcessed.Add(theFunction->GetEntry());
//Check if its internal function which doesn't requires dumping
if(aDescr == "None") return false;
- // 0020001 PTv, check for critical functions, which requier dump of objects
+ // 0020001 PTv, check for critical functions, which require dump of objects
if (theIsPublished)
{
- // currently, there is only one function "RestoreSubShapes",
+ // currently, there is only one function "RestoreGivenSubShapes",
// later this check could be replaced by iterations on list of such functions
- if (aDescr.Search( "RestoreSubShapes" ) != -1)
+ if (aDescr.Search( "RestoreGivenSubShapes" ) != -1)
+ theIsDumpCollected = true;
+ else if (aDescr.Search( "RestoreSubShapes" ) != -1)
theIsDumpCollected = true;
}
bool isBefore = true;
TCollection_AsciiString aSubStr = aDescr.Token("\n\t", i++);
while (!aSubStr.IsEmpty()) {
- if (isBefore && aSubStr.Search( "RestoreSubShapes" ) == -1)
+ if (isBefore &&
+ aSubStr.Search( "RestoreGivenSubShapes" ) == -1 &&
+ aSubStr.Search( "RestoreSubShapes" ) == -1)
theScript += TCollection_AsciiString("\n\t") + aSubStr;
else
theAfterScript += TCollection_AsciiString("\n\t") + aSubStr;
//=============================================================================
/*!
- * ReplaceVariables: Replace parameters of the function by variales from
+ * ReplaceVariables: Replace parameters of the function by variales from
* Notebook if need
*/
//=============================================================================
-void ReplaceVariables(TCollection_AsciiString& theCommand,
+void ReplaceVariables(TCollection_AsciiString& theCommand,
const TVariablesList& theVariables)
{
if (MYDEBUG)
int aNbEntries = 1;
if( anEntry.Value( 1 ) == O_SQR_BRACKET && anEntry.Value( anEntry.Length() ) == C_SQR_BRACKET ) {
while(anEntry.Location(aNbEntries,COMMA,1,anEntry.Length()))
- aNbEntries++;
+ aNbEntries++;
TCollection_AsciiString aSeparator(COMMA);
anEntry = anEntry.Token(aSeparator.ToCString(),1);
anEntry.Remove( 1, 1 );
anEntry.RightAdjust();
anEntry.LeftAdjust();
if(MYDEBUG)
- cout<<"Sub-entry : '" <<anEntry<<"'"<<endl;
+ cout<<"Sub-entry : '" <<anEntry<<"'"<<endl;
}
-
+
//Find variables used for object construction
ObjectStates* aStates = 0;
TVariablesList::const_iterator it = theVariables.find(anEntry);
if(!aStates) {
if(MYDEBUG)
- cout<<"Valiables list empty!!!"<<endl;
+ cout<<"Valiables list empty!!!"<<endl;
aCommandIndex++;
continue;
}
if(MYDEBUG) {
cout<<"Variables from SObject:"<<endl;
for (int i = 0; i < aVariables.size();i++)
- cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<endl;
+ cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<endl;
}
//Calculate total number of parameters
//Replace first parameter (bettwen '(' character and first ',' character)
if(i == aFirstParam)
{
- aStartPos = aCommand.Location(O_BRACKET, 1, aCommand.Length()) + 1;
- if(aTotalNbParams - aNbEntries > 0 )
- aEndPos = aCommand.Location(aFirstParam, COMMA, 1, aCommand.Length());
- else
- aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length());
+ aStartPos = aCommand.Location(O_BRACKET, 1, aCommand.Length()) + 1;
+ if(aTotalNbParams - aNbEntries > 0 )
+ aEndPos = aCommand.Location(aFirstParam, COMMA, 1, aCommand.Length());
+ else
+ aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length());
}
//Replace last parameter (bettwen ',' character and ')' character)
else if(i == aTotalNbParams)
{
- aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
- aEndPos = aCommand.Location(C_BRACKET, 1, aCommand.Length());
+ aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
+ aEndPos = aCommand.Location(C_BRACKET, aStartPos , aCommand.Length());
}
//Replace other parameters (bettwen two ',' characters)
else if(i != aFirstParam && i != aTotalNbParams )
{
- aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
- aEndPos = aCommand.Location(i, COMMA, 1, aCommand.Length());
+ aStartPos = aCommand.Location(i-1, COMMA, 1, aCommand.Length()) + 2;
+ aEndPos = aCommand.Location(i, COMMA, 1, aCommand.Length());
}
if( aCommand.Value( aStartPos ) == O_SQR_BRACKET )
- aStartPos++;
+ aStartPos++;
if( aCommand.Value( aEndPos-1 ) == C_SQR_BRACKET )
- aEndPos--;
+ aEndPos--;
if ( aStartPos == aEndPos )
continue; // PAL20889: for "[]"
- if(MYDEBUG)
- cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<endl;
+ if(MYDEBUG)
+ cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<endl;
aVar = aCommand.SubString(aStartPos, aEndPos-1);
aVar.RightAdjust();
aVar.LeftAdjust();
-
- if(MYDEBUG)
- cout<<"Variable: '"<< aVar <<"'"<<endl;
+
+ if(MYDEBUG)
+ cout<<"Variable: '"<< aVar <<"'"<<endl;
// specific case for sketcher
if(aVar.Location( TCollection_AsciiString("Sketcher:"), 1, aVar.Length() ) != 0) {
- Standard_Integer aNbSections = 1;
- while( aVar.Location( aNbSections, ':', 1, aVar.Length() ) )
- aNbSections++;
- aNbSections--;
-
- int aStartSectionPos = 0, aEndSectionPos = 0;
- TCollection_AsciiString aSection, aReplacedSection;
- for(Standard_Integer aSectionIndex = 1; aSectionIndex <= aNbSections; aSectionIndex++) {
- aStartSectionPos = aVar.Location( aSectionIndex, ':', 1, aVar.Length() ) + 1;
- if( aSectionIndex != aNbSections )
- aEndSectionPos = aVar.Location( aSectionIndex + 1, ':', 1, aVar.Length() );
- else
- aEndSectionPos = aVar.Length();
-
- aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1);
- if(MYDEBUG)
- cout<<"aSection: "<<aSection<<endl;
-
- Standard_Integer aNbParams = 1;
- while( aSection.Location( aNbParams, ' ', 1, aSection.Length() ) )
- aNbParams++;
- aNbParams--;
-
- int aStartParamPos = 0, aEndParamPos = 0;
- TCollection_AsciiString aParameter, aReplacedParameter;
- for(Standard_Integer aParamIndex = 1; aParamIndex <= aNbParams; aParamIndex++) {
- aStartParamPos = aSection.Location( aParamIndex, ' ', 1, aSection.Length() ) + 1;
- if( aParamIndex != aNbParams )
- aEndParamPos = aSection.Location( aParamIndex + 1, ' ', 1, aSection.Length() );
- else
- aEndParamPos = aSection.Length() + 1;
-
- aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
- if(MYDEBUG)
- cout<<"aParameter: "<<aParameter<<endl;
-
- if(iVar >= aVariables.size())
+ Standard_Integer aNbSections = 1;
+ while( aVar.Location( aNbSections, ':', 1, aVar.Length() ) )
+ aNbSections++;
+ aNbSections--;
+
+ int aStartSectionPos = 0, aEndSectionPos = 0;
+ TCollection_AsciiString aSection, aReplacedSection;
+ for(Standard_Integer aSectionIndex = 1; aSectionIndex <= aNbSections; aSectionIndex++) {
+ aStartSectionPos = aVar.Location( aSectionIndex, ':', 1, aVar.Length() ) + 1;
+ if( aSectionIndex != aNbSections )
+ aEndSectionPos = aVar.Location( aSectionIndex + 1, ':', 1, aVar.Length() );
+ else
+ aEndSectionPos = aVar.Length();
+
+ aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1);
+ if(MYDEBUG)
+ cout<<"aSection: "<<aSection<<endl;
+
+ Standard_Integer aNbParams = 1;
+ while( aSection.Location( aNbParams, ' ', 1, aSection.Length() ) )
+ aNbParams++;
+ aNbParams--;
+
+ int aStartParamPos = 0, aEndParamPos = 0;
+ TCollection_AsciiString aParameter, aReplacedParameter;
+ for(Standard_Integer aParamIndex = 1; aParamIndex <= aNbParams; aParamIndex++) {
+ aStartParamPos = aSection.Location( aParamIndex, ' ', 1, aSection.Length() ) + 1;
+ if( aParamIndex != aNbParams )
+ aEndParamPos = aSection.Location( aParamIndex + 1, ' ', 1, aSection.Length() );
+ else
+ aEndParamPos = aSection.Length() + 1;
+
+ if(MYDEBUG)
+ cout<<"aParamIndex: "<<aParamIndex<<" aStartParamPos: " <<aStartParamPos<<" aEndParamPos: "<<aEndParamPos<<endl;
+
+ if ( aStartParamPos == aEndParamPos)
continue;
- aReplacedParameter = aVariables[iVar].myVariable;
- if(aReplacedParameter.IsEmpty()) {
- iVar++;
- continue;
- }
-
- if(aVariables[iVar].isVariable) {
- aReplacedParameter.InsertBefore(1,"'");
- aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'");
- }
-
- if(MYDEBUG)
- cout<<"aSection before : "<<aSection<<endl;
- aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos);
- aSection.Insert(aStartParamPos, aReplacedParameter);
- if(MYDEBUG)
- cout<<"aSection after : "<<aSection<<endl<<endl;
- iVar++;
- }
- if(MYDEBUG)
- cout<<"aVar before : "<<aVar<<endl;
- aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos);
- aVar.Insert(aStartSectionPos, aSection);
- if(MYDEBUG)
- cout<<"aVar after : "<<aVar<<endl<<endl;
- }
-
- if(MYDEBUG)
- cout<<"aCommand before : "<<aCommand<<endl;
- aCommand.Remove(aStartPos, aEndPos - aStartPos);
- aCommand.Insert(aStartPos, aVar);
- if(MYDEBUG)
- cout<<"aCommand after : "<<aCommand<<endl;
-
- break;
+ aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
+ if(MYDEBUG)
+ cout<<"aParameter: "<<aParameter<<endl;
+
+ if(iVar >= aVariables.size())
+ continue;
+
+ aReplacedParameter = aVariables[iVar].myVariable;
+ if(aReplacedParameter.IsEmpty()) {
+ iVar++;
+ continue;
+ }
+
+ if(aVariables[iVar].isVariable) {
+ aReplacedParameter.InsertBefore(1,"'");
+ aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'");
+ }
+
+ if(MYDEBUG)
+ cout<<"aSection before : "<<aSection<<endl;
+ aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos);
+ aSection.Insert(aStartParamPos, aReplacedParameter);
+ if(MYDEBUG)
+ cout<<"aSection after : "<<aSection<<endl<<endl;
+ iVar++;
+ }
+ if(MYDEBUG)
+ cout<<"aVar before : "<<aVar<<endl;
+ aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos);
+ aVar.Insert(aStartSectionPos, aSection);
+ if(MYDEBUG)
+ cout<<"aVar after : "<<aVar<<endl<<endl;
+ }
+
+ if(MYDEBUG)
+ cout<<"aCommand before : "<<aCommand<<endl;
+ aCommand.Remove(aStartPos, aEndPos - aStartPos);
+ aCommand.Insert(aStartPos, aVar);
+ if(MYDEBUG)
+ cout<<"aCommand after : "<<aCommand<<endl;
+
+ break;
} // end of specific case for sketcher
//If parameter is entry or 'None', skip it
if(theVariables.find(aVar) != theVariables.end() || aVar.Search(":") != -1 || aVar == PY_NULL)
- continue;
+ continue;
if(iVar >= aVariables.size())
- continue;
+ continue;
aReplacedVar = aVariables[iVar].myVariable;
if(aReplacedVar.IsEmpty()) {
- iVar++;
- continue;
+ iVar++;
+ continue;
}
if(aVariables[iVar].isVariable) {
- aReplacedVar.InsertBefore(1,"\"");
- aReplacedVar.InsertAfter(aReplacedVar.Length(),"\"");
+ aReplacedVar.InsertBefore(1,"\"");
+ aReplacedVar.InsertAfter(aReplacedVar.Length(),"\"");
}
aCommand.Remove(aStartPos, aEndPos - aStartPos);
*/
//=============================================================================
void ReplaceEntriesByNames (TCollection_AsciiString& theScript,
- Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
- const bool theIsPublished,
- Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
- TColStd_SequenceOfAsciiString& theObjListToPublish)
+ TSting2ObjDataMap& aEntry2ObjData,
+ const bool theIsPublished,
+ TColStd_SequenceOfAsciiString& theObjListToPublish,
+ Standard_Integer& objectCounter,
+ Resource_DataMapOfAsciiStringAsciiString& aNameToEntry)
{
Handle(TColStd_HSequenceOfInteger) aSeq = FindEntries(theScript);
- Standard_Integer aLen = aSeq->Length(), objectCounter = 0, aStart = 1, aScriptLength = theScript.Length();
- Resource_DataMapOfAsciiStringAsciiString aNameToEntry;
+ Standard_Integer aLen = aSeq->Length(), aStart = 1, aScriptLength = theScript.Length();
//Replace entries by the names
TCollection_AsciiString anUpdatedScript, anEntry, aName, aBaseName("geomObj_"),
anUpdatedScript += theScript.SubString(aStart, aSeq->Value(i)-1);
anEntry = theScript.SubString(aSeq->Value(i), aSeq->Value(i+1));
theObjListToPublish.Append( anEntry );
- if (theObjectNames.IsBound(anEntry)) {
- aName = theObjectNames.Find(anEntry);
- // check validity of aName
- bool isValidName = true;
- if ( aName.IsIntegerValue() ) { // aName must not start with a digit
- aName.Insert( 1, 'a' );
- isValidName = false;
- }
- int p, p2=1; // replace not allowed chars
- while ((p = aName.FirstLocationNotInSet(allowedChars, p2, aName.Length()))) {
- aName.SetValue(p, '_');
- p2=p;
- isValidName = false;
+
+ TObjectData& data = aEntry2ObjData[ anEntry ];
+ if ( data._pyName.IsEmpty() ) { // encounted for the 1st time
+ if ( !data._name.IsEmpty() ) { // published object
+ data._pyName = data._name;
+ healPyName( data._pyName, anEntry, aNameToEntry);
}
- if ( aNameToEntry.IsBound( aName ) && anEntry != aNameToEntry( aName ))
- { // diff objects have same name - make a new name by appending a digit
- TCollection_AsciiString aName2;
- Standard_Integer i = 0;
+ else {
do {
- aName2 = aName + "_" + ++i;
- } while ( aNameToEntry.IsBound( aName2 ) && anEntry != aNameToEntry( aName2 ));
- aName = aName2;
- isValidName = false;
- }
- if ( !isValidName ) {
- if ( theIsPublished )
- theEntryToBadName.Bind( anEntry, theObjectNames.Find(anEntry) );
- theObjectNames( anEntry ) = aName;
+ data._pyName = aBaseName + TCollection_AsciiString(++objectCounter);
+ } while(aNameToEntry.IsBound(data._pyName));
}
}
- else {
- do {
- aName = aBaseName + TCollection_AsciiString(++objectCounter);
- } while(aNameToEntry.IsBound(aName));
- theObjectNames.Bind(anEntry, aName);
- }
- aNameToEntry.Bind(aName, anEntry); // to detect same name of diff objects
-
- anUpdatedScript += aName;
+
+ aNameToEntry.Bind(data._pyName, anEntry); // to detect same name of diff objects
+
+ anUpdatedScript += data._pyName;
aStart = aSeq->Value(i+1) + 1;
}
-
+
//Add final part of the script
if (aLen && aSeq->Value(aLen) < aScriptLength)
anUpdatedScript += theScript.SubString(aSeq->Value(aLen)+1, aScriptLength); // mkr : IPAL11865
-
+
theScript = anUpdatedScript;
}
* AddObjectColors: Add color to objects
*/
//=============================================================================
-void AddObjectColors (const Handle(TDocStd_Document)& theDoc,
- TCollection_AsciiString& theScript,
- const Resource_DataMapOfAsciiStringAsciiString& theObjectNames)
+void AddObjectColors (int theDocID,
+ TCollection_AsciiString& theScript,
+ const TSting2ObjDataMap& theEntry2ObjData)
{
- Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString anEntryToNameIt;
- for (anEntryToNameIt.Initialize( theObjectNames );
- anEntryToNameIt.More();
- anEntryToNameIt.Next())
+ GEOM_Engine* engine = GEOM_Engine::GetEngine();
+ Handle(TDocStd_Document) aDoc = engine->GetDocument(theDocID);
+
+ TSting2ObjDataMap::const_iterator anEntryToNameIt;
+ for (anEntryToNameIt = theEntry2ObjData.begin();
+ anEntryToNameIt!= theEntry2ObjData.end();
+ ++anEntryToNameIt)
{
- const TCollection_AsciiString& aEntry = anEntryToNameIt.Key();
- const TCollection_AsciiString& aName = anEntryToNameIt.Value();
+ const TCollection_AsciiString& aEntry = anEntryToNameIt->first;
+ const TCollection_AsciiString& aName = anEntryToNameIt->second._pyName;
TDF_Label L;
- TDF_Tool::Label( theDoc->GetData(), aEntry, L );
+ TDF_Tool::Label( aDoc->GetData(), aEntry, L );
if ( L.IsNull() )
continue;
theScript += aCommand.ToCString();
}
- SALOMEDS::Color aColor = obj->GetColor();
- if ( aColor.R > 0 || aColor.G > 0 || aColor.B > 0 )
+ GEOM_Object::Color aColor = obj->GetColor();
+ if ( aColor.R >= 0 && aColor.G >= 0 && aColor.B >= 0 )
{
TCollection_AsciiString aCommand( "\n\t" );
aCommand += aName + ".SetColor(SALOMEDS.Color(" + aColor.R + "," + aColor.G + "," + aColor.B + "))";
theScript += aCommand.ToCString();
}
+
+ Aspect_TypeOfMarker aMarkerType = obj->GetMarkerType();
+ if (aMarkerType >= Aspect_TOM_POINT && aMarkerType < Aspect_TOM_USERDEFINED) {
+ TCollection_AsciiString aCommand( "\n\t" );
+ aCommand += aName + ".SetMarkerStd(";
+ switch (aMarkerType) {
+ 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_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;
+ default: aCommand += "GEOM.MT_NONE"; break; // just for completeness, should not get here
+ }
+ aCommand += ", ";
+ int aSize = (int)( obj->GetMarkerSize()/0.5 ) - 1;
+ switch (aSize) {
+ case 1: aCommand += "GEOM.MS_10"; break;
+ case 2: aCommand += "GEOM.MS_15"; break;
+ case 3: aCommand += "GEOM.MS_20"; break;
+ case 4: aCommand += "GEOM.MS_25"; break;
+ case 5: aCommand += "GEOM.MS_30"; break;
+ case 6: aCommand += "GEOM.MS_35"; break;
+ case 7: aCommand += "GEOM.MS_40"; break;
+ case 8: aCommand += "GEOM.MS_45"; break;
+ case 9: aCommand += "GEOM.MS_50"; break;
+ case 10: aCommand += "GEOM.MS_55"; break;
+ case 11: aCommand += "GEOM.MS_60"; break;
+ case 12: aCommand += "GEOM.MS_65"; break;
+ case 13: aCommand += "GEOM.MS_70"; break;
+ default: aCommand += "GEOM.MS_NONE"; break;
+ }
+ aCommand += ")";
+ theScript += aCommand.ToCString();
+ }
+ else if (aMarkerType == Aspect_TOM_USERDEFINED) {
+ int aMarkerTextureID = obj->GetMarkerTexture();
+ if (aMarkerTextureID >= 0) {
+ TCollection_AsciiString aCommand( "\n\t" );
+ aCommand += aName + ".SetMarkerTexture(texture_map[";
+ aCommand += aMarkerTextureID;
+ aCommand += "])";
+ theScript += aCommand.ToCString();
+ }
+ }
+ }
+}
+
+#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()) {
+ for (Standard_Integer i = aData->Lower(); i <= aData->Upper(); i++) {
+ Standard_Byte byte = aData->Value(i);
+ TCollection_AsciiString strByte = "";
+ for (int j = 0; j < 8; j++)
+ strByte.Prepend((byte & (1<<j)) ? "1" : "0");
+ stream += strByte;
+ }
+ }
+ return stream;
+}
+
+void AddTextures (int theDocID, TCollection_AsciiString& theScript)
+{
+ GEOM_Engine* engine = GEOM_Engine::GetEngine();
+ std::list<int> allTextures = engine->getAllTextures(theDocID);
+ std::list<int>::const_iterator it;
+
+ if (allTextures.size() > 0) {
+ theScript += "\n\ttexture_map = {}\n";
+
+ for (it = allTextures.begin(); it != allTextures.end(); ++it) {
+ 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);
+ if (aWidth > 0 && aHeight > 0 && !aTexture.IsNull() && aTexture->Length() > 0 ) {
+ TCollection_AsciiString aCommand = "\n\t";
+ aCommand += "texture_map["; aCommand += *it; aCommand += "] = ";
+ if (aFileName != "" ) {
+ aCommand += "geompy.LoadTexture(\"";
+ aCommand += aFileName.ToCString();
+ aCommand += "\")";
+ }
+ else {
+ aCommand += "geompy.AddTexture(";
+ aCommand += aWidth; aCommand += ", "; aCommand += aHeight; aCommand += ", \"";
+ aCommand += pack_data(aTexture);
+ aCommand += "\")";
+ }
+ theScript += aCommand;
+ }
+ }
+ theScript += "\n";
}
}
* PublishObject: publish object in study script
*/
//=============================================================================
-void PublishObject (const TCollection_AsciiString& theEntry,
- const TCollection_AsciiString& theName,
- const Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
- const Resource_DataMapOfAsciiStringAsciiString& theEntry2StEntry,
- const Resource_DataMapOfAsciiStringAsciiString& theStEntry2Entry,
- const Resource_DataMapOfAsciiStringAsciiString& theEntryToBadName,
- std::map< int, std::string >& theEntryToCommandMap,
- std::set<std::string>& theMapOfPublished)
+void PublishObject (TObjectData& theObjectData,
+ TSting2ObjDataMap& theEntry2ObjData,
+ const TSting2ObjDataPtrMap& theStEntry2ObjDataPtr,
+ Resource_DataMapOfAsciiStringAsciiString& theNameToEntry,
+ std::map< int, TCollection_AsciiString >& theEntryToCmdMap,
+ std::set< TCollection_AsciiString>& theIgnoreMap)
{
- if ( !theEntry2StEntry.IsBound( theEntry ))
+ if ( theObjectData._studyEntry.IsEmpty() )
return; // was not published
- if ( theMapOfPublished.count(theEntry.ToCString()) )
- return; // aready published
- theMapOfPublished.insert( theEntry.ToCString() );
+ if ( theIgnoreMap.count( theObjectData._entry ) )
+ return; // not to publish
- TCollection_AsciiString aCommand("\n\tgeompy."), aFatherEntry;
+ TCollection_AsciiString aCommand("\n\tgeompy.");
// find a father entry
- const TCollection_AsciiString& aStudyEntry = theEntry2StEntry( theEntry );
+ TObjectData* aFatherData = 0;
TCollection_AsciiString aFatherStudyEntry =
- aStudyEntry.SubString( 1, aStudyEntry.SearchFromEnd(":") - 1 );
- if ( theStEntry2Entry.IsBound( aFatherStudyEntry ))
- aFatherEntry = theStEntry2Entry( aFatherStudyEntry );
+ theObjectData._studyEntry.SubString( 1, theObjectData._studyEntry.SearchFromEnd(":") - 1 );
+ TSting2ObjDataPtrMap::const_iterator stEntry2DataPtr =
+ theStEntry2ObjDataPtr.find( aFatherStudyEntry );
+ if ( stEntry2DataPtr != theStEntry2ObjDataPtr.end() )
+ aFatherData = stEntry2DataPtr->second;
+
+ const int geomObjDepth = 3;
+
+ // treat multiply published object
+ if ( theObjectData._pyName.IsEmpty() )
+ {
+ TObjectData& data0 = theEntry2ObjData[ theObjectData._entry ];
+ if ( data0._pyName.IsEmpty() ) return; // something wrong
+
+ theObjectData._pyName = theObjectData._name;
+ 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 ));
+ }
// make a command
- if ( !aFatherEntry.IsEmpty() && theObjectNames.IsBound( aFatherEntry )) {
- aCommand += "addToStudyInFather( ";
- aCommand += theObjectNames( aFatherEntry ) + ", ";
+ if ( aFatherData && !aFatherData->_pyName.IsEmpty() ) {
+ aCommand += "addToStudyInFather( ";
+ aCommand += aFatherData->_pyName + ", ";
}
- else
+ else {
aCommand += "addToStudy( ";
- if ( theEntryToBadName.IsBound( theEntry ))
- aCommand += theName + ", \"" + theEntryToBadName( theEntry ) + "\" )";
- else
- aCommand += theName + ", \"" + theName + "\" )";
+ }
+ aCommand += theObjectData._pyName + ", '" + theObjectData._name + "' )";
+
+ // bind a command to the study entry
+ int tag = theObjectData._entry.Token( ":", geomObjDepth ).IntegerValue();
+ theEntryToCmdMap.insert( std::make_pair( tag, aCommand ));
- // bind a command to the last digit of the entry
- int tag =
- theEntry.SubString( theEntry.SearchFromEnd(":")+1, theEntry.Length() ).IntegerValue();
- theEntryToCommandMap.insert( std::make_pair( tag, aCommand.ToCString() ));
+ theObjectData._studyEntry.Clear(); // not to publish any more
}
//================================================================================
//================================================================================
/*!
- * \brief Add new object state
+ * \brief Add new object state
* \param theState - Object state (vector of notebook variable)
*/
//================================================================================