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
Issue #904 - Fatal error aftre delete sketch from dataset used in extrusion in part
[modules/shaper.git]
/
src
/
ConstructionPlugin
/
ConstructionPlugin_Axis.h
diff --git
a/src/ConstructionPlugin/ConstructionPlugin_Axis.h
b/src/ConstructionPlugin/ConstructionPlugin_Axis.h
index 2b968ba593553a229efbc52ef920111993e57583..1775300ebda82e65cbdd043fdc84073e78d6eb35 100644
(file)
--- a/
src/ConstructionPlugin/ConstructionPlugin_Axis.h
+++ b/
src/ConstructionPlugin/ConstructionPlugin_Axis.h
@@
-9,9
+9,9
@@
#include "ConstructionPlugin.h"
#include <ModelAPI_Feature.h>
#include "ConstructionPlugin.h"
#include <ModelAPI_Feature.h>
+#include <ModelAPI_Result.h>
#include <GeomAPI_ICustomPrs.h>
#include <GeomAPI_ICustomPrs.h>
-
/**\class ConstructionPlugin_Axis
* \ingroup Plugins
* \brief Feature for creation of the new axis in PartSet.
/**\class ConstructionPlugin_Axis
* \ingroup Plugins
* \brief Feature for creation of the new axis in PartSet.
@@
-32,18
+32,31
@@
class ConstructionPlugin_Axis : public ModelAPI_Feature, public GeomAPI_ICustomP
static const std::string CONSTRUCTION_AXIS_KIND("Axis");
return CONSTRUCTION_AXIS_KIND;
}
static const std::string CONSTRUCTION_AXIS_KIND("Axis");
return CONSTRUCTION_AXIS_KIND;
}
+
+ /// attribute name for first point
+ inline static const std::string& METHOD()
+ {
+ static const std::string METHOD_ATTR("CreationMethod");
+ return METHOD_ATTR;
+ }
/// attribute name for first point
inline static const std::string& POINT_FIRST()
{
/// attribute name for first point
inline static const std::string& POINT_FIRST()
{
- static const std::string POINT_ATTR_FIRST("
f
irstPoint");
+ static const std::string POINT_ATTR_FIRST("
F
irstPoint");
return POINT_ATTR_FIRST;
}
/// attribute name for second point
inline static const std::string& POINT_SECOND()
{
return POINT_ATTR_FIRST;
}
/// attribute name for second point
inline static const std::string& POINT_SECOND()
{
- static const std::string POINT_ATTR_SECOND("
s
econdPoint");
+ static const std::string POINT_ATTR_SECOND("
S
econdPoint");
return POINT_ATTR_SECOND;
}
return POINT_ATTR_SECOND;
}
+ /// attribute name for second point
+ inline static const std::string& CYLINDRICAL_FACE()
+ {
+ static const std::string CYLINDRICAL_FACE_ATTR("CylindricalFace");
+ return CYLINDRICAL_FACE_ATTR;
+ }
inline static const double MINIMAL_LENGTH() { return 1.e-5; }
inline static const double MINIMAL_LENGTH() { return 1.e-5; }
@@
-60,7
+73,12
@@
class ConstructionPlugin_Axis : public ModelAPI_Feature, public GeomAPI_ICustomP
ConstructionPlugin_Axis();
/// Customize presentation of the feature
ConstructionPlugin_Axis();
/// Customize presentation of the feature
- virtual void customisePresentation(AISObjectPtr thePrs);
+ virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs,
+ std::shared_ptr<GeomAPI_ICustomPrs> theDefaultPrs);
+
+ protected:
+ void createAxisByTwoPoints();
+ void createAxisByCylindricalFace();
};
};