Changeset 2916 for trunk/sources/HeuristicLab.Core.Views/3.3

Timestamp:

03/03/10 03:14:37 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on engines and algorithms

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• Auxiliary.cs (modified) (1 diff)
• EngineView.Designer.cs (modified) (6 diffs)
• EngineView.cs (modified) (11 diffs)
• NamedItemView.cs (modified) (1 diff)
• ViewHost.Designer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/Auxiliary.cs

@@ -55 +55 @@
     /// <param name="ex">The exception to format.</param>
     /// <returns>The formated message.</returns>
-    private static string BuildErrorMessage(Exception ex) {
+    public static string BuildErrorMessage(Exception ex) {
+      string nl = Environment.NewLine;
       StringBuilder sb = new StringBuilder();
-      sb.Append("Sorry, but something went wrong!\n\n" + ex.Message + "\n\n" + ex.StackTrace);
+      sb.Append("Sorry, but something went wrong!" + nl + ex.Message + nl + ex.StackTrace);
 
       while (ex.InnerException != null) {
         ex = ex.InnerException;
-        sb.Append("\n\n-----\n\n" + ex.Message + "\n\n" + ex.StackTrace);
+        sb.Append(nl + "-----" + nl + ex.Message + nl + ex.StackTrace);
       }
       return sb.ToString();

trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.Designer.cs

@@ -33 +33 @@
     protected override void Dispose(bool disposing) {
       if (disposing) {
-        if (typeSelectorDialog != null) typeSelectorDialog.Dispose();
         if (components != null) components.Dispose();
       }
@@ -49 +48 @@
       this.executionTimeTextBox = new System.Windows.Forms.TextBox();
       this.executionTimeLabel = new System.Windows.Forms.Label();
-      this.scopeView = new HeuristicLab.Core.Views.ScopeView();
-      this.resetButton = new System.Windows.Forms.Button();
       this.stopButton = new System.Windows.Forms.Button();
       this.startButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.newOperatorGraphButton = new System.Windows.Forms.Button();
-      this.openOperatorGraphButton = new System.Windows.Forms.Button();
-      this.saveOperatorGraphButton = new System.Windows.Forms.Button();
-      this.tabControl = new System.Windows.Forms.TabControl();
-      this.operatorGraphTabPage = new System.Windows.Forms.TabPage();
-      this.operatorGraphViewHost = new HeuristicLab.Core.Views.ViewHost();
-      this.globalScopeTabPage = new System.Windows.Forms.TabPage();
-      this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-      this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
-      this.tabControl.SuspendLayout();
-      this.operatorGraphTabPage.SuspendLayout();
-      this.globalScopeTabPage.SuspendLayout();
+      this.logTextBox = new System.Windows.Forms.TextBox();
       this.SuspendLayout();
       // 
@@ -86 +72 @@
       this.executionTimeLabel.TabIndex = 4;
       this.executionTimeLabel.Text = "&Execution Time:";
-      // 
-      // scopeView
-      // 
-      this.scopeView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.scopeView.Caption = "Scope";
-      this.scopeView.Content = null;
-      this.scopeView.Location = new System.Drawing.Point(6, 6);
-      this.scopeView.Name = "scopeView";
-      this.scopeView.Size = new System.Drawing.Size(782, 572);
-      this.scopeView.TabIndex = 0;
-      // 
-      // resetButton
-      // 
-      this.resetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.resetButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Restart;
-      this.resetButton.Location = new System.Drawing.Point(60, 616);
-      this.resetButton.Name = "resetButton";
-      this.resetButton.Size = new System.Drawing.Size(24, 24);
-      this.resetButton.TabIndex = 3;
-      this.toolTip.SetToolTip(this.resetButton, "Reset Engine");
-      this.resetButton.UseVisualStyleBackColor = true;
-      this.resetButton.Click += new System.EventHandler(this.resetButton_Click);
       // 
       // stopButton
@@ -136 +98 @@
       this.startButton.Click += new System.EventHandler(this.startButton_Click);
       // 
-      // newOperatorGraphButton
+      // logTextBox
       // 
-      this.newOperatorGraphButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.NewDocument;
-      this.newOperatorGraphButton.Location = new System.Drawing.Point(6, 6);
-      this.newOperatorGraphButton.Name = "newOperatorGraphButton";
-      this.newOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
-      this.newOperatorGraphButton.TabIndex = 0;
-      this.toolTip.SetToolTip(this.newOperatorGraphButton, "Create New Operator Graph");
-      this.newOperatorGraphButton.UseVisualStyleBackColor = true;
-      this.newOperatorGraphButton.Click += new System.EventHandler(this.newOperatorGraphButton_Click);
-      // 
-      // openOperatorGraphButton
-      // 
-      this.openOperatorGraphButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
-      this.openOperatorGraphButton.Location = new System.Drawing.Point(36, 6);
-      this.openOperatorGraphButton.Name = "openOperatorGraphButton";
-      this.openOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
-      this.openOperatorGraphButton.TabIndex = 1;
-      this.toolTip.SetToolTip(this.openOperatorGraphButton, "Open Operator Graph");
-      this.openOperatorGraphButton.UseVisualStyleBackColor = true;
-      this.openOperatorGraphButton.Click += new System.EventHandler(this.openOperatorGraphButton_Click);
-      // 
-      // saveOperatorGraphButton
-      // 
-      this.saveOperatorGraphButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Save;
-      this.saveOperatorGraphButton.Location = new System.Drawing.Point(66, 6);
-      this.saveOperatorGraphButton.Name = "saveOperatorGraphButton";
-      this.saveOperatorGraphButton.Size = new System.Drawing.Size(24, 24);
-      this.saveOperatorGraphButton.TabIndex = 2;
-      this.toolTip.SetToolTip(this.saveOperatorGraphButton, "Save Operator Graph");
-      this.saveOperatorGraphButton.UseVisualStyleBackColor = true;
-      this.saveOperatorGraphButton.Click += new System.EventHandler(this.saveOperatorGraphButton_Click);
-      // 
-      // tabControl
-      // 
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.logTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl.Controls.Add(this.operatorGraphTabPage);
-      this.tabControl.Controls.Add(this.globalScopeTabPage);
-      this.tabControl.Location = new System.Drawing.Point(0, 0);
-      this.tabControl.Name = "tabControl";
-      this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(802, 610);
-      this.tabControl.TabIndex = 3;
-      // 
-      // operatorGraphTabPage
-      // 
-      this.operatorGraphTabPage.Controls.Add(this.operatorGraphViewHost);
-      this.operatorGraphTabPage.Controls.Add(this.saveOperatorGraphButton);
-      this.operatorGraphTabPage.Controls.Add(this.openOperatorGraphButton);
-      this.operatorGraphTabPage.Controls.Add(this.newOperatorGraphButton);
-      this.operatorGraphTabPage.Location = new System.Drawing.Point(4, 22);
-      this.operatorGraphTabPage.Name = "operatorGraphTabPage";
-      this.operatorGraphTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.operatorGraphTabPage.Size = new System.Drawing.Size(794, 584);
-      this.operatorGraphTabPage.TabIndex = 0;
-      this.operatorGraphTabPage.Text = "Operator Graph";
-      this.operatorGraphTabPage.UseVisualStyleBackColor = true;
-      // 
-      // operatorGraphViewHost
-      // 
-      this.operatorGraphViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.operatorGraphViewHost.Content = null;
-      this.operatorGraphViewHost.Location = new System.Drawing.Point(6, 36);
-      this.operatorGraphViewHost.Name = "operatorGraphViewHost";
-      this.operatorGraphViewHost.Size = new System.Drawing.Size(782, 542);
-      this.operatorGraphViewHost.TabIndex = 3;
-      this.operatorGraphViewHost.ViewType = null;
-      // 
-      // globalScopeTabPage
-      // 
-      this.globalScopeTabPage.Controls.Add(this.scopeView);
-      this.globalScopeTabPage.Location = new System.Drawing.Point(4, 22);
-      this.globalScopeTabPage.Name = "globalScopeTabPage";
-      this.globalScopeTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.globalScopeTabPage.Size = new System.Drawing.Size(794, 584);
-      this.globalScopeTabPage.TabIndex = 1;
-      this.globalScopeTabPage.Text = "Global Scope";
-      this.globalScopeTabPage.UseVisualStyleBackColor = true;
-      // 
-      // openFileDialog
-      // 
-      this.openFileDialog.DefaultExt = "hl";
-      this.openFileDialog.FileName = "Item";
-      this.openFileDialog.Filter = "HeuristicLab Files|*.hl|All Files|*.*";
-      this.openFileDialog.Title = "Open File";
-      // 
-      // saveFileDialog
-      // 
-      this.saveFileDialog.DefaultExt = "hl";
-      this.saveFileDialog.FileName = "Item";
-      this.saveFileDialog.Filter = "Uncompressed HeuristicLab Files|*.hl|HeuristicLab Files|*.hl|All Files|*.*";
-      this.saveFileDialog.FilterIndex = 2;
-      this.saveFileDialog.Title = "Save File";
+      this.logTextBox.Location = new System.Drawing.Point(0, 0);
+      this.logTextBox.Multiline = true;
+      this.logTextBox.Name = "logTextBox";
+      this.logTextBox.ReadOnly = true;
+      this.logTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+      this.logTextBox.Size = new System.Drawing.Size(802, 610);
+      this.logTextBox.TabIndex = 6;
+      this.logTextBox.WordWrap = false;
       // 
       // EngineView
@@ -238 +116 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.tabControl);
+      this.Controls.Add(this.logTextBox);
       this.Controls.Add(this.executionTimeTextBox);
       this.Controls.Add(this.stopButton);
       this.Controls.Add(this.executionTimeLabel);
-      this.Controls.Add(this.resetButton);
       this.Controls.Add(this.startButton);
       this.Name = "EngineView";
       this.Size = new System.Drawing.Size(802, 640);
-      this.tabControl.ResumeLayout(false);
-      this.operatorGraphTabPage.ResumeLayout(false);
-      this.globalScopeTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -258 +132 @@
     protected System.Windows.Forms.TextBox executionTimeTextBox;
     protected System.Windows.Forms.Label executionTimeLabel;
-    protected System.Windows.Forms.Button resetButton;
     protected System.Windows.Forms.Button stopButton;
     protected System.Windows.Forms.Button startButton;
-    protected HeuristicLab.Core.Views.ScopeView scopeView;
     protected System.Windows.Forms.ToolTip toolTip;
-    protected System.Windows.Forms.TabControl tabControl;
-    protected System.Windows.Forms.TabPage globalScopeTabPage;
-    protected System.Windows.Forms.OpenFileDialog openFileDialog;
-    protected System.Windows.Forms.SaveFileDialog saveFileDialog;
-    protected System.Windows.Forms.TabPage operatorGraphTabPage;
-    protected System.Windows.Forms.Button saveOperatorGraphButton;
-    protected System.Windows.Forms.Button openOperatorGraphButton;
-    protected System.Windows.Forms.Button newOperatorGraphButton;
-    protected ViewHost operatorGraphViewHost;
+    protected System.Windows.Forms.TextBox logTextBox;
 
   }

trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.cs

@@ -21 +21 @@
 
 using System;
-using System.Windows.Forms;
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
-using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Core.Views {
@@ -33 +31 @@
   [Content(typeof(IEngine), false)]
   public partial class EngineView : ItemView {
-    protected TypeSelectorDialog typeSelectorDialog;
     private int executionTimeCounter;
 
@@ -61 +58 @@
     /// <remarks>Calls <see cref="ViewBase.RemoveItemEvents"/> of base class <see cref="ViewBase"/>.</remarks>
     protected override void DeregisterContentEvents() {
-      Content.OperatorGraphChanged -= new EventHandler(Content_OperatorGraphChanged);
       Content.Prepared -= new EventHandler(Content_Prepared);
       Content.Started -= new EventHandler(Content_Started);
@@ -76 +72 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.OperatorGraphChanged += new EventHandler(Content_OperatorGraphChanged);
       Content.Prepared += new EventHandler(Content_Prepared);
       Content.Started += new EventHandler(Content_Started);
@@ -91 +86 @@
       base.OnContentChanged();
       stopButton.Enabled = false;
+      logTextBox.Clear();
       if (Content == null) {
-        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
-        operatorGraphViewHost.Enabled = false;
-        scopeView.Enabled = false;
-        startButton.Enabled = resetButton.Enabled = false;
+        logTextBox.Enabled = false;
+        startButton.Enabled = false;
         executionTimeTextBox.Enabled = false;
       } else {
-        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
-        operatorGraphViewHost.Content = Content.OperatorGraph;
-        operatorGraphViewHost.Enabled = true;
-        scopeView.Content = Content.GlobalScope;
-        scopeView.Enabled = true;
+        logTextBox.Enabled = true;
         startButton.Enabled = !Content.Finished;
-        resetButton.Enabled = true;
         UpdateExecutionTimeTextBox();
         executionTimeTextBox.Enabled = true;
@@ -111 +100 @@
 
     #region Content Events
-    protected virtual void Content_OperatorGraphChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_OperatorGraphChanged), sender, e);
-      else
-        operatorGraphViewHost.Content = Content.OperatorGraph;
-    }
     protected virtual void Content_Prepared(object sender, EventArgs e) {
       if (InvokeRequired)
         Invoke(new EventHandler(Content_Prepared), sender, e);
       else {
-        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
-        operatorGraphViewHost.Enabled = true;
-        scopeView.Enabled = true;
         startButton.Enabled = !Content.Finished;
         stopButton.Enabled = false;
-        resetButton.Enabled = true;
         UpdateExecutionTimeTextBox();
+        logTextBox.Clear();
+        Log("Engine prepared");
       }
     }
@@ -135 +116 @@
         Invoke(new EventHandler(Content_Started), sender, e);
       else {
-        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = false;
-        operatorGraphViewHost.Enabled = false;
-        scopeView.Enabled = false;
         startButton.Enabled = false;
         stopButton.Enabled = true;
-        resetButton.Enabled = false;
         UpdateExecutionTimeTextBox();
+        Log("Engine started");
       }
     }
@@ -148 +126 @@
         Invoke(new EventHandler(Content_Stopped), sender, e);
       else {
-        newOperatorGraphButton.Enabled = openOperatorGraphButton.Enabled = saveOperatorGraphButton.Enabled = true;
-        operatorGraphViewHost.Enabled = true;
-        scopeView.Enabled = true;
         startButton.Enabled = !Content.Finished;
         stopButton.Enabled = false;
-        resetButton.Enabled = true;
         UpdateExecutionTimeTextBox();
+        if (Content.Finished) Log("Engine finished");
+        else Log("Engine stopped");
       }
     }
