From 30a01a52b940ab5ed04a40d423d6fc3e9ccf9e32 Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Tue, 23 Jun 2015 11:03:23 +0200 Subject: [PATCH] Closedown --- plugins/TestingListDetails.form | 111 ++++++++++-------- plugins/TestingListDetails.java | 88 +++++++------- .../Collimator Tests/Motor Test 1/.config | 2 +- .../Motor Test 1/Motor Test 1.py | 3 +- 4 files changed, 109 insertions(+), 95 deletions(-) diff --git a/plugins/TestingListDetails.form b/plugins/TestingListDetails.form index e89e2ad..9b31699 100644 --- a/plugins/TestingListDetails.form +++ b/plugins/TestingListDetails.form @@ -27,41 +27,31 @@ - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -94,27 +84,34 @@ - - - - - - + + + + + + - + + - - + - - - + + + + + + + + + + + - @@ -250,6 +247,7 @@ + @@ -260,10 +258,21 @@ - - - - - + + + + + + + + + + + + + + + + diff --git a/plugins/TestingListDetails.java b/plugins/TestingListDetails.java index 9c064c4..9cfa2c8 100644 --- a/plugins/TestingListDetails.java +++ b/plugins/TestingListDetails.java @@ -55,7 +55,8 @@ public class TestingListDetails extends javax.swing.JPanel { jScrollPane2 = new javax.swing.JScrollPane(); txtTestResult = new javax.swing.JTextArea(); jLabel8 = new javax.swing.JLabel(); - txtTestDescription = new javax.swing.JTextField(); + jScrollPane3 = new javax.swing.JScrollPane(); + txtTestDescription = new javax.swing.JTextArea(); jLabel1.setText("Device name"); @@ -122,12 +123,16 @@ public class TestingListDetails extends javax.swing.JPanel { this.cmDefault.setVisible(false); txtTestResult.setColumns(20); + txtTestResult.setLineWrap(true); txtTestResult.setRows(5); jScrollPane2.setViewportView(txtTestResult); jLabel8.setText("Test Description"); - txtTestDescription.setText("jTextField2"); + txtTestDescription.setColumns(20); + txtTestDescription.setLineWrap(true); + txtTestDescription.setRows(5); + jScrollPane3.setViewportView(txtTestDescription); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); @@ -143,34 +148,28 @@ public class TestingListDetails extends javax.swing.JPanel { .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGap(383, 383, 383)) .addGroup(layout.createSequentialGroup() - .addComponent(jLabel8, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGap(362, 362, 362)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addComponent(jLabel7) + .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jLabel8, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(txtDeviceName) + .addComponent(txtDeviceDescription) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 673, Short.MAX_VALUE) + .addComponent(txtTestSuite) + .addComponent(txtTestName, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(jScrollPane3) + .addComponent(jScrollPane2) .addGroup(layout.createSequentialGroup() - .addGap(0, 109, Short.MAX_VALUE) - .addComponent(txtTestDescription, javax.swing.GroupLayout.PREFERRED_SIZE, 673, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(jLabel7) - .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() - .addComponent(cmDefault, javax.swing.GroupLayout.PREFERRED_SIZE, 132, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(cmOk, javax.swing.GroupLayout.PREFERRED_SIZE, 96, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(cmCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 98, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addComponent(txtDeviceName) - .addComponent(txtDeviceDescription) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 673, Short.MAX_VALUE) - .addComponent(txtTestSuite) - .addComponent(txtTestName, javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(jScrollPane2)))) + .addComponent(cmDefault, javax.swing.GroupLayout.PREFERRED_SIZE, 132, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(cmOk, javax.swing.GroupLayout.PREFERRED_SIZE, 96, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(18, 18, 18) + .addComponent(cmCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 98, javax.swing.GroupLayout.PREFERRED_SIZE))) .addContainerGap(21, Short.MAX_VALUE)))) ); layout.setVerticalGroup( @@ -193,23 +192,27 @@ public class TestingListDetails extends javax.swing.JPanel { .addComponent(jLabel5) .addComponent(txtTestName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jLabel8) - .addComponent(txtTestDescription, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(8, 8, 8) + .addComponent(jScrollPane3, javax.swing.GroupLayout.PREFERRED_SIZE, 81, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 79, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel6)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jLabel7) - .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 212, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 188, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(jLabel7)) + .addGap(18, 18, 18) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(cmOk, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(cmCancel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(cmDefault, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addContainerGap()) + .addGroup(layout.createSequentialGroup() + .addComponent(cmDefault, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGap(78, 78, 78)) + .addGroup(layout.createSequentialGroup() + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) + .addComponent(cmOk, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(cmCancel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))) ); }// //GEN-END:initComponents @@ -256,10 +259,11 @@ public class TestingListDetails extends javax.swing.JPanel { private javax.swing.JLabel jLabel8; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane2; + private javax.swing.JScrollPane jScrollPane3; private javax.swing.JTable jTableParams; private javax.swing.JTextField txtDeviceDescription; private javax.swing.JTextField txtDeviceName; - private javax.swing.JTextField txtTestDescription; + private javax.swing.JTextArea txtTestDescription; private javax.swing.JTextField txtTestName; private javax.swing.JTextArea txtTestResult; private javax.swing.JTextField txtTestSuite; diff --git a/script/tests/tests/Collimator Tests/Motor Test 1/.config b/script/tests/tests/Collimator Tests/Motor Test 1/.config index ba78e21..57363c0 100644 --- a/script/tests/tests/Collimator Tests/Motor Test 1/.config +++ b/script/tests/tests/Collimator Tests/Motor Test 1/.config @@ -4,4 +4,4 @@ filename=Motor Test 3.xml #optional parameters. Description is compulsory. Syntax: #parameters=::[;::] -parameters=repeatTimes:3:Repeat times +parameters=repeatTimes:3:Repeat times;delayS:5:Delay [s] diff --git a/script/tests/tests/Collimator Tests/Motor Test 1/Motor Test 1.py b/script/tests/tests/Collimator Tests/Motor Test 1/Motor Test 1.py index 2d215c2..c9c3a5e 100644 --- a/script/tests/tests/Collimator Tests/Motor Test 1/Motor Test 1.py +++ b/script/tests/tests/Collimator Tests/Motor Test 1/Motor Test 1.py @@ -12,6 +12,7 @@ try: print "Running test with the following parameters:" print parameters loopTimes = parameters["repeatTimes"] + delaySeconds = = parameters["delayS"] except: print "Could not retrieve testing parameters: ", sys.exc_info()[0] ret = 'Could not retrieve testing parameters - ' + traceback.format_exc() @@ -85,7 +86,7 @@ setpoint2 = end loopTimes = 2 count = 0 for setpoint1 in range(0, loopTimes): - sleep( 2 ) # Settling time + sleep( delaySeconds ) # Settling time #RegionPositioner idInkr idInkr.put(setpoint2, timeout=None) # TODO: Set appropriate timeout readback2 = idInkr.get()