X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetFactory.cpp;h=d8e6bc26229a8c950ed918a3b6c08f006f3f83e0;hb=9aeb69897970e21212d6f8926ec33d2eb696f18d;hp=165aa750fa7acdf9aac2c929efd25642edba9067;hpb=4a3d31271be41bff510b9702c2e77c2fea5b99bd;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.cpp b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
index 165aa750f..d8e6bc262 100644
--- a/src/ModuleBase/ModuleBase_WidgetFactory.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
@@ -8,6 +8,7 @@
  */
 
 #include <ModuleBase_WidgetFactory.h>
+#include <ModuleBase_IconFactory.h>
 
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_OperationDescription.h>
@@ -25,7 +26,6 @@
 #include <ModuleBase_WidgetLineEdit.h>
 #include <ModuleBase_WidgetMultiSelector.h>
 #include <ModuleBase_WidgetLabel.h>
-#include <ModuleBase_WidgetErrorLabel.h>
 #include <ModuleBase_WidgetToolbox.h>
 #include <ModuleBase_PageBase.h>
 #include <ModuleBase_PageGroupBox.h>
@@ -33,6 +33,7 @@
 #include <ModuleBase_PageWidget.h>
 #include <ModuleBase_WidgetExprEditor.h>
 #include <ModuleBase_WidgetCreatorFactory.h>
+#include <ModuleBase_WidgetAction.h>
 
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Session.h>
@@ -69,15 +70,18 @@ ModuleBase_WidgetFactory::~ModuleBase_WidgetFactory()
   delete myWidgetApi;
 }
 
-void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage)
+void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage, bool alignToTop)
 {
   std::string aWType = myWidgetApi->widgetType();
   if (aWType == NODE_FEATURE) {
-    QWidget* aPanel = createPanel(thePage->pageWidget());
-    if (aPanel) {
-      thePage->addWidget(aPanel);
+    // if XML definition of the feature contains the next key, the widgets should not be created,
+    // but a specific panel should be made. However, to provide persistent of the panel values,
+    // we need to get into the panel the feature of the operation. As a result this panel should
+    // be created after the feature creating(create operation). The method setPanel() of this
+    // class is used for this. Here, we just return to avoid the widgets creation.
+    std::string aPanelName = myWidgetApi->getProperty(PROPERTY_PANEL_ID);
+    if (!aPanelName.empty())
       return;
-    }
   }
 
   if (!myWidgetApi->toChildWidget())
@@ -108,25 +112,39 @@ void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage)
       if (myWidgetApi->isPagedWidget()) {
         //If current widget is toolbox or switch-casebox then fetch all
         //it's pages recursively and setup into the widget.
-        myWidgetApi->toChildWidget();
-        do {
-          QString aPageName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME));
-          QString aCaseId = qs(myWidgetApi->getProperty(_ID));
-          ModuleBase_PageBase* aPage = new ModuleBase_PageWidget(aWidget);
-          createWidget(aPage);
-          if (aWdgType == WDG_SWITCH || aWdgType == WDG_TOOLBOX) {
-            ModuleBase_PagedContainer* aContainer = qobject_cast<ModuleBase_PagedContainer*>(aWidget);
-
-            QString anIconPath = qs( myWidgetApi->getProperty( CONTAINER_PAGE_ICON ) );
-            QPixmap anIcon( anIconPath );
-            aContainer->addPage( aPage, aPageName, aCaseId, anIcon );
-          }
-        } while (myWidgetApi->toNextWidget());
+        if (myWidgetApi->toChildWidget()) {
+          do {
+            QString aPageName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME));
+            QString aCaseId = qs(myWidgetApi->getProperty(_ID));
+            ModuleBase_PageBase* aPage = new ModuleBase_PageWidget(aWidget);
+            createWidget(aPage);
+            if (aWdgType == WDG_SWITCH || aWdgType == WDG_TOOLBOX) {
+              ModuleBase_PagedContainer* aContainer = qobject_cast<ModuleBase_PagedContainer*>(aWidget);
+
+              QString anIconPath = qs( myWidgetApi->getProperty( CONTAINER_PAGE_ICON ) );
+              QPixmap anIcon = ModuleBase_IconFactory::loadPixmap( anIconPath );
+              aContainer->addPage( aPage, aPageName, aCaseId, anIcon );
+            }
+          } while (myWidgetApi->toNextWidget());
+        }
       }
     }
   } while (myWidgetApi->toNextWidget());
 