@@ -168 +144 @@
         Invoke(new EventHandler<EventArgs<Exception>>(Content_ExceptionOccurred), sender, e);
       else
-        Auxiliary.ShowErrorMessageBox(e.Value);
+        Log(Auxiliary.BuildErrorMessage(e.Value));
     }
     #endregion
 
     #region Button events
-    protected void newOperatorGraphButton_Click(object sender, EventArgs e) {
-      Content.OperatorGraph = new OperatorGraph();
-    }
-    protected void openOperatorGraphButton_Click(object sender, EventArgs e) {
-      openFileDialog.Title = "Open Operator Graph";
-      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        OperatorGraph operatorGraph = null;
-        try {
-          operatorGraph = XmlParser.Deserialize(openFileDialog.FileName) as OperatorGraph;
-        }
-        catch (Exception ex) {
-          Auxiliary.ShowErrorMessageBox(ex);
-        }
-        if (operatorGraph == null)
-          MessageBox.Show(this, "Selected file does not contain an operator graph.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        else
-          Content.OperatorGraph = operatorGraph;
-      }
-    }
-    protected void saveOperatorGraphButton_Click(object sender, EventArgs e) {
-      saveFileDialog.Title = "Save Operator Graph";
-      if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {
-        try {
-          if (saveFileDialog.FilterIndex == 1)
-            XmlGenerator.Serialize(Content.OperatorGraph, saveFileDialog.FileName, 0);
-          else
-            XmlGenerator.Serialize(Content.OperatorGraph, saveFileDialog.FileName, 9);
-        }
-        catch (Exception ex) {
-          Auxiliary.ShowErrorMessageBox(ex);
-        }
-      }
-    }
     protected virtual void startButton_Click(object sender, EventArgs e) {
       Content.Start();
@@ -211 +154 @@
     protected virtual void stopButton_Click(object sender, EventArgs e) {
       Content.Stop();
-    }
-    protected virtual void resetButton_Click(object sender, EventArgs e) {
-      Content.Prepare();
     }
     #endregion
@@ -224 +164 @@
         executionTimeTextBox.Text = Content.ExecutionTime.ToString();
     }
