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
Remove extra files
[modules/shaper.git]
/
src
/
Model
/
Model_ResultPart.cpp
diff --git
a/src/Model/Model_ResultPart.cpp
b/src/Model/Model_ResultPart.cpp
index f1e51b21f208fa684e288af6d21b2684635d222c..0a4422ad125769af3799c094179083b46d3bb313 100644
(file)
--- a/
src/Model/Model_ResultPart.cpp
+++ b/
src/Model/Model_ResultPart.cpp
@@
-27,7
+27,8
@@
#include <BRep_Builder.hxx>
#include <TopExp_Explorer.hxx>
#include <BRep_Builder.hxx>
#include <TopExp_Explorer.hxx>
-#define baseRef() std::dynamic_pointer_cast<Model_ResultPart>(data()->reference(BASE_REF_ID())->value())
+#define baseRef() \
+ std::dynamic_pointer_cast<Model_ResultPart>(data()->reference(BASE_REF_ID())->value())
void Model_ResultPart::initAttributes()
{
void Model_ResultPart::initAttributes()
{
@@
-68,7
+69,8
@@
void Model_ResultPart::activate()
// activation may cause changes in current features in document, so it must be in transaction
bool isNewTransaction = false;
SessionPtr aMgr = ModelAPI_Session::get();
// activation may cause changes in current features in document, so it must be in transaction
bool isNewTransaction = false;
SessionPtr aMgr = ModelAPI_Session::get();
- if (!aMgr->isOperation()) { // open transaction even document is not created to set current docs in setActiveDocument
+ if (!aMgr->isOperation()) {
+ // open transaction even document is not created to set current docs in setActiveDocument
aMgr->startOperation("Activation");
isNewTransaction = true;
}
aMgr->startOperation("Activation");
isNewTransaction = true;
}
@@
-242,7
+244,8
@@
std::string Model_ResultPart::nameInPart(const std::shared_ptr<GeomAPI_Shape>& t
if (!aDoc.get()) // the part document is not presented for the moment
return "";
TDF_Label anAccessLabel = aDoc->generalLabel();
if (!aDoc.get()) // the part document is not presented for the moment
return "";
TDF_Label anAccessLabel = aDoc->generalLabel();
- // make the selection attribute anyway: otherwise just by name it is not stable to search the result
+ // make the selection attribute anyway:
+ // otherwise just by name it is not stable to search the result
std::string aName;
// for this the context result is needed
ResultPtr aContext;
std::string aName;
// for this the context result is needed
ResultPtr aContext;
@@
-283,6
+286,15
@@
bool Model_ResultPart::updateInPart(const int theIndex)
return false; // something is wrong
}
return false; // something is wrong
}
+gp_Trsf Model_ResultPart::sumTrsf() {
+ gp_Trsf aResult;
+ if (myTrsf) {
+ aResult = *myTrsf;
+ aResult = aResult * baseRef()->sumTrsf();
+ }
+ return aResult;
+}
+
std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shapeInPart(
const std::string& theName, const std::string& theType, int& theIndex)
{
std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shapeInPart(
const std::string& theName, const std::string& theType, int& theIndex)
{
@@
-305,6
+317,11
@@
std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shapeInPart(
aSelAttr->append(theName, theType);
theIndex = aSelAttr->size();
aResult = aSelAttr->value(theIndex - 1)->value();
aSelAttr->append(theName, theType);
theIndex = aSelAttr->size();
aResult = aSelAttr->value(theIndex - 1)->value();
+ if (myTrsf.get() && aResult.get() && !aResult->isNull()) {
+ gp_Trsf aSumTrsf = sumTrsf();
+ TopoDS_Shape anOrigMoved = aResult->impl<TopoDS_Shape>().Moved(aSumTrsf);
+ aResult->setImpl(new TopoDS_Shape(anOrigMoved));
+ }
return aResult;
}
return aResult;
}
@@
-317,6
+334,11
@@
std::shared_ptr<GeomAPI_Shape> Model_ResultPart::selectionValue(const int theInd
AttributeSelectionListPtr aSelAttr = aDoc->selectionInPartFeature();
aResult = aSelAttr->value(theIndex - 1)->value();
AttributeSelectionListPtr aSelAttr = aDoc->selectionInPartFeature();
aResult = aSelAttr->value(theIndex - 1)->value();
+ if (myTrsf.get() && aResult.get() && !aResult->isNull()) {
+ gp_Trsf aSumTrsf = sumTrsf();
+ TopoDS_Shape anOrigMoved = aResult->impl<TopoDS_Shape>().Moved(aSumTrsf);
+ aResult->setImpl(new TopoDS_Shape(anOrigMoved));
+ }
return aResult;
}
return aResult;
}