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
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
[modules/shaper.git]
/
src
/
Model
/
Model_AttributeDocRef.cpp
diff --git
a/src/Model/Model_AttributeDocRef.cpp
b/src/Model/Model_AttributeDocRef.cpp
index dfb307f4dbfe0981cc8915fc838cea6a798540a4..2284226c262cb09819572a5c52e370623f5a7950 100644
(file)
--- a/
src/Model/Model_AttributeDocRef.cpp
+++ b/
src/Model/Model_AttributeDocRef.cpp
@@
-1,42
+1,38
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: ModelAPI_AttributeDocRef.cxx
// Created: 2 Apr 2014
// Author: Mikhail PONIKAROV
#include "Model_AttributeDocRef.h"
#include "Model_Application.h"
// File: ModelAPI_AttributeDocRef.cxx
// Created: 2 Apr 2014
// Author: Mikhail PONIKAROV
#include "Model_AttributeDocRef.h"
#include "Model_Application.h"
-#include
"Model_Events.h"
-#include <
Events_Loop
.h>
+#include
<ModelAPI_Feature.h>
+#include <
ModelAPI_Data
.h>
using namespace std;
using namespace std;
-void Model_AttributeDocRef::setValue(
boost
::shared_ptr<ModelAPI_Document> theDoc)
+void Model_AttributeDocRef::setValue(
std
::shared_ptr<ModelAPI_Document> theDoc)
{
{
+ myDoc = theDoc;
TCollection_ExtendedString aNewID(theDoc->id().c_str());
TCollection_ExtendedString aNewID(theDoc->id().c_str());
- if (myComment->Get() != aNewID) {
+ if (
!myIsInitialized ||
myComment->Get() != aNewID) {
myComment->Set(TCollection_ExtendedString(theDoc->id().c_str()));
myComment->Set(TCollection_ExtendedString(theDoc->id().c_str()));
-
- static Events_ID anEvent = Events_Loop::eventByName(EVENT_FEATURE_UPDATED);
- Model_FeatureUpdatedMessage aMsg(owner(), anEvent);
- Events_Loop::loop()->send(aMsg);
+ owner()->data()->sendAttributeUpdated(this);
}
}
}
}
-
boost
::shared_ptr<ModelAPI_Document> Model_AttributeDocRef::value()
+
std
::shared_ptr<ModelAPI_Document> Model_AttributeDocRef::value()
{
{
- if (myComment->Get().Length())
- return Model_Application::getApplication()->getDocument(
- TCollection_AsciiString(myComment->Get()).ToCString());
- // not initialized
- return boost::shared_ptr<ModelAPI_Document>();
+ return myDoc;
}
Model_AttributeDocRef::Model_AttributeDocRef(TDF_Label& theLabel)
{
}
Model_AttributeDocRef::Model_AttributeDocRef(TDF_Label& theLabel)
{
- // check the attribute could be already presented in this doc (after load document)
- if (!
theLabel.FindAttribute(TDataStd_Comment::GetID(), myComment)
) {
+ myIsInitialized = theLabel.FindAttribute(TDataStd_Comment::GetID(), myComment) == Standard_True;
+ if (!
myIsInitialized
) {
// create attribute: not initialized by value yet, just empty string
myComment = TDataStd_Comment::Set(theLabel, "");
// create attribute: not initialized by value yet, just empty string
myComment = TDataStd_Comment::Set(theLabel, "");
- } else { // document was already referenced: try to set it as loaded by demand
+ } else {
// document was already referenced: try to set it as loaded by demand
Handle(Model_Application) anApp = Model_Application::getApplication();
string anID(TCollection_AsciiString(myComment->Get()).ToCString());
if (!anApp->hasDocument(anID)) {
Handle(Model_Application) anApp = Model_Application::getApplication();
string anID(TCollection_AsciiString(myComment->Get()).ToCString());
if (!anApp->hasDocument(anID)) {