]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Tue, 29 Apr 2014 07:37:19 +0000 (11:37 +0400)
committersbh <sergey.belash@opencascade.com>
Tue, 29 Apr 2014 07:37:19 +0000 (11:37 +0400)
Conflicts:
src/XGUI/XGUI_Workshop.h

1  2 
src/PartSet/PartSet_Module.cpp
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h

Simple merge
index dd6e1200fc321ab3db8b5f3fd42f04f45d916ab4,2655b569456ab43b28ea6227a5a35987696e4185..e36e3c26998e037642480ed913fb20c29556a4b4
@@@ -63,10 -60,9 +63,11 @@@ XGUI_Workshop::XGUI_Workshop(XGUI_Salom
    // So, displayer will be created on demand.
  
    mySelector = new XGUI_SelectionMgr(this);
+   connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(changeCurrentDocument()));
    myOperationMgr = new XGUI_OperationMgr(this);
    myActionsMgr = new XGUI_ActionsMgr(this);
 +  myErrorDlg = new XGUI_ErrorDialog(myMainWindow);
 +
    connect(myOperationMgr, SIGNAL(operationStarted()),  this, SLOT(onOperationStarted()));
    connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
            this, SLOT(onOperationStopped(ModuleBase_Operation*)));
index 6406381ed243554dbcdd6accc9f70c71d4ba051d,7d75839cfae07bc44d117b5e762b673b8212a8cb..3f857ff12400d7f12e68d8f34869a788b504ac65
@@@ -90,10 -94,9 +95,11 @@@ public slots
    void hideObjectBrowser();
  
    void onFeatureTriggered();
 -
+   void changeCurrentDocument();
  
 +signals:
 +  void errorOccurred(const QString&);
 +
  protected:
    //Event-loop processing methods:
    void addFeature(const Config_FeatureMessage*);