Bug fixes and more user savety

Author: RainerHeintzmann

View5D.jar

@@ -9,7 +9,7 @@ javac -target 1.8 -source 1.8 -deprecation -classpath ".:/usr/local/ImageJ/ij.ja
 # javac -deprecation -classpath "." View5D_.java
 jar -cf View5D_.jar view5d/*.class plugins.config
 # cp /*.class /usr/local/ImageJ/plugins/View5D/
-cp View5D_.jar /mnt/c/Users/pi96doc/Desktop/Fiji.app/plugins/View5D_-2.3.5.jar
+cp View5D_.jar /mnt/c/Users/pi96doc/Desktop/Fiji.app/plugins/View5D_-2.3.6.jar
 
 # cp View5D_.jar /usr/local/ImageJ/plugins/View5D/
 # cp View5D_.jar /windows/C/DriveF/JavaProgs/ImageJ/plugins/View5D/

javacImageJ

@@ -15,8 +15,8 @@ cp View5D_.jar "/mnt/c/NoBackup/DeconvCompileTest/DIPlib_3_2019/share/DIPimage/p
 cp View5D_.jar "../View5D.jar"
 cp View5D_.jar "/mnt/c/Users/pi96doc/.julia/artifacts/View5D.jar"
 cd ..
-cp View5D.jar "View5D_v2.3.5.jar"
-tar -czf "View5D_v2.3.5-jar.tar.gz" "View5D_v2.3.5.jar"
+cp View5D.jar "View5D_v2.3.6.jar"
+tar -czf "View5D_v2.3.6-jar.tar.gz" "View5D_v2.3.6.jar"
 # cp /*.class /usr/local/ImageJ/plugins/View5D/
 #cp View5D_.jar /usr/local/ImageJ/plugins/View5D/
 # cp View5D_.jar /windows/C/DriveF/JavaProgs/ImageJ/plugins/View5D/

javacPython

@@ -960,20 +960,18 @@ else  if (e.isShiftDown()) // update gamma
             UpdateAll();
         }
         else {
+            boolean lock_aspect = e.isControlDown(); // orthogonal Zoom
+            boolean was_locked = otherCanvas2.AspectLocked.getState();
+
+            if (lock_aspect)
+                otherCanvas2.AspectLocked.setState(true);
+
             if (e.getWheelRotation() < 0) {
                 ChangeZoom(1.125);
             } else {
                 ChangeZoom(1.0 / 1.125);
             }
-            if  (e.isControlDown())// orthogonal Zoom
-                if (e.getWheelRotation() < 0)
-                {
-                    ChangeOrthoZoom(1.125);
-                }
-                else
-                {
-                    ChangeOrthoZoom(1.0 / 1.125);
-                }
+            otherCanvas2.AspectLocked.setState(was_locked);
         }
 }
 
@@ -1363,7 +1361,17 @@ public void keyPressed(KeyEvent e) {
     {
         myChar = '°';
     }
-    
+
+    if (KeyEvent.VK_F2== e.getKeyCode())
+    {
+        myChar = '^';
+    }
+
+    if (KeyEvent.VK_F1== e.getKeyCode())
+    {
+        myChar = '?';
+    }
+
     int elem=my3ddata.ActiveElement,t=my3ddata.ActiveTime;
 
     ImageCanvas PreferredCanvas=null;
@@ -1594,6 +1602,13 @@ public void ExportValues() {
      // return myplot;
    }
 
+public boolean checkProceed(String txt) { // calls a user dialog to see if the user really wants to proceed
+        AGenericDialog question= new AGenericDialog("Warning!");
+        question.addMessage(txt + " modifies the data.\nDo you really want to proceed?");
+        question.showDialog();
+        return ! question.wasCanceled();
+}
+
 
 public void ProcessKey(char myChar) {
     switch (myChar) {
@@ -1604,8 +1619,9 @@ public void ProcessKey(char myChar) {
 	    centerCursor();
 	    return;
     case 'D':
-        my3ddata.DeleteActElement();
-	UpdateAllPanels();
+        if (checkProceed("Delete Element"))
+            my3ddata.DeleteActElement();
+	    UpdateAllPanels();
 	return;
     case 'f':  // upcast datatype to float
         my3ddata.CloneFloat();
@@ -1616,23 +1632,27 @@ public void ProcessKey(char myChar) {
 	UpdateAllPanels();
         return;
     case '+':
-        my3ddata.AddMarkedElement(); // Adds the gate element to the active element
+        if (checkProceed("AddMarkedElement"))
+            my3ddata.AddMarkedElement(); // Adds the gate element to the active element
 	UpdateAllPanels();
 	return;
     case '_':
         my3ddata.AdjustOffsetToROIMean(); // Subtracts the gate element from the active element
 	UpdateAllPanels();
 	return;
     case '-':
-        my3ddata.SubMarkedElement(); // Subtracts the gate element from the active element
+        if (checkProceed("SubtractMarkedElement"))
+            my3ddata.SubMarkedElement(); // Subtracts the gate element from the active element
 	UpdateAllPanels();
 	return;
     case '*':
-        my3ddata.MulMarkedElement(); // Multiplies the gate element with the active element
+        if (checkProceed("MultiplyMarkedElement"))
+            my3ddata.MulMarkedElement(); // Multiplies the gate element with the active element
 	UpdateAllPanels();
 	return;
     case '/':
-        my3ddata.DivMarkedElement(); // Multiplies the gate element with the active element
+        if (checkProceed("DivideMarkedElement"))
+            my3ddata.DivMarkedElement(); // Multiplies the gate element with the active element
 	UpdateAllPanels();
 	return;
     case 'e':  // advance one element cyclicly
@@ -1837,31 +1857,31 @@ public void ProcessKey(char myChar) {
     	AspectLocked.setState(! AspectLocked.getState());
     	return;
     case '#':  
-	my3ddata.SubtractTrackedSpot();
+	    my3ddata.SubtractTrackedSpot();
         my3ddata.InvalidateProjs(-1);  // all projections are invalid
         my3ddata.InvalidateSlices();
-	UpdateAll();
+    	UpdateAll();
 	return;
     case 's': 
         AlternateViewer xx=new AlternateViewer(applet);  // clone the data and open a new viewer
         My3DData nd=new My3DData(my3ddata);
         xx.Assign3DData(applet, null, nd);
-	UpdateAll();
+	    UpdateAll();
         return;
     case 'P':
-	my3ddata.ToggleProj(DimNr,false);
-	label.CoordsChanged();  
-	UpdateAll();
+        my3ddata.ToggleProj(DimNr,false);
+        label.CoordsChanged();
+        UpdateAll();
         return ;
     case 'p':
-	my3ddata.ToggleProj(DimNr,true);
-	UpdateAll();
+	    my3ddata.ToggleProj(DimNr,true);
+	    UpdateAll();
         return ;
     case '^':
-	my3ddata.ActElement().AdvanceReadMode();
-	my3ddata.InvalidateSlices();
-	my3ddata.InvalidateProjs(-1);
-	UpdateAll();
+	    my3ddata.ActElement().AdvanceReadMode();
+	    my3ddata.InvalidateSlices();
+	    my3ddata.InvalidateProjs(-1);
+	    UpdateAll();
         return ;
     case 'S':
         if (! myPanel.ROIstarted && ! LineROIStarted)   // otherwise the user has to finish the ROI first
@@ -1988,9 +2008,9 @@ public void ProcessKey(char myChar) {
 	//return ;
     case '!':   // transfers the colormap threshold to data threshold
 	// my3ddata.addLThresh(0.02);
-	my3ddata.CThreshToValThresh(-1,0.0,1.0);
-	UpdateAll();
-	return ;
+	    my3ddata.CThreshToValThresh(-1,0.0,1.0);
+	    UpdateAll();
+	    return ;
     case '1':
         if (my3ddata.GateActive && (my3ddata.GateElem == my3ddata.GateElem))
             {

src/View5D_.jar

@@ -225,11 +225,11 @@ public ImgPanel(Container app,My3DData mydata) {
         AddPopupMenu(SubMenu,doSubMenu);
 
         MenuItem tmp;
-	tmp = new MenuItem("Help [?]");
+	tmp = new MenuItem("Help [? or F1]");
 	tmp.addActionListener(new MyMenuProcessor(c1,'?')); SubMenu.add(tmp);
 	tmp = new MenuItem("Exit [$]");
 	tmp.addActionListener(new MyMenuProcessor(c1,'$')); SubMenu.add(tmp);
-	tmp = new MenuItem("Readmode (Complex only) [^]");
+	tmp = new MenuItem("Readmode (Complex only) [^ or F2]");
 	tmp.addActionListener(new MyMenuProcessor(c1,'^')); SubMenu.add(tmp);
 
         SubMenu = new Menu("Import/Export",false);  // can eventually be dragged to the side