Closedown

This commit is contained in:
x03daop
2016-03-08 11:52:24 +01:00
parent 9b82f8604f
commit 613f1fd364
8 changed files with 17 additions and 17 deletions

View File

@@ -366,7 +366,7 @@
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="14" max="32767" attributes="0"/>
<EmptySpace min="0" pref="6" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -422,10 +422,10 @@
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Image Integration"/>
<Property name="text" type="java.lang.String" value="Scienta Energy Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="Integration" noResource="true"/>
<Property name="name" type="java.lang.String" value="ImageEnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">

View File

@@ -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(

View File

@@ -488,10 +488,10 @@
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Image Integration"/>
<Property name="text" type="java.lang.String" value="Scienta Energy Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="Integration" noResource="true"/>
<Property name="name" type="java.lang.String" value="ImageEnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">

View File

@@ -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");

View File

@@ -455,10 +455,10 @@
<Component class="javax.swing.JCheckBox" name="checkImageIntegration">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Image Integration"/>
<Property name="text" type="java.lang.String" value="Scienta Energy Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="Integration" noResource="true"/>
<Property name="name" type="java.lang.String" value="ImageEnergyDistribution" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkSpectrum">

View File

@@ -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");

View File

@@ -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

View File

@@ -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):