Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of newgeom:newgeom
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetFactory.h
diff --git
a/src/ModuleBase/ModuleBase_WidgetFactory.h
b/src/ModuleBase/ModuleBase_WidgetFactory.h
index bf765824f95dcdbc4a106bd1e4e0ad761f4738f6..5d55add4f742182a508abd27acfcf98d0e204e5b 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_
#ifndef ModuleBase_WidgetFactory_H_
#define ModuleBase_WidgetFactory_H_
-#include
<ModuleBase.h>
-#include
<ModuleBase_ModelWidget.h>
+#include
"ModuleBase.h"
+#include
"ModuleBase_ModelWidget.h"
#include <QString>
#include <QList>
#include <QString>
#include <QList>
@@
-17,12
+17,12
@@
class QObject;
class QWidget;
class Config_WidgetAPI;
class QObject;
class QWidget;
class Config_WidgetAPI;
-class ModuleBase_
Operation
;
+class ModuleBase_
IWorkshop
;
class MODULEBASE_EXPORT ModuleBase_WidgetFactory
{
public:
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);
virtual ~ModuleBase_WidgetFactory();
void createWidget(QWidget* theParent);
@@
-36,16
+36,19
@@
protected:
//Widgets
QWidget* createWidgetByType(const std::string& theType, QWidget* theParent = NULL);
QWidget* labelControl(QWidget* theParent);
//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* pointSelectorControl(QWidget* theParent);
+ QWidget* featureSelectorControl(QWidget* theParent);
QWidget* createContainer(const std::string& theType, QWidget* theParent = NULL);
QWidget* createContainer(const std::string& theType, QWidget* theParent = NULL);
+ QWidget* selectorControl(QWidget* theParent);
+ QWidget* booleanControl(QWidget* theParent);
+ QWidget* point2dDistanceControl(QWidget* theParent);
- bool connectWidget(QObject*, const QString&);
QString qs(const std::string& theStdString) const;
private:
Config_WidgetAPI* myWidgetApi;
QString qs(const std::string& theStdString) const;
private:
Config_WidgetAPI* myWidgetApi;
- ModuleBase_
Operation* myOperation
;
+ ModuleBase_
IWorkshop* myWorkshop
;
QList<ModuleBase_ModelWidget*> myModelWidgets;
};
QList<ModuleBase_ModelWidget*> myModelWidgets;
};