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
Code cleanup in SketchPlugin and SketchSolver.
[modules/shaper.git]
/
src
/
SketchPlugin
/
SketchPlugin_Sketch.h
diff --git
a/src/SketchPlugin/SketchPlugin_Sketch.h
b/src/SketchPlugin/SketchPlugin_Sketch.h
index fe0df3ba8295c266da56b0da51bbd398d8e639c3..d97ea573dc1dcc30c1821c1d85802b2f390f87fc 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()
@@
-190,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,
@@
-200,9
+213,12
@@
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
+ /// \param theIsCopy if true sets feature copy attribute to true.
/// \return a created feature
/// \return a created feature
- static FeaturePtr addUniqueNamedCopiedFeature(FeaturePtr aFeature,
- SketchPlugin_Sketch* theSketch);
+ static FeaturePtr addUniqueNamedCopiedFeature(FeaturePtr theFeature,
+ SketchPlugin_Sketch* theSketch,
+ const bool theIsCopy = false);
/// Creates a plane of the sketch.
/// \param theSketch a sketch intance
/// Creates a plane of the sketch.
/// \param theSketch a sketch intance