+    protected virtual void Log(string message) {
+      if (InvokeRequired)
+        Invoke(new Action<string>(Log), message);
+      else {
+        message = DateTime.Now.ToString() + "\t" + message;
+        string[] newLines = message.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
+        string[] lines = new string[logTextBox.Lines.Length + newLines.Length];
+        logTextBox.Lines.CopyTo(lines, 0);
+        newLines.CopyTo(lines, logTextBox.Lines.Length);
+        logTextBox.Lines = lines;
+      }
+    }
     #endregion
   }

trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemView.cs

@@ -92 +92 @@
 
     protected virtual void nameTextBox_Validating(object sender, CancelEventArgs e) {
-      if (Content.CanChangeName) {
+      if ((Content != null) && (Content.CanChangeName)) {
         Content.Name = nameTextBox.Text;
 

trunk/sources/HeuristicLab.Core.Views/3.3/ViewHost.Designer.cs

@@ -82 +82 @@
       this.viewsLabel.Size = new System.Drawing.Size(16, 16);
       this.viewsLabel.TabIndex = 0;
-      this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view.\r\nRight-click to change current view.");
+      this.toolTip.SetToolTip(this.viewsLabel, "Double-click to open a new window of the current view." + System.Environment.NewLine + "Right-click to change current view.");
       this.viewsLabel.DoubleClick += new System.EventHandler(this.viewsLabel_DoubleClick);
       //