Changeset 192

Timestamp:

09/24/11 02:44:33 (13 years ago)

Author:

sherbold

Message:

Work on the SWT GUI prototype. The prototype is still incomplete and should not be used.

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt

Files:

• CommandHistoryDialog.java (moved) (moved from trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/CommandHistory.java) (2 diffs)
• ConsoleTabComposite.java (added)
• DataTabComposite.java (added)
• GetObjectNameDialog.java (added)
• MainWindow.java (modified) (4 diffs)
• ModelPropertiesDialog.java (moved) (moved from trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/ModelProperties.java) (2 diffs)
• ModelsTabComposite.java (added)
• SWTConsole.java (modified) (2 diffs)
• SWTHelpers.java (added)
• SequencesTabComposite.java (added)
• TrainModelDialog.java (modified) (6 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/CommandHistoryDialog.java

@@ -11 +11 @@
 import org.eclipse.swt.layout.GridData;
 
-public class CommandHistory extends Dialog {
+public class CommandHistoryDialog extends Dialog {
 
         protected Object result;
@@ -21 +21 @@
          * @param style
          */
-        public CommandHistory(Shell parent, int style) {
+        public CommandHistoryDialog(Shell parent, int style) {
                 super(parent, style);
                 setText("SWT Dialog");

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/MainWindow.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.swt;
-
-import java.util.Collection;
 
 import org.eclipse.swt.widgets.Display;
@@ -9 +7 @@
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.layout.GridData;
@@ -20 +14 @@
 import org.eclipse.swt.events.SelectionEvent;
 
-import de.ugoe.cs.eventbench.data.Event;
-import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.util.console.CommandExecuter;
-import de.ugoe.cs.util.console.TextConsole;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-
 public class MainWindow {
 
         protected Shell shell;
-        private Text textCommand;
-        private Text textConsoleOutput;
-        private List list;
+        
+        protected TabItem consoleTab;
+        protected TabItem sequencesTab;
+        protected TabItem modelsTab;
+        protected TabItem dataTab;
+        protected ConsoleTabComposite consoleTabComposite;
+        protected SequencesTabComposite sequencesTabComposite;
+        protected ModelsTabComposite modelsTabComposite;
+        protected DataTabComposite dataTabComposite;
 
-        /**
-         * Launch the application.
-         * @param args
-         */
-        public static void main(String[] args) {
-                // TODO this main method needs to be removed/remodeled when merging with other project
-                try {
-                        CommandExecuter.getInstance().addCommandPackage(
-                                        "de.ugoe.cs.eventbench.commands");
-                        CommandExecuter.getInstance().addCommandPackage(
-                                        "de.ugoe.cs.eventbench.windows.commands");
-                        CommandExecuter.getInstance().addCommandPackage(
-                                        "de.ugoe.cs.eventbench.web.commands");
-                        new TextConsole();
-                        
-                        MainWindow window = new MainWindow();
-                        window.open();
-                } catch (Exception e) {
-                        e.printStackTrace();
-                }
-        }
 
         /**
          * Open the window.
+         * @wbp.parser.entryPoint
          */
         public void open() {
                 Display display = Display.getDefault();
                 createContents();
-                new SWTConsole(textConsoleOutput);
+                new SWTConsole(getTextConsoleOutput());
                 shell.open();
                 shell.layout();
@@ -119 +92 @@
                 
                 TabFolder tabFolder = new TabFolder(shell, SWT.NONE);
-                tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-                
-                TabItem tbtmConsoleMode = new TabItem(tabFolder, SWT.NONE);
-                tbtmConsoleMode.setText("Console");
-                
-                Composite composite = new Composite(tabFolder, SWT.NO_BACKGROUND);
-                tbtmConsoleMode.setControl(composite);
-                composite.setLayout(new GridLayout(3, false));
-                
-                Label lblCommand = new Label(composite, SWT.NONE);
-                lblCommand.setText("Command:");
-                
-                textCommand = new Text(composite, SWT.BORDER);
-                textCommand.addKeyListener(new KeyAdapter() {
+                tabFolder.addSelectionListener(new SelectionAdapter() {
                         @Override
-                        public void keyReleased(KeyEvent e) {
-                                if( e.keyCode==SWT.CR ) {
-                                        String command = textCommand.getText().trim();
-                                        CommandExecuter.getInstance().exec(command);
+                        public void widgetSelected(SelectionEvent e) {
+                                if( e.item == sequencesTab ) {
+                                        sequencesTabComposite.updateSequenceList();
+                                }
+                                else if(e.item == modelsTab ) {
+                                        modelsTabComposite.updateModelList();
+                                }
+                                else if(e.item == dataTab) {
+                                        dataTabComposite.updateDataList();
                                 }
                         }
                 });
-                GridData gd_textCommand = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
-                gd_textCommand.widthHint = 304;
-                textCommand.setLayoutData(gd_textCommand);
+                tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
                 
-                Button btnEnter = new Button(composite, SWT.NONE);
-                btnEnter.addSelectionListener(new SelectionAdapter() {
-                        @Override
-                        public void widgetSelected(SelectionEvent e) {
-                                // Event handler for executing commands
-                                String command = textCommand.getText().trim();
-                                CommandExecuter.getInstance().exec(command);
-                        }
-                });
-                btnEnter.setText("Enter");
+                consoleTab = new TabItem(tabFolder, SWT.NONE);
+                consoleTab.setText("Console");
                 
-                textConsoleOutput = new Text(composite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CANCEL);
-                GridData gd_textConsoleOutput = new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1);
-                gd_textConsoleOutput.heightHint = 102;
-                gd_textConsoleOutput.widthHint = 456;
-                textConsoleOutput.setLayoutData(gd_textConsoleOutput);
+                consoleTabComposite = new ConsoleTabComposite(tabFolder, SWT.NO_BACKGROUND);
+                consoleTab.setControl(consoleTabComposite);
                 
-                TabItem tbtmSequences = new TabItem(tabFolder, SWT.NONE);
-                tbtmSequences.setText("Sequences");
+                sequencesTab = new TabItem(tabFolder, SWT.NONE);
+                sequencesTab.setText("Sequences");
                 
-                Composite composite_2 = new Composite(tabFolder, SWT.NO_BACKGROUND);
-                tbtmSequences.setControl(composite_2);
-                composite_2.setLayout(new GridLayout(5, false));
+                sequencesTabComposite = new SequencesTabComposite(tabFolder, SWT.NO_BACKGROUND);
+                sequencesTab.setControl(sequencesTabComposite);
                 
-                list = new List(composite_2, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI);
-                list.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 5, 1));
-                list.setItems(new String[] {});
-                for( String sequencesName : GlobalDataContainer.getInstance().getAllSequencesNames() ) {
-                        list.add(sequencesName);
-                }
+                modelsTab = new TabItem(tabFolder, SWT.NONE);
+                modelsTab.setText("Models");
                 
-                Button btnEdit = new Button(composite_2, SWT.NONE);
-                btnEdit.addSelectionListener(new SelectionAdapter() {
-                        @Override
-                        public void widgetSelected(SelectionEvent e) {
-                                // TODO edit sequences event handler
-                        }
-                });
-                btnEdit.setText("Edit");
+                modelsTabComposite = new ModelsTabComposite(tabFolder, SWT.NO_BACKGROUND);
+                modelsTab.setControl(modelsTabComposite);
+                                
+                dataTab = new TabItem(tabFolder, SWT.NONE);
+                dataTab.setText("Data");
                 
-                Button btnDelete = new Button(composite_2, SWT.NONE);
-                btnDelete.addSelectionListener(new SelectionAdapter() {
-                        @Override
-                        public void widgetSelected(SelectionEvent e) {
-                                String[] selectedSequences = list.getSelection();
-                                for( String selected : selectedSequences) {
-                                        GlobalDataContainer.getInstance().removeData(selected);
-                                }
-                        }
-                });
-                btnDelete.setText("Delete");
+                dataTabComposite = new DataTabComposite(tabFolder, SWT.NO_BACKGROUND);
+                dataTab.setControl(dataTabComposite);
                 
-                Button btnReplay = new Button(composite_2, SWT.NONE);
-                btnReplay.setText("Replay");
-                
-                Button btnTrainModel = new Button(composite_2, SWT.NONE);
-                btnTrainModel.setText("Train Model");
-                
-                Button btnParse = new Button(composite_2, SWT.NONE);
-                btnParse.setText("Parse");
-                
-                TabItem tbtmModels = new TabItem(tabFolder, SWT.NONE);
-                tbtmModels.setText("Models");
-                
-                Composite composite_1 = new Composite(tabFolder, SWT.NO_BACKGROUND);
-                tbtmModels.setControl(composite_1);
-                composite_1.setLayout(new GridLayout(5, false));
-                
-                List list_1 = new List(composite_1, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI);
-                list_1.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 5, 1));
-                
-                Button btnShow = new Button(composite_1, SWT.NONE);
-                btnShow.setText("Visualize");
-                
-                Button btnDelete_1 = new Button(composite_1, SWT.NONE);
-                btnDelete_1.setText("Delete");
-                
-                Button btnGenSequences = new Button(composite_1, SWT.NONE);
-                btnGenSequences.setText("Gen. Sequences");
-                
-                Button btnProperties = new Button(composite_1, SWT.NONE);
-                btnProperties.setText("Properties");
-                
-                Button btnCreateDot = new Button(composite_1, SWT.NONE);
-                btnCreateDot.setText("Create DOT");
-                
-                TabItem tbtmData = new TabItem(tabFolder, SWT.NONE);
-                tbtmData.setText("Data");
-                
-                Composite composite_3 = new Composite(tabFolder, SWT.NO_BACKGROUND);
-                tbtmData.setControl(composite_3);
-                composite_3.setLayout(new GridLayout(3, false));
-                
-                List list_2 = new List(composite_3, SWT.BORDER | SWT.V_SCROLL);
-                list_2.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
-                
-                Button btnLoad = new Button(composite_3, SWT.NONE);
-                btnLoad.setText("Load");
-                
-                Button btnSave = new Button(composite_3, SWT.NONE);
-                btnSave.setText("Save");
-                
-                Button btnDelete_2 = new Button(composite_3, SWT.NONE);
-                btnDelete_2.setText("Delete");
-
         }
         public Text getTextConsoleOutput() {
-                return textConsoleOutput;
+                return consoleTabComposite.textConsoleOutput;
         }
 }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/ModelPropertiesDialog.java

@@ -13 +13 @@
 import org.eclipse.swt.layout.FillLayout;
 
-public class ModelProperties extends Dialog {
+public class ModelPropertiesDialog extends Dialog {
 
         protected Object result;
@@ -23 +23 @@
          * @param style
          */
-        public ModelProperties(Shell parent, int style) {
+        public ModelPropertiesDialog(Shell parent, int style) {
                 super(parent, style);
                 setText("SWT Dialog");

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/SWTConsole.java

@@ -3 +3 @@
 import org.eclipse.swt.widgets.Text;
 
+import de.ugoe.cs.util.StringTools;
 import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.util.console.ConsoleObserver;
@@ -38 +39 @@
         @Override
         public void commandNotification(String command) {
-                output.append("> " + command);  
+                output.append("> " + command + StringTools.ENDLINE);    
         }
 }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/TrainModelDialog.java

@@ -3 +3 @@
 import org.eclipse.swt.widgets.Dialog;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Button;
@@ -12 +13 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+
+import de.ugoe.cs.util.console.CommandExecuter;
+import de.ugoe.cs.util.console.Console;
 
 public class TrainModelDialog extends Dialog {
@@ -17 +23 @@
         protected Object result;
         protected Shell shlTrainUsageModel;
-        private Text text_1;
+        
+        private Button btnFirstorderMarkovModel;
+        private Button btnHighorderMarkovModel;
+        private Button btnPredictionByPartial;
+        private Button btnDeterministicFiniteAutomaton;
+        
+        private Spinner minOrderSpinner;
+        private Spinner maxOrderSpinner;
+        private Text modelnameText;
+        
+        private String[] sequenceNames;
+        private Text probEscapeText;
+        private Label lblEscapeProbability;
 
         /**
@@ -51 +69 @@
         private void createContents() {
                 shlTrainUsageModel = new Shell(getParent(), SWT.DIALOG_TRIM | SWT.MIN | SWT.APPLICATION_MODAL);
-                shlTrainUsageModel.setSize(219, 279);
+                shlTrainUsageModel.setSize(219, 330);
                 shlTrainUsageModel.setText("Train Usage Model");
                 shlTrainUsageModel.setLayout(new GridLayout(2, false));
@@ -60 +78 @@
                 grpGeneralInformation.setLayout(new GridLayout(1, false));
                 
-                text_1 = new Text(grpGeneralInformation, SWT.BORDER);
-                text_1.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
+                modelnameText = new Text(grpGeneralInformation, SWT.BORDER);
+                modelnameText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
                 
                 Group grpType = new Group(shlTrainUsageModel, SWT.NONE);
                 grpType.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 2, 1));
                 grpType.setText("Type");
-                grpType.setLayout(new GridLayout(1, false));
-                
-                Button btnFirstorderMarkovModel = new Button(grpType, SWT.RADIO);
-                btnFirstorderMarkovModel.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
+                grpType.setLayout(new GridLayout(2, false));
+                
+                btnFirstorderMarkovModel = new Button(grpType, SWT.RADIO);
+                btnFirstorderMarkovModel.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                minOrderSpinner.setEnabled(false);
+                                maxOrderSpinner.setEnabled(false);
+                                probEscapeText.setEnabled(false);
+                        }
+                });
+                btnFirstorderMarkovModel.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 2, 1));
                 btnFirstorderMarkovModel.setText("First-Order Markov Model");
-                
-                Button btnHighorderMarkovModel = new Button(grpType, SWT.RADIO);
-                btnHighorderMarkovModel.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
+                btnFirstorderMarkovModel.setSelection(true);
+                
+                btnHighorderMarkovModel = new Button(grpType, SWT.RADIO);
+                btnHighorderMarkovModel.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                minOrderSpinner.setEnabled(false);
+                                maxOrderSpinner.setEnabled(true);
+                                probEscapeText.setEnabled(false);
+                        }
+                });
+                btnHighorderMarkovModel.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 2, 1));
                 btnHighorderMarkovModel.setText("High-Order Markov Model");
                 
-                Button btnPredictionByPartial = new Button(grpType, SWT.RADIO);
-                btnPredictionByPartial.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
+                btnPredictionByPartial = new Button(grpType, SWT.RADIO);
+                btnPredictionByPartial.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                minOrderSpinner.setEnabled(true);
+                                maxOrderSpinner.setEnabled(true);
+                                probEscapeText.setEnabled(true);
+                        }
+                });
+                btnPredictionByPartial.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, true, false, 2, 1));
                 btnPredictionByPartial.setText("Prediction by Partial Match");
                 
-                Button btnDeterministicFiniteAutomaton = new Button(grpType, SWT.RADIO);
-                btnDeterministicFiniteAutomaton.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
+                lblEscapeProbability = new Label(grpType, SWT.NONE);
+                lblEscapeProbability.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1));
+                lblEscapeProbability.setText("Escape Probability:");
+                
+                probEscapeText = new Text(grpType, SWT.BORDER);
+                probEscapeText.setText("0.1");
+                probEscapeText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+                probEscapeText.setEnabled(false);
+                
+                btnDeterministicFiniteAutomaton = new Button(grpType, SWT.RADIO);
+                btnDeterministicFiniteAutomaton.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                minOrderSpinner.setEnabled(false);
+                                maxOrderSpinner.setEnabled(false);
+                                probEscapeText.setEnabled(false);
+                        }
+                });
+                btnDeterministicFiniteAutomaton.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 2, 1));
                 btnDeterministicFiniteAutomaton.setText("Deterministic Finite Automaton");
                 
@@ -92 +152 @@
                 lblMin.setText("Min.");
                 
-                Spinner spinner_1 = new Spinner(grpModelProperties, SWT.BORDER);
+                minOrderSpinner = new Spinner(grpModelProperties, SWT.BORDER);
+                minOrderSpinner.setEnabled(false);
                 
                 Label lblMax = new Label(grpModelProperties, SWT.NONE);
                 lblMax.setText("Max.");
                 
-                Spinner spinner = new Spinner(grpModelProperties, SWT.BORDER);
-                new Label(grpModelProperties, SWT.NONE);
-                new Label(grpModelProperties, SWT.NONE);
-                new Label(grpModelProperties, SWT.NONE);
-                new Label(grpModelProperties, SWT.NONE);
+                maxOrderSpinner = new Spinner(grpModelProperties, SWT.BORDER);
+                maxOrderSpinner.setEnabled(false);
+                maxOrderSpinner.setMinimum(2);
                 
                 Button btnTrain = new Button(shlTrainUsageModel, SWT.NONE);
+                btnTrain.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                String command = "";
+                                String modelname = modelnameText.getText();
+                                if( modelname.equals("")) {
+                                        MessageBox messageBox = new MessageBox(shlTrainUsageModel, SWT.ERROR);
+                                        messageBox.setText("Error");
+                                        messageBox.setMessage("No modelname defined!");
+                                        return;
+                                }
+                                if( btnFirstorderMarkovModel.getSelection() ) {
+                                        command = "trainMarkovModel " + modelname + " " + sequenceNames[0];
+                                        
+                                }
+                                else if( btnHighorderMarkovModel.getSelection() ) {
+                                        int modelOrder = maxOrderSpinner.getSelection();
+                                        command = "trainMarkovModel " + modelname + " " + sequenceNames[0] + " " + modelOrder;
+                                }
+                                else if( btnPredictionByPartial.getSelection() ) {
+                                        int minOrder = minOrderSpinner.getSelection();
+                                        int maxOrder = maxOrderSpinner.getSelection();
+                                        if( minOrder>maxOrder ) {
+                                                MessageBox messageBox = new MessageBox(shlTrainUsageModel, SWT.ERROR);
+                                                messageBox.setText("Error");
+                                                messageBox.setMessage("Min. Order must be smaller than or equal to max. order!");
+                                                return;
+                                        }
+                                        double probEscape = Double.parseDouble(probEscapeText.getText());
+                                        if( probEscape<0.0 || probEscape>1.0) {
+                                                MessageBox messageBox = new MessageBox(shlTrainUsageModel, SWT.ERROR);
+                                                messageBox.setText("Error");
+                                                messageBox.setMessage("Escape probability must be in [0,1]!");
+                                                return;
+                                        }
+                                        command = "trainPPM " + modelname + " " + sequenceNames[0] + " " + probEscape + " " + maxOrder + " " + minOrder;
+                                }
+                                else if( btnDeterministicFiniteAutomaton.getSelection() ) {
+                                        command = "trainDFA " + modelname + " " + sequenceNames[0];
+                                }
+                                CommandExecuter.getInstance().exec(command);
+                                for( int i=1; i<sequenceNames.length; i++ ) {
+                                        command = "updateModel " + sequenceNames[i];
+                                        CommandExecuter.getInstance().exec(command);
+                                }
+                                shlTrainUsageModel.dispose();
+                        }
+                });
                 btnTrain.setText("Train!");
                 
                 Button btnAbort = new Button(shlTrainUsageModel, SWT.NONE);
+                btnAbort.addSelectionListener(new SelectionAdapter() {
+                        @Override
+                        public void widgetSelected(SelectionEvent e) {
+                                shlTrainUsageModel.dispose();
+                        }
+                });
                 btnAbort.setText("Abort");
 
         }
+        
+        public void setSequenceNames(String[] sequenceNames) {
+                this.sequenceNames = sequenceNames;
+        }
 }