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
Update behavior of calculation of Multi-Rotation constraint
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetIntValue.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
index aab5d1dd9ee0746f6771bba57fbbeba0ef067923..6778b372c0212a0480dd77a3bde924a7bd761df7 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetIntValue.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetIntValue.cpp
@@
-1,6
+1,6
@@
// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-// File: ModuleBase_Widget
s.h
+// File: ModuleBase_Widget
IntValue.cpp
// Created: 04 June 2014
// Author: Vitaly Smetannikov
// Created: 04 June 2014
// Author: Vitaly Smetannikov
@@
-91,12
+91,11
@@
ModuleBase_WidgetIntValue::~ModuleBase_WidgetIntValue()
{
}
{
}
-
void
ModuleBase_WidgetIntValue::reset()
+
bool
ModuleBase_WidgetIntValue::reset()
{
{
- if (isComputedDefault()) {
- return;
- //if (myFeature->compute(myAttributeID))
- // restoreValue();
+ bool aDone = false;
+ if (!isUseReset() || isComputedDefault()) {
+ aDone = false;
} else {
bool isOk;
int aDefValue = QString::fromStdString(getDefaultValue()).toInt(&isOk);
} else {
bool isOk;
int aDefValue = QString::fromStdString(getDefaultValue()).toInt(&isOk);
@@
-107,8
+106,10
@@
void ModuleBase_WidgetIntValue::reset()
mySpinBox->setValue(isOk ? aDefValue : 0);
mySpinBox->blockSignals(isBlocked);
storeValueCustom();
mySpinBox->setValue(isOk ? aDefValue : 0);
mySpinBox->blockSignals(isBlocked);
storeValueCustom();
+ aDone = true;
}
}
}
}
+ return aDone;
}
bool ModuleBase_WidgetIntValue::storeValueCustom() const
}
bool ModuleBase_WidgetIntValue::storeValueCustom() const
@@
-121,7
+122,7
@@
bool ModuleBase_WidgetIntValue::storeValueCustom() const
return true;
}
return true;
}
-bool ModuleBase_WidgetIntValue::restoreValue()
+bool ModuleBase_WidgetIntValue::restoreValue
Custom
()
{
DataPtr aData = myFeature->data();
AttributeIntegerPtr aRef = aData->integer(attributeID());
{
DataPtr aData = myFeature->data();
AttributeIntegerPtr aRef = aData->integer(attributeID());