Commit b58cb791 authored by Stephane Dallongeville's avatar Stephane Dallongeville
Browse files

disabled volume constraint parameter

parent afaadd24
......@@ -338,7 +338,9 @@ public class ActiveContours extends EzPlug implements EzStoppable, Block
public final EzVarBoolean tracking_newObjects = new EzVarBoolean("Watch entering objects", false);
private final HashMap<TrackSegment, Double> volumes = new HashMap<TrackSegment, Double>();
// TODO: we disabled volume constraint feature as it doesn't work and sometime end to crazy contour (Stephane)
public final EzVarBoolean volume_constraint = new EzVarBoolean("Volume constraint (disabled)", false);
// public final EzVarBoolean volume_constraint = new EzVarBoolean("Volume constraint", false);
public final EzButton showTrackManager;
......@@ -503,7 +505,7 @@ public class ActiveContours extends EzPlug implements EzStoppable, Block
setTimeDisplay(true);
// TODO: disabled as the feature is broken (Stephane)
// TODO: we disabled volume constraint feature as it doesn't work and sometime end to crazy contour (Stephane)
volume_constraint.setValue(Boolean.FALSE);
volume_constraint.setEnabled(false);
}
......@@ -513,7 +515,7 @@ public class ActiveContours extends EzPlug implements EzStoppable, Block
{
super.loadParameters(file);
// TODO: disabled as the feature is broken (Stephane)
// TODO: we disabled volume constraint feature as it doesn't work and sometime end to crazy contour (Stephane)
volume_constraint.setValue(Boolean.FALSE);
}
......@@ -614,6 +616,10 @@ public class ActiveContours extends EzPlug implements EzStoppable, Block
for (int t = startT; t <= endT; t++)
{
int iteration;
// if sizeT changed during AC processing (i already did it to shorthen processing time :p)
if (t >= inputData.getSizeT())
break;
if (isHeadLess())
System.out.println("Processing frame #" + t);
......@@ -1422,10 +1428,10 @@ public class ActiveContours extends EzPlug implements EzStoppable, Block
contour.computeBalloonForces(balloon_weight.getValue());
}
// if (volume_constraint.getValue() && volumes.containsKey(segment))
// {
// contour.computeVolumeConstraint(volumes.get(segment));
// }
if (volume_constraint.getValue() && volumes.containsKey(segment))
{
contour.computeVolumeConstraint(volumes.get(segment));
}
contour.move(boundField, contour_timeStep.getValue());
}
......@@ -1485,11 +1491,10 @@ public class ActiveContours extends EzPlug implements EzStoppable, Block
contour.computeFeedbackForces(otherContour);
}
// TODO: we disabled volume constraint feature as it doesn't work and sometime end to crazy contour (Stephane)
// if (volume_constraint.getValue() && volumes.containsKey(segment))
// {
// contour.computeVolumeConstraint(volumes.get(segment));
// }
if (volume_constraint.getValue() && volumes.containsKey(segment))
{
contour.computeVolumeConstraint(volumes.get(segment));
}
}
else
{
......@@ -1858,7 +1863,9 @@ public class ActiveContours extends EzPlug implements EzStoppable, Block
inputMap.add("tracking", tracking.getVariable());
inputMap.add("division sensitivity", division_sensitivity.getVariable());
inputMap.add("axis constraint", axis_weight.getVariable());
// TODO: we disabled volume constraint feature as it doesn't work and sometime end to crazy contour (Stephane)
inputMap.add("volume constraint (disabled)", volume_constraint.getVariable());
// inputMap.add("volume constraint", volume_constraint.getVariable());
inputMap.add("watch entering objects", tracking_newObjects.getVariable());
}
......
Supports Markdown
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