X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.h;h=f80b8cf7d30e4fe82e656c3aa0ae067b0a5248f3;hb=426a1cf07dfee0bbb58dcd399787a89a4992fa72;hp=1172bc7dee0479550053ff910a41ffca0ffaaa3c;hpb=c5311359309c0ec43f24a94015ff56840ab4317d;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index 1172bc7de..f80b8cf7d 100644
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -5,6 +5,8 @@
 #include "XGUI_Constants.h"
 #include <Events_Listener.h>
 #include <ModuleBase_Definitions.h>
+#include <ModelAPI_ResultPart.h>
+#include <ModelAPI_Document.h>
 
 #include <QObject>
 #include <QMap>
@@ -37,7 +39,9 @@ class Config_PointerMessage;
 class QWidget;
 class QDockWidget;
 
-class Model_FeatureUpdatedMessage;
+class ModelAPI_ObjectUpdatedMessage;
+class ModelAPI_ObjectDeletedMessage;
+class QAction;
 
 /**\class XGUI_Workshop
  * \ingroup GUI
@@ -109,13 +113,13 @@ public:
 
   //! Activates or deactivates a part
   //! If PartPtr is Null pointer then PartSet will be activated
-  void activatePart(FeaturePtr theFeature);
+  void activatePart(ResultPartPtr theFeature);
 
   //! Delete features
-  void deleteFeatures(QFeatureList theList);
+  void deleteObjects(const QList<ObjectPtr>& theList);
 
   //! Show the given features in 3d Viewer
-  void showFeatures(QFeatureList theList, bool isVisible);
+  void showObjects(const QList<ObjectPtr>& theList, bool isVisible);
 
   ModuleBase_IModule* module() const { return myModule; }
 
@@ -125,7 +129,7 @@ signals:
 
 public slots:
   void updateCommandStatus();
-  void updateModuleCommands();
+  void updateCommandsOnViewSelection();
 
   void onNew();
   void onOpen();
@@ -134,6 +138,7 @@ public slots:
   void onExit();
   void onUndo();
   void onRedo();
+  void onPreferences();
 
   void showPropertyPanel();
   void hidePropertyPanel();
@@ -141,7 +146,7 @@ public slots:
   void hideObjectBrowser();
 
   void onFeatureTriggered();
-  void changeCurrentDocument(FeaturePtr thePart);
+  void changeCurrentDocument(ObjectPtr theObj);
 
   void activateLastPart();
 
@@ -151,9 +156,18 @@ protected:
   void connectWithOperation(ModuleBase_Operation* theOperation);
   void saveDocument(QString theName);
 
-  void onFeatureUpdatedMsg(const Model_FeatureUpdatedMessage* theMsg);
-  void onFeatureCreatedMsg(const Model_FeatureUpdatedMessage* theMsg);
-  void onFeatureRedisplayMsg(const Model_FeatureUpdatedMessage* theMsg);
+  void onFeatureUpdatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg);
+  void onFeatureCreatedMsg(const ModelAPI_ObjectUpdatedMessage* theMsg);
+  void onFeatureRedisplayMsg(const ModelAPI_ObjectUpdatedMessage* theMsg);
+  void onObjectDeletedMsg(const ModelAPI_ObjectDeletedMessage* theMsg);
+
+  void validateOperation(const QString& theOperationId);
+
+  QList<QAction*> getModuleCommands() const;
+
+  void displayAllResults();
+  void displayDocumentResults(DocumentPtr theDoc);
+  void displayGroupResults(DocumentPtr theDoc, std::string theGroup);
 
 protected slots:
   /// SLOT, that is called after the operation is started. Update workshop state according to
@@ -168,9 +182,14 @@ protected slots:
 
   void onWidgetValuesChanged();
 
+  void onStartWaiting();
+
 private:
   void initMenu();
 
+  void registerValidators() const;
+
+
   ModuleBase_IModule* loadModule(const QString& theModule);
   bool activateModule();
 
@@ -196,7 +215,6 @@ private:
 
   QString myCurrentDir;
   static QMap<QString, QString> myIcons;
-
 };
 
 #endif