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

Timestamp:

02/19/10 06:19:16 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on operators, engines, and optimization

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• EngineView.Designer.cs (modified) (8 diffs)
• EngineView.cs (modified) (9 diffs)
• HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)

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

@@ -54 +54 @@
       this.startButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.newProblemButton = new System.Windows.Forms.Button();
-      this.openProblemButton = new System.Windows.Forms.Button();
-      this.saveProblemButton = new System.Windows.Forms.Button();
       this.newOperatorGraphButton = new System.Windows.Forms.Button();
       this.openOperatorGraphButton = new System.Windows.Forms.Button();
@@ -64 +61 @@
       this.operatorGraphViewHost = new HeuristicLab.Core.Views.ViewHost();
       this.globalScopeTabPage = new System.Windows.Forms.TabPage();
-      this.problemTabPage = new System.Windows.Forms.TabPage();
-      this.problemViewHost = new HeuristicLab.Core.Views.ViewHost();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
       this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
@@ -71 +66 @@
       this.operatorGraphTabPage.SuspendLayout();
       this.globalScopeTabPage.SuspendLayout();
-      this.problemTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -142 +136 @@
       this.startButton.Click += new System.EventHandler(this.startButton_Click);
       // 
-      // newProblemButton
-      // 
-      this.newProblemButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.NewDocument;
-      this.newProblemButton.Location = new System.Drawing.Point(6, 6);
-      this.newProblemButton.Name = "newProblemButton";
-      this.newProblemButton.Size = new System.Drawing.Size(24, 24);
-      this.newProblemButton.TabIndex = 0;
-      this.toolTip.SetToolTip(this.newProblemButton, "Create New Problem");
-      this.newProblemButton.UseVisualStyleBackColor = true;
-      this.newProblemButton.Click += new System.EventHandler(this.newProblemButton_Click);
-      // 
-      // openProblemButton
-      // 
-      this.openProblemButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
-      this.openProblemButton.Location = new System.Drawing.Point(36, 6);
-      this.openProblemButton.Name = "openProblemButton";
-      this.openProblemButton.Size = new System.Drawing.Size(24, 24);
-      this.openProblemButton.TabIndex = 1;
-      this.toolTip.SetToolTip(this.openProblemButton, "Open Problem");
-      this.openProblemButton.UseVisualStyleBackColor = true;
-      this.openProblemButton.Click += new System.EventHandler(this.openProblemButton_Click);
-      // 
-      // saveProblemButton
-      // 
-      this.saveProblemButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Save;
-      this.saveProblemButton.Location = new System.Drawing.Point(66, 6);
-      this.saveProblemButton.Name = "saveProblemButton";
-      this.saveProblemButton.Size = new System.Drawing.Size(24, 24);
-      this.saveProblemButton.TabIndex = 2;
-      this.toolTip.SetToolTip(this.saveProblemButton, "Save Problem");
-      this.saveProblemButton.UseVisualStyleBackColor = true;
-      this.saveProblemButton.Click += new System.EventHandler(this.saveProblemButton_Click);
-      // 
       // newOperatorGraphButton
       // 
@@ -215 +176 @@
       this.tabControl.Controls.Add(this.operatorGraphTabPage);
       this.tabControl.Controls.Add(this.globalScopeTabPage);
-      this.tabControl.Controls.Add(this.problemTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 0);
       this.tabControl.Name = "tabControl";
@@ -258 +218 @@
       this.globalScopeTabPage.Text = "Global Scope";
       this.globalScopeTabPage.UseVisualStyleBackColor = true;
-      // 
-      // problemTabPage
-      // 
-      this.problemTabPage.Controls.Add(this.saveProblemButton);
-      this.problemTabPage.Controls.Add(this.openProblemButton);
-      this.problemTabPage.Controls.Add(this.newProblemButton);
-      this.problemTabPage.Controls.Add(this.problemViewHost);
-      this.problemTabPage.Location = new System.Drawing.Point(4, 22);
-      this.problemTabPage.Name = "problemTabPage";
-      this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.problemTabPage.Size = new System.Drawing.Size(794, 584);
-      this.problemTabPage.TabIndex = 2;
-      this.problemTabPage.Text = "Problem";
-      this.problemTabPage.UseVisualStyleBackColor = true;
-      // 
-      // problemViewHost
-      // 
-      this.problemViewHost.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.problemViewHost.Content = null;
-      this.problemViewHost.Location = new System.Drawing.Point(6, 36);
-      this.problemViewHost.Name = "problemViewHost";
-      this.problemViewHost.Size = new System.Drawing.Size(782, 542);
-      this.problemViewHost.TabIndex = 3;
-      this.problemViewHost.ViewType = null;
       // 
       // openFileDialog
@@ -315 +249 @@
       this.operatorGraphTabPage.ResumeLayout(false);
       this.globalScopeTabPage.ResumeLayout(false);
-      this.problemTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -332 +265 @@
     protected System.Windows.Forms.TabControl tabControl;
     protected System.Windows.Forms.TabPage globalScopeTabPage;
