diff --git a/plugins/TestingList.java b/plugins/TestingList.java index 34bbbcc..a076843 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -694,6 +694,8 @@ public class TestingList extends Panel { jTable1.getColumnModel().getColumn(COL.CHECK.ordinal()).setMaxWidth(27); jTable1.getColumnModel().getColumn(COL.DEVICENAME.ordinal()).setPreferredWidth(30); jTable1.getColumnModel().getColumn(COL.STATUS.ordinal()).setPreferredWidth(30); + jTable1.getColumnModel().getColumn(COL.DEVICEDESCR.ordinal()).setMinWidth(0); + jTable1.getColumnModel().getColumn(COL.DEVICEDESCR.ordinal()).setMaxWidth(0); jTable1.getColumnModel().getColumn(COL.TESTPATH.ordinal()).setMinWidth(0); jTable1.getColumnModel().getColumn(COL.TESTPATH.ordinal()).setMaxWidth(0); jTable1.getColumnModel().getColumn(COL.TESTDESCR.ordinal()).setMinWidth(0); diff --git a/plugins/TestingListDetails.form b/plugins/TestingListDetails.form index 9b31699..e551be1 100644 --- a/plugins/TestingListDetails.form +++ b/plugins/TestingListDetails.form @@ -124,6 +124,7 @@ + @@ -134,6 +135,7 @@ + @@ -144,6 +146,7 @@ + @@ -154,6 +157,7 @@ + @@ -246,6 +250,7 @@ + @@ -267,6 +272,7 @@ + diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java index 9cfa2c8..a3a2243 100644 --- a/plugins/TestingListDetails.java +++ b/plugins/TestingListDetails.java @@ -60,18 +60,22 @@ public class TestingListDetails extends javax.swing.JPanel { jLabel1.setText("Device name"); + txtDeviceName.setEditable(false); txtDeviceName.setText("jTextField1"); jLabel2.setText("Device Description"); + txtDeviceDescription.setEditable(false); txtDeviceDescription.setText("jTextField2"); jLabel4.setText("Test Case/Suite"); + txtTestSuite.setEditable(false); txtTestSuite.setText("jTextField2"); jLabel5.setText("Test Name"); + txtTestName.setEditable(false); txtTestName.setText("jTextField2"); jLabel6.setText("Last Test Result"); @@ -122,6 +126,7 @@ public class TestingListDetails extends javax.swing.JPanel { this.cmOk.setVisible(false); this.cmDefault.setVisible(false); + txtTestResult.setEditable(false); txtTestResult.setColumns(20); txtTestResult.setLineWrap(true); txtTestResult.setRows(5); @@ -129,6 +134,7 @@ public class TestingListDetails extends javax.swing.JPanel { jLabel8.setText("Test Description"); + txtTestDescription.setEditable(false); txtTestDescription.setColumns(20); txtTestDescription.setLineWrap(true); txtTestDescription.setRows(5); diff --git a/script/tests/tests/Collimator Tests/Motor Test 1/.config b/script/tests/tests/Collimator Tests/Motor Test 1/.config index 57363c0..e2ba568 100644 --- a/script/tests/tests/Collimator Tests/Motor Test 1/.config +++ b/script/tests/tests/Collimator Tests/Motor Test 1/.config @@ -1,7 +1,7 @@ name=Motor Test 1 -description=moves to CCW switch; then for M times moves N times to CW switch then CCW switch; between each M pauses for delay; log at CCW and CW +description=moves to CCW switch; then for M times moves to CW switch then CCW switch; between each M pauses for delay; log at CCW and CW filename=Motor Test 3.xml #optional parameters. Description is compulsory. Syntax: #parameters=::[;::] -parameters=repeatTimes:3:Repeat times;delayS:5:Delay [s] +parameters=repeatTimes:3:Repeat M times;delayS:5:Pause delay [s] diff --git a/script/tests/tests/Collimator Tests/Motor Test 2/.config b/script/tests/tests/Collimator Tests/Motor Test 2/.config index 11d633c..48c9706 100644 --- a/script/tests/tests/Collimator Tests/Motor Test 2/.config +++ b/script/tests/tests/Collimator Tests/Motor Test 2/.config @@ -4,4 +4,4 @@ filename=Motor Test 3.xml #optional parameters. Description is compulsory. Syntax: #parameters=::[;::] -parameters=repeatTimes:3:Repeat times;midPoint:41.0:Middle point;spanFromMidPoint:11.0:Span around middle point +parameters=repeatTimes:3:Repeat N times;midPoint:41.0:Middle point A;spanFromMidPoint:11.0:Span around middle point B