Fix rotation of MPR axes

Author: nroduit

weasis-base/weasis-base-viewer2d/src/main/java/org/weasis/base/viewer2d/EventManager.java

@@ -613,7 +613,7 @@ public JMenu getOrientationMenu(String prop) {
 
   // public JMenu getSortStackMenu(String prop) {
   // JMenu menu = null;
-  // if (BundleTools.SYSTEM_PREFERENCES.getBooleanProperty(prop, true)) {
+  // if (GuiUtils.getUICore().getSystemPreferences().getBooleanProperty(prop, true)) {
   // menu =
   // sortStackAction.createUnregisteredRadioMenu(Messages.getString("View2dContainer.sort_stack"));
   //

weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/View3DContainer.java

@@ -259,7 +259,7 @@ private void initTools() {
                 eventManager, eventManager.getMouseActions().getActiveButtons(), preferences, 10));
       }
       //      if (InsertableUtil.getBooleanProperty(
-      //          BundleTools.SYSTEM_PREFERENCES,
+      //          GuiUtils.getUICore().getSystemPreferences(),
       //          bundleName,
       //          componentName,
       //          InsertableUtil.getCName(MeasureToolBar.class),

weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/EventManager.java

@@ -278,7 +278,7 @@ public void stateChanged(BoundedRangeModel model) {
         if (view2d instanceof MprView mprView) {
           MprContainer mprContainer = (MprContainer) selectedView2dContainer;
           MprController controller = mprContainer.getMprController();
-          MprAxis axis = controller.getMprAxis(mprView.getSliceOrientation());
+          MprAxis axis = controller.getMprAxis(mprView.getPlane());
           int index = model.getValue() - 1;
           axis.setSliceIndex(index);
           boolean oldAdjusting = controller.isAdjusting();
@@ -1077,7 +1077,7 @@ public synchronized boolean updateComponentsListener(ViewCanvas<DicomImageElemen
       MprController controller = mprContainer.getMprController();
       Volume<?> volume = controller.getVolume();
       maxSlice = volume.getSliceSize();
-      MprAxis axis = controller.getMprAxis(mprView.getSliceOrientation());
+      MprAxis axis = controller.getMprAxis(mprView.getPlane());
       currentSlice = axis.getSliceIndex();
     } else {
       maxSlice =

weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/View2d.java

@@ -116,7 +116,7 @@
 import org.weasis.dicom.explorer.pr.PrGraphicUtil;
 import org.weasis.dicom.viewer2d.KOComponentFactory.KOViewButton;
 import org.weasis.dicom.viewer2d.KOComponentFactory.KOViewButton.eState;
-import org.weasis.dicom.viewer2d.mpr.MprView.SliceOrientation;
+import org.weasis.dicom.viewer2d.mpr.MprView.Plane;
 import org.weasis.opencv.data.PlanarImage;
 import org.weasis.opencv.op.lut.WlPresentation;
 
@@ -877,12 +877,12 @@ public void computeCrosshair(Vector3d p3, PanPoint panPoint) {
       }
       GeometryOfSlice sliceGeometry = image.getSliceGeometry();
       if (sliceGeometry != null) {
-        SliceOrientation sliceOrientation = this.getSliceOrientation();
-        if (sliceOrientation != null && p3 != null) {
+        Plane plane = this.getPlane();
+        if (plane != null && p3 != null) {
           Point2D p = sliceGeometry.getImagePosition(p3);
           if (p != null) {
             Vector3d dim = sliceGeometry.getDimensions();
-            boolean axial = SliceOrientation.AXIAL.equals(sliceOrientation);
+            boolean axial = Plane.AXIAL.equals(plane);
             Point2D centerPt = new Point2D.Double(p.getX(), p.getY());
             int centerGap =
                 eventManager.getOptions().getIntProperty(View2d.P_CROSSHAIR_CENTER_GAP, 40);
@@ -897,7 +897,7 @@ public void computeCrosshair(Vector3d p3, PanPoint panPoint) {
               pts.add(new Point2D.Double(p.getX(), -50.0));
               pts.add(new Point2D.Double(p.getX(), dim.x + 50));
 
-              boolean sagittal = SliceOrientation.SAGITTAL.equals(sliceOrientation);
+              boolean sagittal = Plane.SAGITTAL.equals(plane);
               Color color1 = axial ? Biped.A.getColor() : Biped.F.getColor();
               addCrosshairLine(layer, pts, color1, centerPt, centerGap);
 
@@ -966,25 +966,25 @@ protected void addRectangle(GraphicLayer layer, Rectangle2D rect, Color color) {
     }
   }
 
-  public SliceOrientation getSliceOrientation() {
-    SliceOrientation sliceOrientation = null;
+  public Plane getPlane() {
+    Plane plane = null;
     MediaSeries<DicomImageElement> s = getSeries();
     if (s != null) {
       Object img = s.getMedia(MediaSeries.MEDIA_POSITION.MIDDLE, null, null);
       if (img instanceof DicomImageElement imageElement) {
         Plan orientation = ImageOrientation.getPlan(imageElement);
         if (orientation != null) {
           if (Plan.AXIAL.equals(orientation)) {
-            sliceOrientation = SliceOrientation.AXIAL;
+            plane = Plane.AXIAL;
           } else if (Plan.CORONAL.equals(orientation)) {
-            sliceOrientation = SliceOrientation.CORONAL;
+            plane = Plane.CORONAL;
           } else if (Plan.SAGITTAL.equals(orientation)) {
-            sliceOrientation = SliceOrientation.SAGITTAL;
+            plane = Plane.SAGITTAL;
           }
         }
       }
     }
-    return sliceOrientation;
+    return plane;
   }
 
   @Override

weasis-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/mpr/AbstractStack.java

@@ -14,16 +14,16 @@
 import org.weasis.core.api.media.data.MediaSeries.MEDIA_POSITION;
 import org.weasis.dicom.codec.DicomImageElement;
 import org.weasis.dicom.codec.TagD;
-import org.weasis.dicom.viewer2d.mpr.MprView.SliceOrientation;
+import org.weasis.dicom.viewer2d.mpr.MprView.Plane;
 
 public class AbstractStack {
   protected final int width;
   protected final int height;
-  protected final SliceOrientation stackOrientation;
+  protected final Plane plane;
   protected final MediaSeries<DicomImageElement> series;
 
-  public AbstractStack(SliceOrientation sliceOrientation, MediaSeries<DicomImageElement> series) {
-    this.stackOrientation = sliceOrientation;
+  public AbstractStack(Plane plane, MediaSeries<DicomImageElement> series) {
+    this.plane = plane;
     this.series = series;
 
     final DicomImageElement img = series.getMedia(MEDIA_POSITION.MIDDLE, null, null);
@@ -44,8 +44,8 @@ public int getHeight() {
     return height;
   }
 
-  public SliceOrientation getStackOrientation() {
-    return stackOrientation;
+  public Plane getPlane() {
+    return plane;
   }
 
   public MediaSeries<DicomImageElement> getSeries() {