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
#1707 Fatal error when Recover box
[modules/shaper.git]
/
src
/
FeaturesPlugin
/
FeaturesPlugin_Plugin.cpp
diff --git
a/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
b/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
index d42ede130fe27114837435ce2cd1bad0f8f3148c..0daaa1ec1fa1b9f94060e3da83c74d6233abc511 100644
(file)
--- a/
src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
+++ b/
src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
@@
-12,11
+12,13
@@
#include <FeaturesPlugin_Partition.h>
#include <FeaturesPlugin_Pipe.h>
#include <FeaturesPlugin_Placement.h>
#include <FeaturesPlugin_Partition.h>
#include <FeaturesPlugin_Pipe.h>
#include <FeaturesPlugin_Placement.h>
+#include <FeaturesPlugin_Recover.h>
#include <FeaturesPlugin_RemoveSubShapes.h>
#include <FeaturesPlugin_Revolution.h>
#include <FeaturesPlugin_RevolutionCut.h>
#include <FeaturesPlugin_RevolutionFuse.h>
#include <FeaturesPlugin_Rotation.h>
#include <FeaturesPlugin_RemoveSubShapes.h>
#include <FeaturesPlugin_Revolution.h>
#include <FeaturesPlugin_RevolutionCut.h>
#include <FeaturesPlugin_RevolutionFuse.h>
#include <FeaturesPlugin_Rotation.h>
+#include <FeaturesPlugin_Union.h>
#include <FeaturesPlugin_ValidatorTransform.h>
#include <FeaturesPlugin_Validators.h>
#include <FeaturesPlugin_ValidatorTransform.h>
#include <FeaturesPlugin_Validators.h>
@@
-43,8
+45,8
@@
FeaturesPlugin_Plugin::FeaturesPlugin_Plugin()
new FeaturesPlugin_ValidatorBaseForGeneration);
aFactory->registerValidator("FeaturesPlugin_ValidatorPipeLocations",
new FeaturesPlugin_ValidatorPipeLocations);
new FeaturesPlugin_ValidatorBaseForGeneration);
aFactory->registerValidator("FeaturesPlugin_ValidatorPipeLocations",
new FeaturesPlugin_ValidatorPipeLocations);
- aFactory->registerValidator("FeaturesPlugin_Validator
CanBeEmpty
",
- new FeaturesPlugin_Validator
CanBeEmpty
);
+ aFactory->registerValidator("FeaturesPlugin_Validator
ExtrusionDir
",
+ new FeaturesPlugin_Validator
ExtrusionDir
);
aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanSelection",
new FeaturesPlugin_ValidatorBooleanSelection);
aFactory->registerValidator("FeaturesPlugin_ValidatorPartitionSelection",
aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanSelection",
new FeaturesPlugin_ValidatorBooleanSelection);
aFactory->registerValidator("FeaturesPlugin_ValidatorPartitionSelection",
@@
-55,6
+57,10
@@
FeaturesPlugin_Plugin::FeaturesPlugin_Plugin()
new FeaturesPlugin_ValidatorRemoveSubShapesResult);
aFactory->registerValidator("FeaturesPlugin_ValidatorPipePath",
new FeaturesPlugin_ValidatorPipePath);
new FeaturesPlugin_ValidatorRemoveSubShapesResult);
aFactory->registerValidator("FeaturesPlugin_ValidatorPipePath",
new FeaturesPlugin_ValidatorPipePath);
+ aFactory->registerValidator("FeaturesPlugin_ValidatorUnionSelection",
+ new FeaturesPlugin_ValidatorUnionSelection);
+ aFactory->registerValidator("FeaturesPlugin_ValidatorUnionArguments",
+ new FeaturesPlugin_ValidatorUnionArguments);
// register this plugin
ModelAPI_Session::get()->registerPlugin(this);
// register this plugin
ModelAPI_Session::get()->registerPlugin(this);
@@
-82,6
+88,8
@@
FeaturePtr FeaturesPlugin_Plugin::createFeature(string theFeatureID)
return FeaturePtr(new FeaturesPlugin_Pipe);
} else if (theFeatureID == FeaturesPlugin_Placement::ID()) {
return FeaturePtr(new FeaturesPlugin_Placement);
return FeaturePtr(new FeaturesPlugin_Pipe);
} else if (theFeatureID == FeaturesPlugin_Placement::ID()) {
return FeaturePtr(new FeaturesPlugin_Placement);
+ } else if (theFeatureID == FeaturesPlugin_Recover::ID()) {
+ return FeaturePtr(new FeaturesPlugin_Recover);
} else if (theFeatureID == FeaturesPlugin_ExtrusionCut::ID()) {
return FeaturePtr(new FeaturesPlugin_ExtrusionCut);
} else if (theFeatureID == FeaturesPlugin_ExtrusionFuse::ID()) {
} else if (theFeatureID == FeaturesPlugin_ExtrusionCut::ID()) {
return FeaturePtr(new FeaturesPlugin_ExtrusionCut);
} else if (theFeatureID == FeaturesPlugin_ExtrusionFuse::ID()) {
@@
-92,6
+100,8
@@
FeaturePtr FeaturesPlugin_Plugin::createFeature(string theFeatureID)
return FeaturePtr(new FeaturesPlugin_RevolutionFuse);
} else if (theFeatureID == FeaturesPlugin_RemoveSubShapes::ID()) {
return FeaturePtr(new FeaturesPlugin_RemoveSubShapes);
return FeaturePtr(new FeaturesPlugin_RevolutionFuse);
} else if (theFeatureID == FeaturesPlugin_RemoveSubShapes::ID()) {
return FeaturePtr(new FeaturesPlugin_RemoveSubShapes);
+ } else if (theFeatureID == FeaturesPlugin_Union::ID()) {
+ return FeaturePtr(new FeaturesPlugin_Union);
}
// feature of such kind is not found
}
// feature of such kind is not found