-  thePage->alignToTop();
+  if (alignToTop)
+    thePage->alignToTop();
+}
+
+void ModuleBase_WidgetFactory::createPanel(ModuleBase_PageBase* thePage,
+                                           const FeaturePtr& theFeature)
+{
+  std::string aPanelName = myWidgetApi->getProperty(PROPERTY_PANEL_ID);
+  if (!aPanelName.empty() && ModuleBase_WidgetCreatorFactory::get()->hasPanelWidget(aPanelName)) {
+    QWidget* aPanel = ModuleBase_WidgetCreatorFactory::get()->createPanelByType(aPanelName,
+                                                               thePage->pageWidget(), theFeature);
+    thePage->addWidget(aPanel);
+    thePage->alignToTop();
+  }
 }
 
 void ModuleBase_WidgetFactory::createWidget(ModuleBase_PageBase* thePage,
@@ -186,10 +204,11 @@ void ModuleBase_WidgetFactory::getGreedAttribute(std::string& theAttributeId)
       if (theAttributeId.empty() && myWidgetApi->isPagedWidget()) {
         //If current widget is toolbox or switch-casebox then fetch all
         //it's pages recursively and setup into the widget.
-        myWidgetApi->toChildWidget();
-        do {
-          getGreedAttribute(theAttributeId);
-        } while (theAttributeId.empty() && myWidgetApi->toNextWidget());
+        if (myWidgetApi->toChildWidget()) {
+          do {
+            getGreedAttribute(theAttributeId);
+          } while (theAttributeId.empty() && myWidgetApi->toNextWidget());
+        }
       }
     }
   } while (theAttributeId.empty() && myWidgetApi->toNextWidget());
@@ -217,24 +236,16 @@ void ModuleBase_WidgetFactory::moveToWidgetId(const std::string& theWidgetId, bo
       if (!theFound && myWidgetApi->isPagedWidget()) {
         //If current widget is toolbox or switch-casebox then fetch all
         //it's pages recursively and setup into the widget.
-        myWidgetApi->toChildWidget();
-        do {
-          moveToWidgetId(theWidgetId, theFound);
-        } while (!theFound && myWidgetApi->toNextWidget());
+        if (myWidgetApi->toChildWidget()) {
+          do {
+            moveToWidgetId(theWidgetId, theFound);
+          } while (!theFound && myWidgetApi->toNextWidget());
+        }
       }
     }
   } while (!theFound && myWidgetApi->toNextWidget());
 }
 
-QWidget* ModuleBase_WidgetFactory::createPanel(QWidget* theParent)
-{
-  QWidget* aPanel = 0;
-  std::string aPanelName = myWidgetApi->getProperty(PROPERTY_PANEL_ID);
-  if (!aPanelName.empty() && ModuleBase_WidgetCreatorFactory::get()->hasPanelWidget(aPanelName))
-    aPanel = ModuleBase_WidgetCreatorFactory::get()->createPanel(aPanelName, theParent);
-  return aPanel;
-}
-
 ModuleBase_PageBase* ModuleBase_WidgetFactory::createPageByType(const std::string& theType,
                                                                 QWidget* theParent)
 {
@@ -271,8 +282,6 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::
 
   if (theType == WDG_INFO) {
     result = new ModuleBase_WidgetLabel(theParent, myWidgetApi);
-  } else if (theType == WDG_ERRORINFO) {
-    result = new ModuleBase_WidgetErrorLabel(theParent, myWidgetApi);
   } else if (theType == WDG_DOUBLEVALUE) {
     result = new ModuleBase_WidgetDoubleValue(theParent, myWidgetApi);
   } else if (theType == WDG_INTEGERVALUE) {
@@ -303,6 +312,8 @@ ModuleBase_ModelWidget* ModuleBase_WidgetFactory::createWidgetByType(const std::
              theType == NODE_VALIDATOR) {
     // Do nothing for "box" and "case"
     result = NULL;
+  } else if (theType == WDG_ACTION) {
+    result = new ModuleBase_WidgetAction(theParent, myWidgetApi);
   } else {
     result = myWorkshop->module()->createWidgetByType(theType, theParent, myWidgetApi);
     if (!result)