This commit is contained in:
gac-x11ma
+47
-27
@@ -504,6 +504,7 @@ public class Eiger extends Panel {
|
||||
jLabel18 = new javax.swing.JLabel();
|
||||
textRsyncPath = new javax.swing.JTextField();
|
||||
checkRsyncEnable = new javax.swing.JCheckBox();
|
||||
buttonSetFolder = new javax.swing.JButton();
|
||||
jPanel1 = new javax.swing.JPanel();
|
||||
panelNorm = new javax.swing.JPanel();
|
||||
buttonSetNorm = new javax.swing.JButton();
|
||||
@@ -1002,6 +1003,13 @@ public class Eiger extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
buttonSetFolder.setText("Set");
|
||||
buttonSetFolder.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
buttonSetFolderActionPerformed(evt);
|
||||
}
|
||||
});
|
||||
|
||||
javax.swing.GroupLayout jPanel6Layout = new javax.swing.GroupLayout(jPanel6);
|
||||
jPanel6.setLayout(jPanel6Layout);
|
||||
jPanel6Layout.setHorizontalGroup(
|
||||
@@ -1012,11 +1020,13 @@ public class Eiger extends Panel {
|
||||
.addGap(83, 83, 83)
|
||||
.addComponent(jLabel10)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textRsyncUser)
|
||||
.addComponent(textRsyncUser, javax.swing.GroupLayout.PREFERRED_SIZE, 144, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||
.addComponent(jLabel18)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(textRsyncPath)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(buttonSetFolder)
|
||||
.addContainerGap())
|
||||
);
|
||||
jPanel6Layout.setVerticalGroup(
|
||||
@@ -1028,7 +1038,8 @@ public class Eiger extends Panel {
|
||||
.addComponent(textRsyncUser, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(jLabel18)
|
||||
.addComponent(textRsyncPath, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(checkRsyncEnable))
|
||||
.addComponent(checkRsyncEnable)
|
||||
.addComponent(buttonSetFolder))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
@@ -1040,12 +1051,9 @@ public class Eiger extends Panel {
|
||||
.addGap(10, 10, 10)
|
||||
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(panelDataFile, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(panelBeamline, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addContainerGap())
|
||||
.addGroup(jPanel5Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(jPanel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addContainerGap())
|
||||
);
|
||||
jPanel5Layout.setVerticalGroup(
|
||||
jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
@@ -1226,15 +1234,15 @@ public class Eiger extends Panel {
|
||||
.addContainerGap()
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(panelNorm, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(panelNorm1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addComponent(panelNorm1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
|
||||
.addGap(0, 0, Short.MAX_VALUE)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonTriggerDetector, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(buttonShowDetectorPanel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 201, Short.MAX_VALUE)
|
||||
.addComponent(buttonMeasurements, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonTriggerDetector, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addComponent(buttonShowDetectorPanel, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 201, Short.MAX_VALUE)
|
||||
.addComponent(buttonMeasurements, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonMeasurements, buttonShowDetectorPanel, buttonTriggerDetector});
|
||||
@@ -1320,9 +1328,6 @@ public class Eiger extends Panel {
|
||||
.addComponent(jLabel26))
|
||||
.addGap(13, 13, 13))
|
||||
);
|
||||
|
||||
panelRoiLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonRoiAdd, buttonRoiRemove, jScrollPane1});
|
||||
|
||||
panelRoiLayout.setVerticalGroup(
|
||||
panelRoiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelRoiLayout.createSequentialGroup()
|
||||
@@ -1514,7 +1519,7 @@ public class Eiger extends Panel {
|
||||
.addComponent(jLabel20)))
|
||||
.addGroup(panelImgControlsLayout.createSequentialGroup()
|
||||
.addGap(22, 22, 22)
|
||||
.addComponent(jLabel22, javax.swing.GroupLayout.DEFAULT_SIZE, 77, Short.MAX_VALUE))))
|
||||
.addComponent(jLabel22, javax.swing.GroupLayout.DEFAULT_SIZE, 95, Short.MAX_VALUE))))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addGroup(panelImgControlsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||
.addComponent(spinnerImgMeasurements)
|
||||
@@ -1570,14 +1575,15 @@ public class Eiger extends Panel {
|
||||
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(jPanel2Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(panelImgControls, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(panelImgControls, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addGroup(jPanel2Layout.createSequentialGroup()
|
||||
.addGap(0, 0, Short.MAX_VALUE)
|
||||
.addComponent(buttonImgStart)
|
||||
.addGap(76, 76, 76)
|
||||
.addComponent(buttonImgAbort)
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
.addGroup(jPanel2Layout.createSequentialGroup()
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonImgStart)
|
||||
.addGap(76, 76, 76)
|
||||
.addComponent(buttonImgAbort)
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonImgAbort, buttonImgStart});
|
||||
@@ -2051,7 +2057,7 @@ public class Eiger extends Panel {
|
||||
if (!updatingRsync){
|
||||
try {
|
||||
setSetting("RSYNC_USER", "");
|
||||
setSetting("RSYNC_PATH", "");
|
||||
//setSetting("RSYNC_PATH", "");
|
||||
} catch (IOException ex) {
|
||||
Logger.getLogger(Eiger.class.getName()).log(Level.SEVERE, null, ex);
|
||||
}
|
||||
@@ -2060,7 +2066,8 @@ public class Eiger extends Panel {
|
||||
String path = textRsyncPath.getText().trim();
|
||||
if (!user.isEmpty()){
|
||||
try {
|
||||
this.eval("authorize_user('" + user +"', aux_file = '/scratch/.rsync.tmp')");
|
||||
//this.eval("authorize_user('" + user +"', aux_file = '/scratch/.rsync.tmp')");
|
||||
this.eval("authorize_user('" + user +"')");
|
||||
setSetting("RSYNC_USER", user);
|
||||
setSetting("RSYNC_PATH", path);
|
||||
} catch (Exception ex) {
|
||||
@@ -2083,6 +2090,18 @@ public class Eiger extends Panel {
|
||||
}
|
||||
}//GEN-LAST:event_checkRsyncEnableActionPerformed
|
||||
|
||||
private void buttonSetFolderActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSetFolderActionPerformed
|
||||
try {
|
||||
String ret = SwingUtils.getString(this, "Enter destination path:", String.valueOf(getSetting("RSYNC_PATH")));
|
||||
if ((ret != null) && (!ret.trim().isEmpty())){
|
||||
setSetting("RSYNC_PATH", ret.trim());
|
||||
updateRsync();
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
showException(ex);
|
||||
}
|
||||
}//GEN-LAST:event_buttonSetFolderActionPerformed
|
||||
|
||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||
private javax.swing.JButton buttonAdd;
|
||||
private javax.swing.JButton buttonApply;
|
||||
@@ -2093,6 +2112,7 @@ public class Eiger extends Panel {
|
||||
private javax.swing.JButton buttonRemove;
|
||||
private javax.swing.JButton buttonRoiAdd;
|
||||
private javax.swing.JButton buttonRoiRemove;
|
||||
private javax.swing.JButton buttonSetFolder;
|
||||
private javax.swing.JButton buttonSetNorm;
|
||||
private javax.swing.JButton buttonSetPath;
|
||||
private javax.swing.JButton buttonSetSeq;
|
||||
|
||||
Reference in New Issue
Block a user