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
Simplified calculation of fly out distance and creation of constraints limited only...
[modules/shaper.git]
/
src
/
SketchPlugin
/
SketchPlugin_Plugin.cpp
diff --git
a/src/SketchPlugin/SketchPlugin_Plugin.cpp
b/src/SketchPlugin/SketchPlugin_Plugin.cpp
index 904fe1e2200957c9fc4a255efc923214e7844e1a..cfa5e8a095e35f92ed3c07b14d8d450579e931b6 100644
(file)
--- a/
src/SketchPlugin/SketchPlugin_Plugin.cpp
+++ b/
src/SketchPlugin/SketchPlugin_Plugin.cpp
@@
-6,6
+6,7
@@
#include <SketchPlugin_Point.h>
#include <SketchPlugin_Circle.h>
#include <SketchPlugin_Arc.h>
#include <SketchPlugin_Point.h>
#include <SketchPlugin_Circle.h>
#include <SketchPlugin_Arc.h>
+#include <SketchPlugin_ConstraintAngle.h>
#include <SketchPlugin_ConstraintCoincidence.h>
#include <SketchPlugin_ConstraintDistance.h>
#include <SketchPlugin_ConstraintEqual.h>
#include <SketchPlugin_ConstraintCoincidence.h>
#include <SketchPlugin_ConstraintDistance.h>
#include <SketchPlugin_ConstraintEqual.h>
@@
-67,11
+68,13
@@
SketchPlugin_Plugin::SketchPlugin_Plugin()
new SketchPlugin_CoincidenceAttrValidator);
aFactory->registerValidator("SketchPlugin_CopyValidator",
new SketchPlugin_CopyValidator);
new SketchPlugin_CoincidenceAttrValidator);
aFactory->registerValidator("SketchPlugin_CopyValidator",
new SketchPlugin_CopyValidator);
+ aFactory->registerValidator("SketchPlugin_SolverErrorValidator",
+ new SketchPlugin_SolverErrorValidator);
// register this plugin
ModelAPI_Session::get()->registerPlugin(this);
// register this plugin
ModelAPI_Session::get()->registerPlugin(this);
- Config_PropManager::registerProp("Visualization", "sketch_entity_color", "Sketch enity color",
+ Config_PropManager::registerProp("Visualization", "sketch_entity_color", "Sketch en
t
ity color",
Config_Prop::Color, SKETCH_ENTITY_COLOR);
Config_PropManager::registerProp("Visualization", "sketch_external_color", "Sketch external entity color",
Config_Prop::Color, SKETCH_ENTITY_COLOR);
Config_PropManager::registerProp("Visualization", "sketch_external_color", "Sketch external entity color",
@@
-80,9
+83,6
@@
SketchPlugin_Plugin::SketchPlugin_Plugin()
Config_PropManager::registerProp("Visualization", "sketch_auxiliary_color", "Sketch auxiliary entity color",
Config_Prop::Color, SKETCH_AUXILIARY_COLOR);
Config_PropManager::registerProp("Visualization", "sketch_auxiliary_color", "Sketch auxiliary entity color",
Config_Prop::Color, SKETCH_AUXILIARY_COLOR);
- Config_PropManager::registerProp("Visualization", "sketch_constraint_color", "Sketch constraint color",
- Config_Prop::Color, SKETCH_CONSTRAINT_COLOR);
-
Config_PropManager::registerProp("Visualization", "sketch_dimension_color", "Sketch dimension color",
Config_Prop::Color, SKETCH_DIMENSION_COLOR);
Config_PropManager::registerProp("Visualization", "sketch_dimension_color", "Sketch dimension color",
Config_Prop::Color, SKETCH_DIMENSION_COLOR);
@@
-139,6
+139,8
@@
FeaturePtr SketchPlugin_Plugin::createFeature(string theFeatureID)
return FeaturePtr(new SketchPlugin_MultiTranslation);
} else if (theFeatureID == SketchPlugin_MultiRotation::ID()) {
return FeaturePtr(new SketchPlugin_MultiRotation);
return FeaturePtr(new SketchPlugin_MultiTranslation);
} else if (theFeatureID == SketchPlugin_MultiRotation::ID()) {
return FeaturePtr(new SketchPlugin_MultiRotation);
+ } else if (theFeatureID == SketchPlugin_ConstraintAngle::ID()) {
+ return FeaturePtr(new SketchPlugin_ConstraintAngle);
}
// feature of such kind is not found
return FeaturePtr();
}
// feature of such kind is not found
return FeaturePtr();
@@
-159,8
+161,8
@@
std::shared_ptr<ModelAPI_FeatureStateMessage> SketchPlugin_Plugin
::getFeaturesState(const std::shared_ptr<ModelAPI_Feature>& theFeature) const
{
const Events_ID kResponseEvent = Events_Loop::loop()->eventByName(EVENT_FEATURE_STATE_RESPONSE);
::getFeaturesState(const std::shared_ptr<ModelAPI_Feature>& theFeature) const
{
const Events_ID kResponseEvent = Events_Loop::loop()->eventByName(EVENT_FEATURE_STATE_RESPONSE);
- std::shared_ptr<ModelAPI_FeatureStateMessage> aMsg
=
-
std::make_shared<ModelAPI_FeatureStateMessage>(kResponseEvent, this
);
+ std::shared_ptr<ModelAPI_FeatureStateMessage> aMsg
(
+
new ModelAPI_FeatureStateMessage(kResponseEvent, this)
);
bool aHasSketchPlane = false;
std::shared_ptr<SketchPlugin_Sketch> aSketchFeature =
bool aHasSketchPlane = false;
std::shared_ptr<SketchPlugin_Sketch> aSketchFeature =
@@
-189,6
+191,9
@@
std::shared_ptr<ModelAPI_FeatureStateMessage> SketchPlugin_Plugin
aMsg->setState(SketchPlugin_ConstraintTangent::ID(), aHasSketchPlane);
aMsg->setState(SketchPlugin_ConstraintMirror::ID(), aHasSketchPlane);
aMsg->setState(SketchPlugin_ConstraintFillet::ID(), aHasSketchPlane);
aMsg->setState(SketchPlugin_ConstraintTangent::ID(), aHasSketchPlane);
aMsg->setState(SketchPlugin_ConstraintMirror::ID(), aHasSketchPlane);
aMsg->setState(SketchPlugin_ConstraintFillet::ID(), aHasSketchPlane);
+ aMsg->setState(SketchPlugin_ConstraintAngle::ID(), aHasSketchPlane);
+ aMsg->setState(SketchPlugin_MultiRotation::ID(), aHasSketchPlane);
+ aMsg->setState(SketchPlugin_MultiTranslation::ID(), aHasSketchPlane);
}
}
return aMsg;
}
}
return aMsg;