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
First part of the test correction for improvement: 2D points selection in multi-trans...
[modules/shaper.git]
/
src
/
SketchPlugin
/
SketchPlugin_Sketch.h
diff --git
a/src/SketchPlugin/SketchPlugin_Sketch.h
b/src/SketchPlugin/SketchPlugin_Sketch.h
index 0512b12e962b514834d573b8175cf736c0689726..8a1788c5c0a18d863f38dacfff28e08f482f86d2 100644
(file)
--- a/
src/SketchPlugin/SketchPlugin_Sketch.h
+++ b/
src/SketchPlugin/SketchPlugin_Sketch.h
@@
-61,6
+61,12
@@
class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu
static const std::string MY_FEATURES_ID("Features");
return MY_FEATURES_ID;
}
static const std::string MY_FEATURES_ID("Features");
return MY_FEATURES_ID;
}
+ /// Sketch solver error
+ inline static const std::string& SOLVER_ERROR()
+ {
+ static const std::string MY_SOLVER_ERROR("SolverError");
+ return MY_SOLVER_ERROR;
+ }
/// Returns the kind of a feature
SKETCHPLUGIN_EXPORT virtual const std::string& getKind()
/// Returns the kind of a feature
SKETCHPLUGIN_EXPORT virtual const std::string& getKind()
@@
-82,13
+88,6
@@
class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu
{
}
{
}
- /// Return the distance between the feature and the point
- /// \param thePoint the point
- virtual double distanceToPoint(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
- {
- return 0;
- }
-
/// Converts a 2D sketch space point into point in 3D space
/// \param theX an X coordinate
/// \param theY an Y coordinate
/// Converts a 2D sketch space point into point in 3D space
/// \param theX an X coordinate
/// \param theY an Y coordinate
@@
-184,9
+183,9
@@
class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu
/// Returns the sub-feature by zero-base index
SKETCHPLUGIN_EXPORT virtual std::shared_ptr<ModelAPI_Feature>
/// Returns the sub-feature by zero-base index
SKETCHPLUGIN_EXPORT virtual std::shared_ptr<ModelAPI_Feature>
- subFeature(const int theIndex, bool forTree = false)
const
;
+ subFeature(const int theIndex, bool forTree = false);
- /// Returns the sub-feature unique identifier in this composite feature by
zero-base
index
+ /// Returns the sub-feature unique identifier in this composite feature by index
SKETCHPLUGIN_EXPORT virtual int subFeatureId(const int theIndex) const;
/// Returns true if feature or reuslt belong to this composite feature as subs
SKETCHPLUGIN_EXPORT virtual int subFeatureId(const int theIndex) const;
/// Returns true if feature or reuslt belong to this composite feature as subs
@@
-197,7
+196,14
@@
class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu
SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID);
SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID);
+ /// Exchanges IDs of two given features: needed for fillet feature better naming (issue 769)
+ SKETCHPLUGIN_EXPORT virtual void exchangeIDs(std::shared_ptr<ModelAPI_Feature> theFeature1,
+ std::shared_ptr<ModelAPI_Feature> theFeature2);
+
+
/// \brief Create a result for the point in the attribute if the attribute is initialized
/// \brief Create a result for the point in the attribute if the attribute is initialized
+ /// \param theFeature a source feature
+ /// \param theSketch a sketch intance
/// \param theAttributeID an attribute string
/// \param theIndex an index of the result
static void createPoint2DResult(ModelAPI_Feature* theFeature,
/// \param theAttributeID an attribute string
/// \param theIndex an index of the result
static void createPoint2DResult(ModelAPI_Feature* theFeature,
@@
-207,8
+213,9
@@
class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu
/// Add new feature and fill the data of the feature by the data of the parameter feature.
/// The name of the created feature stays unique.
/// \param theFeature a source feature
/// Add new feature and fill the data of the feature by the data of the parameter feature.
/// The name of the created feature stays unique.
/// \param theFeature a source feature
+ /// \param theSketch a sketch intance
/// \return a created feature
/// \return a created feature
- static FeaturePtr addUniqueNamedCopiedFeature(FeaturePtr
a
Feature,
+ static FeaturePtr addUniqueNamedCopiedFeature(FeaturePtr
the
Feature,
SketchPlugin_Sketch* theSketch);
/// Creates a plane of the sketch.
SketchPlugin_Sketch* theSketch);
/// Creates a plane of the sketch.