From: vsv <vitaly.smetannikov@opencascade.com>
Date: Fri, 25 Apr 2014 13:41:47 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~118
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d4572a0253007ff9fc263253720e37bf896f8d0d;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/XGUI/XGUI_Workshop.cpp
---

d4572a0253007ff9fc263253720e37bf896f8d0d
diff --cc src/XGUI/XGUI_Workshop.cpp
index 1835a13f0,cbc3ce146..cbd6239cb
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -216,13 -196,18 +216,20 @@@ void XGUI_Workshop::onOperationStarted(
  //******************************************************
  void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
  {
-   hidePropertyPanel();
-   updateCommandStatus();
+   ModuleBase_PropPanelOperation* aOperation =
+         (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation());
+ 
+   if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
+     updateCommandStatus();
+   } else {
 -    myMainWindow->hidePropertyPanel();
++    hidePropertyPanel();
+     updateCommandStatus();
  
 +  if (myMainWindow) {
      XGUI_MainMenu* aMenu = myMainWindow->menuObject();
      aMenu->restoreCommandState();
    }
++  }
  }
  
  /*