Merge from V6_main_20120808 08Aug12

[modules/yacs.git] / src / hmi / guiContext.cxx

diff --git a/src/hmi/guiContext.cxx b/src/hmi/guiContext.cxx
index c99b620673cf4061b67da1a452cd2615bc14b001..d5caac22a33fa08e0d3c83059ccffd760e6720c4 100644 (file)
--- a/src/hmi/guiContext.cxx
+++ b/src/hmi/guiContext.cxx
@@ -1,21 +1,22 @@
-//  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
 //
-//  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
 //
+
 #include "RuntimeSALOME.hxx"
 #include "guiContext.hxx"
 #include "Proc.hxx"
@@ -47,6 +48,8 @@ GuiContext::GuiContext()
   _proc = 0;
   _subjectProc = 0;
   _numItem = 0;
+  _isNotSaved = false;
+  _isLoading = false;
 
   _mapOfSubjectNode.clear();
   _mapOfSubjectDataPort.clear();
@@ -56,6 +59,7 @@ GuiContext::GuiContext()
   _mapOfSubjectContainer.clear();
   _mapOfSubjectDataType.clear();
   _mapOfExecSubjectNode.clear();
+  _mapOfLastComponentInstance.clear();
   _lastErrorMessage ="";
   _xmlSchema ="";
   _YACSEngineContainer = pair<string, string>("YACSServer","localhost");
@@ -90,6 +94,8 @@ void GuiContext::setProc(YACS::ENGINE::Proc* proc)
   _mapOfSubjectComponent.clear();
   _mapOfSubjectContainer.clear();
   _mapOfSubjectDataType.clear();
+  _mapOfLastComponentInstance.clear();
+  _lastErrorMessage ="";
 
   _subjectProc = new SubjectProc(proc, this);
   _mapOfSubjectNode[static_cast<Node*>(proc)] = _subjectProc;