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_WidgetValueFeature.h
diff --git
a/src/ModuleBase/ModuleBase_WidgetValueFeature.h
b/src/ModuleBase/ModuleBase_WidgetValueFeature.h
index 9bdaeb619ac76c9fa76beb82ddecabadb4b5d42d..53abb591bdbd8e5345c306929bbd88253dbcf0ef 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetValueFeature.h
+++ b/
src/ModuleBase/ModuleBase_WidgetValueFeature.h
@@
-8,7
+8,7
@@
#include <ModuleBase.h>
#include <ModuleBase_WidgetValue.h>
#include <ModuleBase.h>
#include <ModuleBase_WidgetValue.h>
-#include <ModelAPI_
Feature
.h>
+#include <ModelAPI_
Result
.h>
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
@@
-18,32
+18,32
@@
class GeomAPI_Pnt2d;
* \ingroup GUI
* \brief Custom widget value. The widget contains a feature and 2D point.
*/
* \ingroup GUI
* \brief Custom widget value. The widget contains a feature and 2D point.
*/
-class M
ODULEBASE_EXPORT M
oduleBase_WidgetValueFeature : public ModuleBase_WidgetValue
+class ModuleBase_WidgetValueFeature : public ModuleBase_WidgetValue
{
{
-public:
+
public:
/// Constructor
/// Constructor
- ModuleBase_WidgetValueFeature();
+ M
ODULEBASE_EXPORT M
oduleBase_WidgetValueFeature();
/// Destructor
/// Destructor
- virtual ~ModuleBase_WidgetValueFeature();
+
MODULEBASE_EXPORT
virtual ~ModuleBase_WidgetValueFeature();
/// Fill the widget values by given point
/// \param thePoint the point
/// Fill the widget values by given point
/// \param thePoint the point
-
void setFeature(const Feature
Ptr& theFeature);
+
MODULEBASE_EXPORT void setObject(const Object
Ptr& theFeature);
/// Returns the widget values by given point
/// \return theFeature the current feature
/// Returns the widget values by given point
/// \return theFeature the current feature
-
const FeaturePtr& feature
() const;
+
MODULEBASE_EXPORT const ObjectPtr& object
() const;
/// Fill the widget values by given point
/// \param thePoint the point
/// Fill the widget values by given point
/// \param thePoint the point
- void setPoint(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint);
+
MODULEBASE_EXPORT
void setPoint(const boost::shared_ptr<GeomAPI_Pnt2d>& thePoint);
/// Returns the widget point
/// \return the current point
/// Returns the widget point
/// \return the current point
- const boost::shared_ptr<GeomAPI_Pnt2d>& point() const;
+
MODULEBASE_EXPORT
const boost::shared_ptr<GeomAPI_Pnt2d>& point() const;
-private:
-
FeaturePtr myFeature
;
+
private:
+
ObjectPtr myResult
;
boost::shared_ptr<GeomAPI_Pnt2d> myPoint;
};
boost::shared_ptr<GeomAPI_Pnt2d> myPoint;
};