X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_NoteBook.hxx;h=f552555714813c1c3998777a8906a3648468f757;hb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;hp=661f42f496a41b24e9abb7dfbb7f5f11000de7d5;hpb=1c3d4eccd17b112559ad4870a2a55a85f6a36b36;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_NoteBook.hxx b/src/SMESH_I/SMESH_NoteBook.hxx index 661f42f49..f55255571 100644 --- a/src/SMESH_I/SMESH_NoteBook.hxx +++ b/src/SMESH_I/SMESH_NoteBook.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -84,8 +84,7 @@ private: class SMESH_NoteBook { public: - typedef std::map TVariablesMap; - typedef std::map TMeshEditorMap; + SMESH_NoteBook(); ~SMESH_NoteBook(); void ReplaceVariables(); @@ -94,6 +93,7 @@ public: TCollection_AsciiString GetResultScript() const; private: + void InitObjectMap(); void ProcessLayerDistribution(); @@ -101,9 +101,14 @@ private: private: - TVariablesMap _objectMap; + typedef std::map TVariablesMap; + typedef std::map TMeshEditorMap; + typedef std::map > TEntry2VarVecMap; + + TVariablesMap _objectMap; // old approach - full states are kept + TEntry2VarVecMap _entry2VarsMap; // new approach - only var names are kept std::vector _commands; - TMeshEditorMap myMeshEditors; + TMeshEditorMap _meshEditors; }; #endif //SMESH_NoteBook_HeaderFile