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
Fixed crash on when creating circle by 3 points.
[modules/shaper.git]
/
src
/
Model
/
Model_AttributeBoolean.cpp
diff --git
a/src/Model/Model_AttributeBoolean.cpp
b/src/Model/Model_AttributeBoolean.cpp
index 5472dadf255f13feac8b09704726979751f0d191..666b8bb232cbfb5be1e174d33039a3de8f804bab 100644
(file)
--- a/
src/Model/Model_AttributeBoolean.cpp
+++ b/
src/Model/Model_AttributeBoolean.cpp
@@
-1,34
+1,37
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
// File: Model_AttributeBoolean.cpp
// Created: 2 june 2014
// Author: Vitaly Smetannikov
#include "Model_AttributeBoolean.h"
// File: Model_AttributeBoolean.cpp
// Created: 2 june 2014
// Author: Vitaly Smetannikov
#include "Model_AttributeBoolean.h"
-#include "Model_Events.h"
-#include <Events_Loop.h>
-
-using namespace std;
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_Data.h>
void Model_AttributeBoolean::setValue(bool theValue)
{
void Model_AttributeBoolean::setValue(bool theValue)
{
- Standard_Boolean aValue = theValue ? Standard_True : Standard_False;
- if (myBool->Get() != aValue) {
+ Standard_Integer aValue = theValue ? 1 : 0;
+ if (!myIsInitialized || myBool->Get() != aValue) {
+ if (myBool.IsNull())
+ myBool = TDataStd_Integer::Set(myLab, 0);
myBool->Set(aValue);
myBool->Set(aValue);
- static Events_ID anEvent = Events_Loop::eventByName(EVENT_FEATURE_UPDATED);
- Model_FeatureUpdatedMessage aMsg(owner(), anEvent);
- Events_Loop::loop()->send(aMsg);
+ owner()->data()->sendAttributeUpdated(this);
}
}
bool Model_AttributeBoolean::value()
{
}
}
bool Model_AttributeBoolean::value()
{
- return my
Bool->Get() == Standard_True
;
+ return my
IsInitialized && myBool->Get() == 1
;
}
Model_AttributeBoolean::Model_AttributeBoolean(TDF_Label& theLabel)
}
Model_AttributeBoolean::Model_AttributeBoolean(TDF_Label& theLabel)
+{
+ myLab = theLabel;
+ reinit();
+}
+
+void Model_AttributeBoolean::reinit()
{
// check the attribute could be already presented in this doc (after load document)
{
// check the attribute could be already presented in this doc (after load document)
- if (!theLabel.FindAttribute(TDataStd_Integer::GetID(), myBool)) {
- // create attribute: not initialized by value yet, just zero
- myBool = TDataStd_Integer::Set(theLabel, 0);
- }
+ myIsInitialized = myLab.FindAttribute(TDataStd_Integer::GetID(), myBool) == Standard_True;
}
}