Remove obsolete flag

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 31bc21a3206204d82c84e5795c712c58b59c6fc9..7607e16173b529a5d7548ae578040ad71793af9a 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -105,8 +105,7 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
       mySalomeConnector(theConnector),
       myPropertyPanel(0),
       myObjectBrowser(0),
-      myDisplayer(0),
-     myIsLoadingData(false)
+      myDisplayer(0)
 {
   myMainWindow = mySalomeConnector ? 0 : new AppElements_MainWindow();
 
@@ -589,13 +588,11 @@ void XGUI_Workshop::onOpen()
     return;
   }
   QApplication::setOverrideCursor(Qt::WaitCursor);
-  myIsLoadingData = true;
   aSession->closeAll();
   aSession->load(myCurrentDir.toLatin1().constData());
   myObjectBrowser->rebuildDataTree();
   //displayAllResults();
   updateCommandStatus();
-  myIsLoadingData = false;
   QApplication::restoreOverrideCursor();
 }
 

diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index 8b44268d0d8442b10a1238b0eee6195826a42133..93feade454c43737fa6e241ec85b4554d2ea67f2 100644 (file)
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -127,13 +127,6 @@ Q_OBJECT
     return mySalomeConnector != 0;
   }
 
-  /// Returns true if the loading data process is started and has not been finished yet
-  /// \return boolean result
-  bool isLoadingData() const
-  {
-    return myIsLoadingData;
-  };
-
   //! Returns Object browser
   XGUI_ObjectsBrowser* objectBrowser() const
   {
@@ -416,9 +409,6 @@ private:
   XGUI_WorkshopListener* myEventsListener;
 
   QString myCurrentDir;
-
-  /// The flag is true when we loading a document
-  bool myIsLoadingData;
 };
 
 #endif

diff --git a/src/XGUI/XGUI_WorkshopListener.cpp b/src/XGUI/XGUI_WorkshopListener.cpp
index 2a699ca34b65f1b82d77595e62633ad13727500a..120a9390aafdabb0b8653e26e7cf26fb0b32a968 100755 (executable)
--- a/src/XGUI/XGUI_WorkshopListener.cpp
+++ b/src/XGUI/XGUI_WorkshopListener.cpp
@@ -417,7 +417,7 @@ bool XGUI_WorkshopListener::displayObject(ObjectPtr theObj)
     aDisplayer->display(theObj, false);
     if (aNb == 0)
       myWorkshop->viewer()->fitAll();
-  } else if (!aWorkshop->isLoadingData())
+  } else 
     aDisplayer->display(theObj, false);
 
   return true;