From 46a3a67507c8e756f31e53276613f8c04013bc0a Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Tue, 9 Jun 2015 12:01:43 +0200 Subject: [PATCH] Closedown --- plugins/TestingList.java | 12 ++++++++---- script/power-supply.py | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/plugins/TestingList.java b/plugins/TestingList.java index cbe406d..93e05c2 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -148,10 +148,10 @@ public class TestingList extends Panel { jTable1.setValueAt(status, rowD, COL_SUCCESS); jTable1.getCellEditor(rowD, COL_SUCCESS); } - else{ //no test found in table. appen new one + /*else{ //no test found in table. appen new one DefaultTableModel model = (DefaultTableModel) jTable1.getModel(); model.addRow(new Object[]{true, getNow(), deviceName, testName, res, status, icon }); - } + }*/ } @@ -243,12 +243,16 @@ public class TestingList extends Panel { boolean var1 = true; int var2 = 2;// (Integer)spinner.getValue(); int result; - + String deviceName = "RS"; + String testName = "Range Shifter Tests"; HashMap args = new HashMap(); args.put("relative", var1); args.put("steps", var2); + args.put("deviceName",deviceName); + args.put("testName",testName); run("power-supply", args); - showResult("RS", "Range Shifter Tests", "Test running", "Running"); + //this is just to try, must be modified + showResult(deviceName, testName, "Test running", "Running"); //evalAsync("run('args', locals = {'relative':" + (var1 ? "True" :"False") + ", 'steps':" + var2 + "})"); } catch (Exception ex) { diff --git a/script/power-supply.py b/script/power-supply.py index 7fbecbf..8011677 100644 --- a/script/power-supply.py +++ b/script/power-supply.py @@ -2,10 +2,10 @@ #ManualScan(writables, readables, start = None, end = None, steps = None, relative = False) #testname -testName = "Calibrate" +#testName = "Calibrate" #device name -deviceName = "RS" +#deviceName = "RS" #by default, failed ret = 'test failed'