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
Issue #660 - Move Group is still not implemented -- Check refs only between the selec...
[modules/shaper.git]
/
src
/
Model
/
Model_AttributeRefAttr.cpp
diff --git
a/src/Model/Model_AttributeRefAttr.cpp
b/src/Model/Model_AttributeRefAttr.cpp
index 38e989e047ca7f10928df123f79e44117b43d02a..0c24fe3e1b762cfa047e634473aca9408b288c2c 100644
(file)
--- a/
src/Model/Model_AttributeRefAttr.cpp
+++ b/
src/Model/Model_AttributeRefAttr.cpp
@@
-7,6
+7,7
@@
#include "Model_AttributeRefAttr.h"
#include "Model_Application.h"
#include "Model_Data.h"
#include "Model_AttributeRefAttr.h"
#include "Model_Application.h"
#include "Model_Data.h"
+#include "Model_Objects.h"
#include <ModelAPI_Feature.h>
using namespace std;
#include <ModelAPI_Feature.h>
using namespace std;
@@
-45,7
+46,7
@@
void Model_AttributeRefAttr::setObject(ObjectPtr theObject)
{
// the back reference from the previous object to the attribute should be removed
ObjectPtr anObject = object();
{
// the back reference from the previous object to the attribute should be removed
ObjectPtr anObject = object();
- if (theObject && (!myIsInitialized || myID->Get().Length() != 0 || object() != theObject)) {
+ if (theObject
.get()
&& (!myIsInitialized || myID->Get().Length() != 0 || object() != theObject)) {
REMOVE_BACK_REF(anObject);
std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(
REMOVE_BACK_REF(anObject);
std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(
@@
-76,13
+77,21
@@
ObjectPtr Model_AttributeRefAttr::object()
owner()->document());
if (aDoc) {
TDF_Label aRefLab = myRef->Get();
owner()->document());
if (aDoc) {
TDF_Label aRefLab = myRef->Get();
- return aDoc->object(aRefLab);
+ return aDoc->object
s()->object
(aRefLab);
}
}
// not initialized
return ObjectPtr();
}
}
}
// not initialized
return ObjectPtr();
}
+bool Model_AttributeRefAttr::isInitialized()
+{
+ if (myRef->Get() == myRef->Label()) { // empty is not initialized: sketch parallelity
+ return false;
+ }
+ return ModelAPI_AttributeRefAttr::isInitialized();
+}
+
Model_AttributeRefAttr::Model_AttributeRefAttr(TDF_Label& theLabel)
{
myIsInitialized = theLabel.FindAttribute(TDataStd_Comment::GetID(), myID) == Standard_True;
Model_AttributeRefAttr::Model_AttributeRefAttr(TDF_Label& theLabel)
{
myIsInitialized = theLabel.FindAttribute(TDataStd_Comment::GetID(), myID) == Standard_True;