From 613f1fd3645c48963f35f5bbc8ed37ef76e3cfec Mon Sep 17 00:00:00 2001 From: x03daop Date: Tue, 8 Mar 2016 11:52:24 +0100 Subject: [PATCH] Closedown --- plugins/HoloScan.form | 6 +++--- plugins/HoloScan.java | 6 +++--- plugins/ManipulatorScan.form | 4 ++-- plugins/ManipulatorScan.java | 4 ++-- plugins/PhotonEnergy.form | 4 ++-- plugins/PhotonEnergy.java | 4 ++-- script/PhotonEnergy.py | 2 +- script/local.py | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form index 18d44c1c..cd0936b6 100644 --- a/plugins/HoloScan.form +++ b/plugins/HoloScan.form @@ -366,7 +366,7 @@ - + @@ -422,10 +422,10 @@ - + - + diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java index 1f4dcede..1a1909d6 100644 --- a/plugins/HoloScan.java +++ b/plugins/HoloScan.java @@ -327,10 +327,10 @@ public class HoloScan extends Panel { checkImage.setName("Scienta.dataMatrix"); // NOI18N checkImageIntegration.setSelected(true); - checkImageIntegration.setText("Scienta Image Integration"); + checkImageIntegration.setText("Scienta Energy Distribution"); checkImageIntegration.setToolTipText(""); checkImageIntegration.setContentAreaFilled(false); - checkImageIntegration.setName("Integration"); // NOI18N + checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N checkSpectrum.setSelected(true); checkSpectrum.setText("Scienta Spectrum"); @@ -400,7 +400,7 @@ public class HoloScan extends Panel { .addComponent(checkCur2) .addComponent(checkCur3) .addComponent(checkAngleDistribution)) - .addGap(0, 14, Short.MAX_VALUE))) + .addGap(0, 6, Short.MAX_VALUE))) .addContainerGap()) ); panelSensorsLayout.setVerticalGroup( diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form index eafe93ad..64df2130 100644 --- a/plugins/ManipulatorScan.form +++ b/plugins/ManipulatorScan.form @@ -488,10 +488,10 @@ - + - + diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java index 70c59431..cf794fc7 100644 --- a/plugins/ManipulatorScan.java +++ b/plugins/ManipulatorScan.java @@ -388,10 +388,10 @@ public class ManipulatorScan extends Panel { checkCurrent.setName("MachineCurrent"); // NOI18N checkImageIntegration.setSelected(true); - checkImageIntegration.setText("Scienta Image Integration"); + checkImageIntegration.setText("Scienta Energy Distribution"); checkImageIntegration.setToolTipText(""); checkImageIntegration.setContentAreaFilled(false); - checkImageIntegration.setName("Integration"); // NOI18N + checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N checkAngleDistribution.setSelected(true); checkAngleDistribution.setText("Scienta Angle Distribution"); diff --git a/plugins/PhotonEnergy.form b/plugins/PhotonEnergy.form index 2fbe1fdb..85f9ab6f 100644 --- a/plugins/PhotonEnergy.form +++ b/plugins/PhotonEnergy.form @@ -455,10 +455,10 @@ - + - + diff --git a/plugins/PhotonEnergy.java b/plugins/PhotonEnergy.java index 454db9a4..5a80c47c 100644 --- a/plugins/PhotonEnergy.java +++ b/plugins/PhotonEnergy.java @@ -435,10 +435,10 @@ public class PhotonEnergy extends Panel { checkCur3.setName("AuxCurrent"); // NOI18N checkImageIntegration.setSelected(true); - checkImageIntegration.setText("Scienta Image Integration"); + checkImageIntegration.setText("Scienta Energy Distribution"); checkImageIntegration.setToolTipText(""); checkImageIntegration.setContentAreaFilled(false); - checkImageIntegration.setName("Integration"); // NOI18N + checkImageIntegration.setName("ImageEnergyDistribution"); // NOI18N checkSpectrum.setSelected(true); checkSpectrum.setText("Scienta Spectrum"); diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py index ce0deb2f..f7c33a65 100644 --- a/script/PhotonEnergy.py +++ b/script/PhotonEnergy.py @@ -7,7 +7,7 @@ LATENCY (double) """ adjust_sensors() -#set_preference(Preference.PLOT_TYPES,{'ImageIntegrator':1}) +#set_preference(Preference.PLOT_TYPES,{'ImageEnergyDistribution':1}) if len(VECTOR[0]) == 2: #FIXED diff --git a/script/local.py b/script/local.py index 2b57f1f5..f8b7a84d 100644 --- a/script/local.py +++ b/script/local.py @@ -42,7 +42,7 @@ def integrate_image(vertical = True): return integration -class ImageIntegrator(ReadableCalibratedArray): +class ImageEnergyDistribution(ReadableCalibratedArray): def getSize(self): (width,height) = Scienta.getImageSize().tolist() return width @@ -54,7 +54,7 @@ class ImageIntegrator(ReadableCalibratedArray): c=Scienta.readImageDescriptor().calibration return ArrayCalibration(c.scaleX, c.offsetX) -Integration = ImageIntegrator() +EnergyDistribution = ImageEnergyDistribution() class ImageAngleDistribution(ReadableCalibratedArray):