Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetFactory.h

diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.h b/src/ModuleBase/ModuleBase_WidgetFactory.h
index c5b8ef59881f46a86a6d8b541eda092422cf4dd0..5360f35dbba39a443ee05b2e460c5a06f4fe2b54 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetFactory.h
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.h
@@ -8,8 +8,8 @@
 #ifndef ModuleBase_WidgetFactory_H_
 #define ModuleBase_WidgetFactory_H_
 
-#include <ModuleBase.h>
-#include <ModuleBase_IModelWidget.h>
+#include "ModuleBase.h"
+#include "ModuleBase_ModelWidget.h"
 
 #include <QString>
 #include <QList>
@@ -17,37 +17,48 @@
 class QObject;
 class QWidget;
 class Config_WidgetAPI;
-class ModuleBase_Operation;
+class ModuleBase_IWorkshop;
 
 class MODULEBASE_EXPORT ModuleBase_WidgetFactory
 {
 public:
-  ModuleBase_WidgetFactory(ModuleBase_Operation*);
+  ModuleBase_WidgetFactory(const std::string& theXmlRepresentation, ModuleBase_IWorkshop* theWorkshop);
   virtual ~ModuleBase_WidgetFactory();
 
   void createWidget(QWidget* theParent);
 
-  QList<ModuleBase_IModelWidget*> getWrappedWidgets() const
+  QList<ModuleBase_ModelWidget*> getModelWidgets() const
   {
-    return myWidgets;
+    return myModelWidgets;
   }
 
 protected:
   //Widgets
   QWidget* createWidgetByType(const std::string& theType, QWidget* theParent = NULL);
   QWidget* labelControl(QWidget* theParent);
-  QWidget* doubleSpinBoxControl();
+  QWidget* doubleSpinBoxControl(QWidget* theParent);
   QWidget* pointSelectorControl(QWidget* theParent);
+  QWidget* featureSelectorControl(QWidget* theParent);
+  QWidget* featureOrAttributeSelectorControl(QWidget* theParent);
+  QWidget* doubleValueEditor(QWidget* theParent);
   QWidget* createContainer(const std::string& theType, QWidget* theParent = NULL);
+  QWidget* selectorControl(QWidget* theParent);
+  QWidget* booleanControl(QWidget* theParent);
+  QWidget* point2dDistanceControl(QWidget* theParent);
+
+  /// Check whether the XML definition for the given type contains internal property
+  /// \param theType the widget type
+  /// \return the boolean result
+  bool isInternalWidget(const std::string& theType);
 
-  bool connectWidget(QObject*, const QString&);
   QString qs(const std::string& theStdString) const;
 
 private:
   Config_WidgetAPI* myWidgetApi;
-  ModuleBase_Operation*   myOperation;
+  ModuleBase_IWorkshop*   myWorkshop;
 
-  QList<ModuleBase_IModelWidget*> myWidgets;
+  QList<ModuleBase_ModelWidget*> myModelWidgets;
+  std::string myParentId;
 };
 
 #endif /* ModuleBase_WidgetFactory_H_ */