pshell_config/ncs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes&improvements

Browse Source
This commit is contained in:
boccioli_m
2015-10-20 17:03:46 +02:00
parent 544ff43cac
commit c2a1c77aac
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Kollimators.form
View File

@@ -171,9 +171,6 @@
<Properties>
<Property name="editable" type="boolean" value="false"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jTextDistActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JTextField" name="jTextRes">
<Properties>

14
plugins/Kollimators.java
View File

@@ -11,6 +11,8 @@ public class Kollimators extends javax.swing.JPanel {
/**
* Creates new form Kollimators
*
* @param params currently not used
*/
public Kollimators(String params) {
initComponents();
@@ -70,11 +72,6 @@ public class Kollimators extends javax.swing.JPanel {
jLabel7.setText("DIST:");
jTextDist.setEditable(false);
jTextDist.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jTextDistActionPerformed(evt);
}
});
jTextRes.setEditable(false);
@@ -158,13 +155,10 @@ public class Kollimators extends javax.swing.JPanel {
);
}// </editor-fold>//GEN-END:initComponents
private void jTextDistActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jTextDistActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_jTextDistActionPerformed
/**
* animate the panel (caget/caset). Called from TestingList
* animate the panel (caget/caset). Called from TestingList.
* This function MUST EXISTS in every custom panel callable from TestingList
* @param deviceName
*/
public void animate(String deviceName){

6
plugins/TestingList.java
View File

@@ -513,7 +513,7 @@ public class TestingList extends Panel {
if(sStartSequence.equals(StartSequence.TOGETHER.toString())){
SwingUtils.OptionResult ret = SwingUtils.showOption(this, "Modify Start mode",
"A custom panel is active. Tests can only run in sequence (Start mode: 'After previous'). "+
"\nDo you want to set all tests Start mode to 'After previous'?",
"\nDo you want to keep the custom panel open and set all tests Start mode to 'After previous'?",
OptionType.YesNo);
if(ret == SwingUtils.OptionResult.Yes){
changeSequenceToAfter = true ;
@@ -2103,7 +2103,7 @@ public class TestingList extends Panel {
//System.out.println(sParallelizeCommand);
//run test(s)
Object ret = eval(sParallelizeCommand);
System.out.println(ret);
//System.out.println(ret);
String sTestResult, sTestStatus;
if(ret == null){
SwingUtils.showMessage(TestingList.this, "executeParallelTestsGroup()", "The test script(s) did not return any feedback.");
@@ -2135,7 +2135,7 @@ public class TestingList extends Panel {
sDeviceName = String.valueOf(hTest.get(testArgNames.DEVICE.toString()));
sTestName = String.valueOf(hTest.get(testArgNames.TEST.toString()));
}
System.out.println("Result: " + sDeviceName + "|" + sTestPath + "|" + sTestResult + "|" + sTestStatus);
//System.out.println("Result: " + sDeviceName + "|" + sTestPath + "|" + sTestResult + "|" + sTestStatus);
iLastExecutedTestIndex = showResult(sDeviceName, sTestPath, sTestResult, sTestStatus);
}
} catch (StatementException intEx) {