svn commit: r1904808 - /ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java

[seanfinan]

Author: seanfinan
Date: Mon Oct 24 12:09:14 2022
New Revision: 1904808

URL: http://svn.apache.org/viewvc?rev=1904808&view=rev
Log:
Nicer looking patient, doc display

Modified:
    
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java

Modified: 
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java
URL: 
http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java?rev=1904808&r1=1904807&r2=1904808&view=diff
==============================================================================
--- 
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java
 (original)
+++ 
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java
 Mon Oct 24 12:09:14 2022
@@ -63,6 +63,9 @@ final public class PiperRunnerPanel exte
    private JButton _runButton;
    private JButton _helpButton;
 
+   private JLabel _patientLabel;
+   private JLabel _docLabel;
+
    private final String[] STANDARD_CHARS = { "i", "o" };
    private final String[] STANDARD_NAMES = { "InputDirectory", 
"OutputDirectory" };
 
@@ -123,16 +126,13 @@ final public class PiperRunnerPanel exte
       _runButton.setEnabled( false );
 
       toolBar.addSeparator( new Dimension( 50, 0 ) );
+      toolBar.add( createLabelPanel() );
+      toolBar.addSeparator( new Dimension( 10, 0 ) );
       final JProgressBar progressBar = new JProgressBar( 
ProgressManager.getInstance()
                                                                         
.getModel() ) {
          protected void fireStateChanged() {
             super.fireStateChanged();
-//            SwingUtilities.invokeLater( () -> setString( getValue() + " / " 
+ getMaximum() ) );
-            SwingUtilities.invokeLater( () -> setString( 
ProgressManager.getInstance()
-                                                                        
.getPatientId()
-                                                         + "          " + 
ProgressManager.getInstance()
-                                                                               
          .getDocId()
-                                                         + "          (" + 
getValue() + " / " + getMaximum() + ")" ) );
+            SwingUtilities.invokeLater( () -> setString( getValue() + " / " + 
getMaximum() ) );
          }
       };
       progressBar.setStringPainted( true );
@@ -146,6 +146,27 @@ final public class PiperRunnerPanel exte
       return toolBar;
    }
 
+   private JComponent createLabelPanel() {
+      final JPanel panel = new JPanel( new BorderLayout() );
+      panel.setPreferredSize( new Dimension( 200, 32 ) );
+      panel.setMaximumSize( new Dimension( 200, 32 ) );
+      _patientLabel = new JLabel();
+      _docLabel = new JLabel();
+      panel.add( _patientLabel, BorderLayout.NORTH );
+      panel.add( _docLabel, BorderLayout.SOUTH );
+      ProgressManager.getInstance()
+                     .getModel()
+                     .addChangeListener( e -> {
+                        _patientLabel.setText( "Patient: "
+                                               + ProgressManager.getInstance()
+                                                                
.getPatientId() );
+                        _docLabel.setText( "Document: "
+                                           + ProgressManager.getInstance()
+                                                            .getDocId() );
+                     } );
+      return panel;
+   }
+
    static private JButton addButton( final JToolBar toolBar, final String 
toolTip ) {
       final JButton button = new JButton();
       button.setFocusPainted( false );