v.0.3.7

ekatrukha · Jan 12, 2024 · 5ee492e · 5ee492e
1 parent 6403ed9
commit 5ee492e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/bigtrace/BigTrace.java b/src/main/java/bigtrace/BigTrace.java
@@ -632,12 +632,10 @@ public void actionToggleRender()
 		if(btdata.nRenderMethod == BigTraceData.DATA_RENDER_MAX_INT)
 		{
 			btpanel.renderMethodPanel.cbRenderMethod.setSelectedIndex(BigTraceData.DATA_RENDER_VOLUMETRIC);
-			viewer.showMessage("volumetric");
 		}
 		else
 		{
-			btpanel.renderMethodPanel.cbRenderMethod.setSelectedIndex(BigTraceData.DATA_RENDER_MAX_INT);
-			viewer.showMessage("maximum intensity");
+			btpanel.renderMethodPanel.cbRenderMethod.setSelectedIndex(BigTraceData.DATA_RENDER_MAX_INT);			
 		}
 	}
 	public void installActions(final Actions actions)
@@ -1690,8 +1688,8 @@ public <X extends RealType< X >>boolean findPointLocationMaxIntensityNEW(final I
 				}
 			}
 		target.setPosition(foundMaxPosition);
-		System.out.println("al2 val:"+Double.toString(foundMaxValue));
-		System.out.println("al2:"+Integer.toString(foundMaxPosition.getIntPosition(0))+" "+Integer.toString(foundMaxPosition.getIntPosition(1))+" "+Integer.toString(foundMaxPosition.getIntPosition(2)));
+		//System.out.println("al2 val:"+Double.toString(foundMaxValue));
+		//System.out.println("al2:"+Integer.toString(foundMaxPosition.getIntPosition(0))+" "+Integer.toString(foundMaxPosition.getIntPosition(1))+" "+Integer.toString(foundMaxPosition.getIntPosition(2)));
 
 		return true;	
 	}

diff --git a/src/main/java/bigtrace/BigTraceControlPanel.java b/src/main/java/bigtrace/BigTraceControlPanel.java
@@ -782,6 +782,14 @@ public void setRenderMethod(int nRenderType)
 		}	
 		if(bt.bvv_trace!=null)
 			bt.bvv_trace.setRenderType(nRenderType);
+		if(nRenderType == BigTraceData.DATA_RENDER_VOLUMETRIC)
+		{
+			bt.viewer.showMessage("volumetric");
+		}
+		if(nRenderType == BigTraceData.DATA_RENDER_MAX_INT)
+		{
+			bt.viewer.showMessage("maximum intensity");
+		}
 
 
 	}

diff --git a/src/main/java/bigtrace/gui/RenderMethodPanel.java b/src/main/java/bigtrace/gui/RenderMethodPanel.java
@@ -24,6 +24,7 @@ public class RenderMethodPanel < T extends RealType< T > > extends JPanel implem
 	private static final long serialVersionUID = 7367842640615289454L;
 	public JComboBox<String> cbRenderMethod;
 	public JComboBox<String> cbSurfaceRenderList; 
+	String[] sSurfaceRenderType = {"plain", "shaded", "shiny", "silhouette"};
 	BigTrace<T> bt;
 
 	public RenderMethodPanel(BigTrace<T> bt_)
@@ -50,7 +51,7 @@ public RenderMethodPanel(BigTrace<T> bt_)
 		cd.gridx++;
 		this.add(cbRenderMethod,cd);
 
-		String[] sSurfaceRenderType = {"plain", "shaded", "shiny", "silhouette"};
+
 		cbSurfaceRenderList = new JComboBox<String>(sSurfaceRenderType);
 		cbSurfaceRenderList.setSelectedIndex(BigTraceData.surfaceRender);
 		cbSurfaceRenderList.addActionListener(this);
@@ -73,6 +74,7 @@ public void actionPerformed(ActionEvent e) {
 //	
 				BigTraceData.surfaceRender = cbSurfaceRenderList.getSelectedIndex();
 				Prefs.set("BigTrace.surfaceRender", BigTraceData.surfaceRender);
+				bt.viewer.showMessage("ROI surface: "+ sSurfaceRenderType[BigTraceData.surfaceRender]);
 				//long start1 = System.currentTimeMillis();
 				bt.repaintBVV();
 

diff --git a/src/main/java/bigtrace/volume/VolumeMisc.java b/src/main/java/bigtrace/volume/VolumeMisc.java
@@ -210,8 +210,8 @@ public static IntervalView< UnsignedByteType > localMax(final IntervalView< Unsi
 					}
 				}
 			}
-			System.out.println("max det:"+Integer.toString(nMaxDet));
-			System.out.println("max N det:"+Integer.toString(nMaxNDet));
+			//System.out.println("max det:"+Integer.toString(nMaxDet));
+			//System.out.println("max N det:"+Integer.toString(nMaxNDet));
 			return output;
 		}