]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
refs #30 - Sketch base GUI: create, draw lines
authornds <natalia.donis@opencascade.com>
Wed, 23 Apr 2014 12:47:33 +0000 (16:47 +0400)
committernds <natalia.donis@opencascade.com>
Wed, 23 Apr 2014 12:47:33 +0000 (16:47 +0400)
Creation of the operation manager to provide the operations stack.

src/ModuleBase/ModuleBase_Operation.cpp
src/ModuleBase/ModuleBase_Operation.h
src/ModuleBase/ModuleBase_PropPanelOperation.h
src/XGUI/XGUI_Workshop.cpp

index 95112d67fe1b97e1cd76e8792dec6262794f4527..3c052e4753a131cc4167540f49b7daa3c1e8a3af 100644 (file)
@@ -54,16 +54,6 @@ QString ModuleBase_Operation::operationId() const
   return myOperationId;
 }
 
-/*!
- * \brief Replied whether the operation should be commited after the start, or the operation itself
- *  do that. The default realization provides the check by the operation having the xml prepresentation 
- *  @return the boolean value
- */
-bool ModuleBase_Operation::isPerformedImmediately() const
-{
-  return xmlRepresentation().isEmpty();
-}
-
 std::shared_ptr<ModelAPI_Feature> ModuleBase_Operation::feature() const
 {
   return myFeature;
index 4042beeb4d9453febee84ee8a757d033b0fb7ae6..6e109860b8ca56052459d678b1f66a92f08225d8 100644 (file)
@@ -76,8 +76,6 @@ public:
   // Operation processing.
   virtual QString operationId() const;
 
-  virtual bool isPerformedImmediately() const;
-
   std::shared_ptr<ModelAPI_Feature> feature() const;
 
   OperationState state() const;
index c6dc06814d25a8b2d10e6c040973a10179101016..29ced2bd3ae5d3ec045762ae5eccaf591e6f3eb4 100644 (file)
@@ -29,6 +29,15 @@ public:
   ModuleBase_PropPanelOperation(const QString& theId = "", QObject* parent = 0);
   virtual ~ModuleBase_PropPanelOperation();
 
+  /*!
+   * \brief Replied whether the operation should be commited after the start, or the operation itself
+   *  do that. The default realization provides the check by the operation having the xml prepresentation 
+   *  @return the boolean value
+   */
+  virtual bool isPerformedImmediately() const
+  {
+    return xmlRepresentation().isEmpty();
+  }
   /*!
    *  \brief Returns XML representation of the operation's widget.
    *  \return XML QString
index 3775dc25469f7e44fdbc9ddf7886f5dec1df692a..f9e46bf96ee50d0cba7271ce3952b080154cce6d 100644 (file)
@@ -202,7 +202,7 @@ void XGUI_Workshop::onBeforeOperationStart()
   if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
     //myPartSetModule->connectToPropertyPanel(aOperation);
   } else {
-    connectToPropertyPanel(aOperation);
+    connectWithOperation(aOperation);
     QWidget* aPropWidget = myMainWindow->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
     qDeleteAll(aPropWidget->children());
   }