-    protected System.Windows.Forms.TabPage problemTabPage;
-    protected ViewHost problemViewHost;
-    protected System.Windows.Forms.Button newProblemButton;
-    protected System.Windows.Forms.Button saveProblemButton;
-    protected System.Windows.Forms.Button openProblemButton;
     protected System.Windows.Forms.OpenFileDialog openFileDialog;
     protected System.Windows.Forms.SaveFileDialog saveFileDialog;

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

@@ -62 +62 @@
     protected override void DeregisterContentEvents() {
       Content.OperatorGraphChanged -= new EventHandler(Content_OperatorGraphChanged);
-      Content.ProblemChanged -= new EventHandler(Content_ProblemChanged);
       Content.Prepared -= new EventHandler(Content_Prepared);
       Content.Started -= new EventHandler(Content_Started);
@@ -78 +77 @@
       base.RegisterContentEvents();
       Content.OperatorGraphChanged += new EventHandler(Content_OperatorGraphChanged);
-      Content.ProblemChanged += new EventHandler(Content_ProblemChanged);
       Content.Prepared += new EventHandler(Content_Prepared);
       Content.Started += new EventHandler(Content_Started);
@@ -97 +95 @@
         operatorGraphViewHost.Enabled = false;
         scopeView.Enabled = false;
-        newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
-        problemViewHost.Enabled = false;
         startButton.Enabled = resetButton.Enabled = false;
         executionTimeTextBox.Enabled = false;
@@ -107 +103 @@
         scopeView.Content = Content.GlobalScope;
         scopeView.Enabled = true;
-        newProblemButton.Enabled = openProblemButton.Enabled = true;
-        saveProblemButton.Enabled = Content.Problem != null;
-        problemViewHost.Content = Content.Problem;
-        problemViewHost.Enabled = true;
         startButton.Enabled = !Content.Finished;
         resetButton.Enabled = true;
@@ -124 +116 @@
       else
         operatorGraphViewHost.Content = Content.OperatorGraph;
-    }
-    protected void Content_ProblemChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_ProblemChanged), sender, e);
-      else {
-        saveProblemButton.Enabled = Content.Problem != null;
-        problemViewHost.Content = Content.Problem;
-      }
     }
     protected virtual void Content_Prepared(object sender, EventArgs e) {
@@ -140 +124 @@
         operatorGraphViewHost.Enabled = true;
         scopeView.Enabled = true;
-        newProblemButton.Enabled = openProblemButton.Enabled = true;
-        saveProblemButton.Enabled = Content.Problem != null;
-        problemViewHost.Enabled = true;
         startButton.Enabled = !Content.Finished;
         stopButton.Enabled = false;
@@ -157 +138 @@
         operatorGraphViewHost.Enabled = false;
         scopeView.Enabled = false;
-        newProblemButton.Enabled = openProblemButton.Enabled = saveProblemButton.Enabled = false;
-        problemViewHost.Enabled = false;
         startButton.Enabled = false;
         stopButton.Enabled = true;
@@ -172 +151 @@
         operatorGraphViewHost.Enabled = true;
         scopeView.Enabled = true;
-        newProblemButton.Enabled = openProblemButton.Enabled = true;
-        saveProblemButton.Enabled = Content.Problem != null;
-        problemViewHost.Enabled = true;
         startButton.Enabled = !Content.Finished;
         stopButton.Enabled = false;
@@ -230 +206 @@
       }
     }
-    protected void newProblemButton_Click(object sender, EventArgs e) {
-      if (typeSelectorDialog == null) {
-        typeSelectorDialog = new TypeSelectorDialog();
-      }
-      typeSelectorDialog.Caption = "Select Problem";
-      typeSelectorDialog.TypeSelector.Configure(typeof(IProblem), false, false);
-
-      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
-        Content.Problem = (IProblem)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
-      }
-    }
-    protected void openProblemButton_Click(object sender, EventArgs e) {
-      openFileDialog.Title = "Open Problem";
-      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        IProblem problem = null;
-        try {
-          problem = XmlParser.Deserialize(openFileDialog.FileName) as IProblem;
-        }
-        catch (Exception ex) {
-          Auxiliary.ShowErrorMessageBox(ex);
-        }
-        if (problem == null)
-          MessageBox.Show(this, "Selected file does not contain a problem.", "Invalid File", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        else
-          Content.Problem = problem;
-      }
-    }
-    protected void saveProblemButton_Click(object sender, EventArgs e) {
-      saveFileDialog.Title = "Save Problem";
-      if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {
-        try {
-          if (saveFileDialog.FilterIndex == 1)
-            XmlGenerator.Serialize(Content.Problem, saveFileDialog.FileName, 0);
-          else
-            XmlGenerator.Serialize(Content.Problem, saveFileDialog.FileName, 9);
-        }
-        catch (Exception ex) {
-          Auxiliary.ShowErrorMessageBox(ex);
-        }
-      }
-    }
     protected virtual void startButton_Click(object sender, EventArgs e) {
       Content.Start();

trunk/sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -131 +131 @@
       <DependentUpon>OperatorTreeView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ProblemView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ProblemView.Designer.cs">
-      <DependentUpon>ProblemView.cs</DependentUpon>
-    </Compile>
     <Compile Include="TypeSelectorDialog.cs">
       <SubType>Form</SubType>