Commit f3c1c3d2 authored by Tomas Janak's avatar Tomas Janak

[kriging] When "fix bones" option is turned on, "use bones as intermediate...

[kriging] When "fix bones" option is turned on, "use bones as intermediate targets" must be turned on as well. GUI will now ensure this
parent 2cad001c
...@@ -10,6 +10,7 @@ New or modified features: ...@@ -10,6 +10,7 @@ New or modified features:
Bug-fixes: Bug-fixes:
- [child scaling] Fixed a bug that caused the first point in the sequence (left side of vertebra near shoulders) to have target x and y coordinates incorrectly equal to 0 - [child scaling] Fixed a bug that caused the first point in the sequence (left side of vertebra near shoulders) to have target x and y coordinates incorrectly equal to 0
- [kriging] Fixed source control points not disappearing from display after being removed (introduced in 1.0.2) - [kriging] Fixed source control points not disappearing from display after being removed (introduced in 1.0.2)
- [kriging] When "fix bones" option is turned on when doing kriging with intermediate targets, "use bones as intermediate targets" must be turned on as well. GUI will now ensure this
v1.0.2 - 12/2017 v1.0.2 - 12/2017
---------------- ----------------
......
...@@ -149,6 +149,16 @@ ModuleToolWindow ...@@ -149,6 +149,16 @@ ModuleToolWindow
onCheckedChanged : onCheckedChanged :
{ {
krigingIntrfc.fixBones = checked krigingIntrfc.fixBones = checked
// if bones are fixed, they must be used as intermediate targets -> make sure it is and disable turning it off
if (checked)
{
applyKrigingBonesTarget.checked = true
applyKrigingBonesTarget.enabled = false
}
else
{
applyKrigingBonesTarget.enabled = true
}
} }
} }
CheckBox CheckBox
......
...@@ -328,6 +328,8 @@ namespace piper ...@@ -328,6 +328,8 @@ namespace piper
if (fix != m_fixBones) if (fix != m_fixBones)
{ {
m_fixBones = fix; m_fixBones = fix;
if (fix) // if bones are to be fixed, they must be used as intermediate targets, otherwise they would end up not being fixed
m_intermUseBones = true;
m_bonesTransValid = false; m_bonesTransValid = false;
m_decimationValid = false; m_decimationValid = false;
m_nuggetsValid = false; m_nuggetsValid = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment