Commit 351f6bae authored by saubatn's avatar saubatn

FIXED Bug 126. Additionnally fixed arbitrary slice frame color back to yellow.

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@751 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 922de2db
......@@ -275,7 +275,7 @@ void Slice::initActors() {
switch (sliceOrientation) {
default:
case ARBITRARY_ORIENTATION:
pickPlaneActor->GetProperty()->SetColor(1.0, 1.0, 1.0);
pickPlaneActor->GetProperty()->SetColor(1.0, 1.0, 0.0);
pickPlaneActor->GetProperty()->SetEdgeColor(1.0, 1.0, 1.0);
break;
case AXIAL_ORIENTATION:
......@@ -646,6 +646,15 @@ void Slice::updatePixelActorPosition(double x, double y, double z) {
yBorderMin = - y;
yBorderMax = - y + yMin - yMax;
break;
case ARBITRARY_ORIENTATION:
xBorderMin += xMax;
xBorderMax += xMax;
cout << "x = " << x << " ";
cout << "xMin = " << xMin << " ";
cout << "xMax = " << xMax << endl;
cout << "xBorderMin = " << xBorderMin << " ";
cout << "xBorderMax = " << xBorderMax << endl;
default:
yBorderMin = - y;
yBorderMax = - y - yMin + yMax;
......@@ -665,6 +674,9 @@ void Slice::updatePixelActorPosition(double x, double y, double z) {
case SAGITTAL_ORIENTATION:
orientation = InteractiveViewer::getSagittalViewer()->getRendererWidget()->getCameraOrientation();
break;
case ARBITRARY_ORIENTATION:
orientation = InteractiveViewer::getArbitraryViewer()->getRendererWidget()->getCameraOrientation();
break;
default:
break;
}
......
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