From 542c97720f443ed28efb983ee6f629ea9d7ecd12 Mon Sep 17 00:00:00 2001 From: sfop Date: Thu, 30 Mar 2017 11:52:53 +0200 Subject: [PATCH] Closedown --- devices/CurrentCamera.properties | 18 +++++++++--------- plugins/ScreenPanel.java | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 2bcb361..cc9bacb 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,13 +1,13 @@ -#Thu Mar 30 09:34:18 CEST 2017 +#Thu Mar 30 11:38:02 CEST 2017 colormap=Flame colormapAutomatic=true -colormapMax=3000.0 -colormapMin=20.0 +colormapMax=56778.0 +colormapMin=0.0 flipHorizontally=false flipVertically=false grayscale=false -imageHeight=2160 -imageWidth=2560 +imageHeight=1024 +imageWidth=1280 invert=false regionStartX=1 regionStartY=1 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-630.5060320164276 -spatialCalOffsetY=-612.5104241897614 -spatialCalScaleX=-26.761820720381525 -spatialCalScaleY=-26.595744663521685 +spatialCalOffsetX=-1223.477868576451 +spatialCalOffsetY=-1024.4742906541314 +spatialCalScaleX=-8.699279809007425 +spatialCalScaleY=-8.747949625839508 spatialCalUnits=mm transpose=false diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java index 7583d33..719811d 100644 --- a/plugins/ScreenPanel.java +++ b/plugins/ScreenPanel.java @@ -224,6 +224,15 @@ public class ScreenPanel extends Panel { } }); + JMenuItem menuShowIdentifiers = new JMenuItem("Show Identifiers..."); + menuShowIdentifiers.addActionListener((ActionEvent e) -> { + try { + showIdentifiers(); + } catch (Exception ex) { + showException(ex); + } + }); + JMenuItem menuSaveStack = new JMenuItem("Save Stack"); menuSaveStack.addActionListener((ActionEvent e) -> { try { @@ -280,6 +289,7 @@ public class ScreenPanel extends Panel { } }); + renderer.getPopupMenu().add(menuShowIdentifiers); renderer.getPopupMenu().add(menuCalibrate); renderer.getPopupMenu().add(menuSaveStack); renderer.getPopupMenu().addSeparator(); @@ -290,6 +300,7 @@ public class ScreenPanel extends Panel { public void popupMenuWillBecomeVisible(PopupMenuEvent e) { menuResetROI.setEnabled(camera instanceof Camtool); menuSetROI.setEnabled(camera instanceof Camtool); + menuShowIdentifiers.setVisible(camera instanceof Camtool); menuCalibrate.setVisible(camera instanceof Camtool); menuCalibrate.setEnabled(calibrationOverlays==null); } @@ -1669,6 +1680,15 @@ public class ScreenPanel extends Panel { } } + void showIdentifiers(){ + if (camera instanceof Camtool){ + List ids = ((Camtool)camera).getValue().getIdentifiers(); + Collections.sort(ids); + String msg = String.join("\n", ids); + SwingUtils.showMessage(getTopLevel(), "Camtool Identifiers", msg); + } + } + //////// @SuppressWarnings("unchecked") // //GEN-BEGIN:initComponents