From 0a67bd79eecc6c80764687cd823782abbe25587b Mon Sep 17 00:00:00 2001 From: vsv Date: Tue, 7 Jul 2015 14:33:55 +0300 Subject: [PATCH] Remove obsolete flag --- src/XGUI/XGUI_Workshop.cpp | 5 +---- src/XGUI/XGUI_Workshop.h | 10 ---------- src/XGUI/XGUI_WorkshopListener.cpp | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 31bc21a32..7607e1617 100644 --- 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 8b44268d0..93feade45 100644 --- 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 2a699ca34..120a9390a 100755 --- 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; -- 2.39.2