pshell/pshell-apps
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes in elog

Browse Source
This commit is contained in:
gobbo_a
2026-03-17 15:59:22 +01:00
parent c065a902bd
commit 2bce8bee75
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
correlation/src/main/pkg/plugins/Correlation.java
+13 -8
View File
@@ -13,6 +13,7 @@ import ch.psi.pshell.utils.Chrono;
import ch.psi.pshell.swing.SwingUtils; import ch.psi.pshell.swing.SwingUtils;
import ch.psi.pshell.swing.SwingUtils.OptionResult; import ch.psi.pshell.swing.SwingUtils.OptionResult;
import ch.psi.pshell.swing.SwingUtils.OptionType; import ch.psi.pshell.swing.SwingUtils.OptionType;
import ch.psi.pshell.utils.Sys;
import java.awt.Component; import java.awt.Component;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.GridBagLayout; import java.awt.GridBagLayout;
@@ -223,8 +224,8 @@ public class Correlation extends Panel {
StringBuffer cmd = new StringBuffer(); StringBuffer cmd = new StringBuffer();
cmd.append("G_CS_ELOG_add -l \"").append(logbook).append("\" "); cmd.append("G_CS_ELOG_add -l \"").append(logbook).append("\" ");
cmd.append("-a \"Author=ScreenPanel\" "); cmd.append("-a \"Author=").append(Sys.getUserName()).append("\" ");
cmd.append("-a \"Type=pshell\" "); cmd.append("-a \"Application=pshell\" ");
cmd.append("-a \"Entry=").append(entry).append("\" "); cmd.append("-a \"Entry=").append(entry).append("\" ");
cmd.append("-a \"Title=").append(title).append("\" "); cmd.append("-a \"Title=").append(title).append("\" ");
cmd.append("-a \"Category=").append(category).append("\" "); cmd.append("-a \"Category=").append(category).append("\" ");
@@ -241,13 +242,17 @@ public class Correlation extends Panel {
try { try {
process.waitFor(); process.waitFor();
int bytes = process.getInputStream().available(); int bytes = process.getInputStream().available();
byte[] arr = new byte[bytes]; if (bytes>0){
process.getInputStream().read(arr, 0, bytes); byte[] arr = new byte[bytes];
System.out.println(new String(arr)); process.getInputStream().read(arr, 0, bytes);
System.out.println(new String(arr));
}
bytes = process.getErrorStream().available(); bytes = process.getErrorStream().available();
arr = new byte[bytes]; if (bytes>0){
process.getErrorStream().read(arr, 0, bytes); byte[] arr = new byte[bytes];
System.err.println(new String(arr)); process.getErrorStream().read(arr, 0, bytes);
System.err.println(new String(arr));
}
} catch (Exception ex) { } catch (Exception ex) {
System.err.println(ex); System.err.println(ex);
} }