X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_2smeshpy.hxx;h=4e6531ddee31c3ed6e9785afc58f6e2f9a19853d;hb=3c043924f918605ef44f9fa8ca3294bf77cd101f;hp=f5550889b48673624e99c67f42662725dffcdf81;hpb=85aae58eadeb3276be732dbb81ec9fc7a7cec147;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_2smeshpy.hxx b/src/SMESH_I/SMESH_2smeshpy.hxx index f5550889b..4e6531dde 100644 --- a/src/SMESH_I/SMESH_2smeshpy.hxx +++ b/src/SMESH_I/SMESH_2smeshpy.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2014 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 @@ -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 @@ -42,6 +42,8 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS) +#define USE_STRING_FAMILY + // =========================================================================================== /*! * This file was created in order to respond to requirement of bug PAL10494: @@ -100,11 +102,12 @@ class _pyCommand: public Standard_Transient _AString myString; //!< command text _AString myRes, myObj, myMeth; //!< found parts of command TColStd_SequenceOfAsciiString myArgs; //!< found arguments + TColStd_SequenceOfAsciiString myResults; //!< found results TColStd_SequenceOfInteger myBegPos; //!< where myRes, myObj, ... begin std::list< Handle(_pyCommand) > myDependentCmds; //!< commands that sould follow me in the script enum { UNKNOWN=-1, EMPTY=0, RESULT_IND, OBJECT_IND, METHOD_IND, ARG1_IND }; - int GetBegPos( int thePartIndex ); + int GetBegPos( int thePartIndex ) const; void SetBegPos( int thePartIndex, int thePosition ); void SetPart( int thePartIndex, const _AString& theNewPart, _AString& theOldPart); void FindAllArgs() { GetArg(1); } @@ -118,17 +121,19 @@ public: void SetOrderNb( int theNb ) { myOrderNb = theNb; } typedef void* TAddr; TAddr GetAddress() const { return (void*) this; } - int Length() { return myString.Length(); } + int Length() const { return myString.Length(); } void Clear() { myString.Clear(); myBegPos.Clear(); myArgs.Clear(); } bool IsEmpty() const { return myString.IsEmpty(); } _AString GetIndentation(); const _AString & GetResultValue(); int GetNbResultValues(); - _AString GetResultValue(int res); + const _AString& GetResultValue(int res); const _AString & GetObject(); const _AString & GetMethod(); const _AString & GetArg( int index ); int GetNbArgs() { FindAllArgs(); return myArgs.Length(); } + int GetArgBeginning() const; + bool IsMethodCall(); bool MethodStartsFrom(const _AString& beg) { GetMethod(); return ( myMeth.Location( beg, 1, myMeth.Length() ) == 1 ); } void SetResultValue( const _AString& theResult ) @@ -144,6 +149,9 @@ public: static _AString GetWord( const _AString & theSring, int & theStartPos, const bool theForward, const bool dotIsWord = false); static bool IsStudyEntry( const _AString& str ); + static bool IsID( const _AString& str ); + static bool IsIDChar( char c ) + { return ( isalnum( c ) || c == '_' || c == ':' ); } static std::list< _pyID > GetStudyEntries( const _AString& str ); void AddDependantCmd( Handle(_pyCommand) cmd, bool prepend = false) { if (prepend) myDependentCmds.push_front( cmd ); else myDependentCmds.push_back( cmd ); } @@ -214,6 +222,26 @@ struct ExportedMeshData } }; +// ------------------------------------------------------------------------------------- +/*! + * \brief A container of strings groupped by prefix. It is used for a faster search of + * objects requiring to KeepAgrCmds() in commands. A speed up is gained because + * only a common prefix (e.g. "aArea") of many object IDs is searched in a command + * and not every object ID + */ +// ------------------------------------------------------------------------------------- +class _pyStringFamily +{ + _AString _prefix; + std::list< _pyStringFamily > _subFams; + std::list< _AString > _strings; + int isIn( const char* str ); +public: + bool Add( const char* str ); + bool IsInArgs( Handle( _pyCommand)& cmd, std::list<_AString>& subStr ); + void Print( int level = 0 ); +}; + // ------------------------------------------------------------------------------------- /*! * \brief Class corresponding to SMESH_Gen. It holds info on existing @@ -237,7 +265,7 @@ public: void PlaceSubmeshAfterItsCreation( Handle(_pyCommand) theCmdUsingSubmesh ) const; _pyID GenerateNewID( const _pyID& theID ); - void AddObject( Handle(_pyObject)& theObj ); + bool AddObject( Handle(_pyObject)& theObj ); void CheckObjectIsReCreated( Handle(_pyObject)& theObj ); void SetProxyObject( const _pyID& theID, Handle(_pyObject)& theObj ); Handle(_pyObject) FindObject( const _pyID& theObjID ) const; @@ -254,7 +282,11 @@ public: bool IsGeomObject(const _pyID& theObjID) const; bool IsNotPublished(const _pyID& theObjID) const; void ObjectCreationRemoved(const _pyID& theObjID); +#ifdef USE_STRING_FAMILY + void KeepAgrCmds(const _pyID& theObjID) { myKeepAgrCmdsIDs.Add( theObjID.ToCString() ); } +#else void KeepAgrCmds(const _pyID& theObjID) { myKeepAgrCmdsIDs.push_back( theObjID ); } +#endif bool IsToKeepAllCommands() const { return myToKeepAllCommands; } void AddExportedMesh(const _AString& file, const ExportedMeshData& mesh ) { myFile2ExportedMesh[ file ] = mesh; } @@ -277,9 +309,14 @@ private: private: std::map< _pyID, Handle(_pyMesh) > myMeshes; std::map< _pyID, Handle(_pyMeshEditor) > myMeshEditors; - std::map< _pyID, Handle(_pyObject) > myObjects; std::map< _pyID, Handle(_pyHypothesis) > myHypos; + std::map< _pyID, Handle(_pyObject) > myObjects; + std::list< Handle(_pyObject) > myOrderedObjects; // to know order of myObjects creation +#ifdef USE_STRING_FAMILY + _pyStringFamily myKeepAgrCmdsIDs; +#else std::list< _pyID > myKeepAgrCmdsIDs; +#endif std::list< Handle(_pyCommand) > myCommands; int myNbCommands; Resource_DataMapOfAsciiStringAsciiString& myID2AccessorMethod; @@ -540,6 +577,8 @@ public: _pySelfEraser(const Handle(_pyCommand)& theCreationCmd); void IgnoreOwnCalls() { myIgnoreOwnCalls = true; } virtual void Flush(); + virtual bool CanClear(); + static bool IsAliveCmd( const Handle(_pyCommand)& theCmd ); DEFINE_STANDARD_RTTI (_pySelfEraser) }; @@ -555,7 +594,7 @@ class _pySubMesh: public _pyObject Handle(_pyObject) myCreator; Handle(_pyMesh) myMesh; public: - _pySubMesh(const Handle(_pyCommand)& theCreationCmd); + _pySubMesh(const Handle(_pyCommand)& theCreationCmd, bool toKeepAgrCmds=true); virtual void Process( const Handle(_pyCommand)& theCommand); virtual void Flush(); virtual Handle(_pyMesh) GetMesh() { return myMesh; } @@ -592,7 +631,7 @@ DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject); * \brief To convert creation of a group by filter */ // ------------------------------------------------------------------------------------- -class _pyGroup: public _pySubMesh +class _pyGroup: public _pySubMesh // use myMesh of _pySubMesh { Handle(_pyFilter) myFilter; bool myCanClearCreationCmd;