Changeset 6471


Ignore:
Timestamp:
06/22/11 17:16:45 (9 years ago)
Author:
mkommend
Message:

#1555: Implemented experiment tree view.

Location:
trunk/sources
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentView.Designer.cs

    r6425 r6471  
    4747      this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
    4848      this.optimizersTabPage = new System.Windows.Forms.TabPage();
    49       this.optimizerListView = new HeuristicLab.Optimization.Views.OptimizerListView();
    5049      this.runsTabPage = new System.Windows.Forms.TabPage();
    5150      this.runsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     51      this.experimentTreeView = new HeuristicLab.Optimization.Views.ExperimentTreeView();
    5252      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5353      this.tabControl.SuspendLayout();
     
    111111      // optimizersTabPage
    112112      //
    113       this.optimizersTabPage.Controls.Add(this.optimizerListView);
     113      this.optimizersTabPage.Controls.Add(this.experimentTreeView);
    114114      this.optimizersTabPage.Location = new System.Drawing.Point(4, 22);
    115115      this.optimizersTabPage.Name = "optimizersTabPage";
     
    119119      this.optimizersTabPage.Text = "Optimizers";
    120120      this.optimizersTabPage.UseVisualStyleBackColor = true;
    121       //
    122       // optimizerListView
    123       //
    124       this.optimizerListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    125             | System.Windows.Forms.AnchorStyles.Left)
    126             | System.Windows.Forms.AnchorStyles.Right)));
    127       this.optimizerListView.Caption = "OptimizerList View";
    128       this.optimizerListView.Content = null;
    129       this.optimizerListView.Location = new System.Drawing.Point(6, 6);
    130       this.optimizerListView.Name = "optimizerListView";
    131       this.optimizerListView.ReadOnly = false;
    132       this.optimizerListView.Size = new System.Drawing.Size(659, 389);
    133       this.optimizerListView.TabIndex = 0;
    134121      //
    135122      // runsTabPage
     
    159146      this.runsViewHost.ViewsLabelVisible = true;
    160147      this.runsViewHost.ViewType = null;
     148      //
     149      // experimentTreeView
     150      //
     151      this.experimentTreeView.Caption = "Experiment View";
     152      this.experimentTreeView.Content = null;
     153      this.experimentTreeView.Dock = System.Windows.Forms.DockStyle.Fill;
     154      this.experimentTreeView.Location = new System.Drawing.Point(3, 3);
     155      this.experimentTreeView.Name = "experimentTreeView";
     156      this.experimentTreeView.ReadOnly = false;
     157      this.experimentTreeView.Size = new System.Drawing.Size(665, 395);
     158      this.experimentTreeView.TabIndex = 0;
    161159      //
    162160      // ExperimentView
     
    189187    private HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl;
    190188    private System.Windows.Forms.TabPage optimizersTabPage;
    191     private OptimizerListView optimizerListView;
    192189    private System.Windows.Forms.TabPage runsTabPage;
    193190    private HeuristicLab.MainForm.WindowsForms.ViewHost runsViewHost;
     191    private ExperimentTreeView experimentTreeView;
    194192
    195193  }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/ExperimentView.cs

    r6425 r6471  
    4141      base.OnContentChanged();
    4242      if (Content == null) {
    43         optimizerListView.Content = null;
     43        experimentTreeView.Content = null;
    4444        runsViewHost.Content = null;
    4545      } else {
    46         optimizerListView.Content = Content.Optimizers;
     46        experimentTreeView.Content = Content;
    4747        runsViewHost.Content = Content.Runs;
    4848      }
     
    5151    protected override void SetEnabledStateOfControls() {
    5252      base.SetEnabledStateOfControls();
    53       optimizerListView.Enabled = Content != null;
     53      experimentTreeView.Enabled = Content != null;
    5454      runsViewHost.Enabled = Content != null;
    5555    }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r6425 r6471  
    128128      <DependentUpon>BatchRunView.cs</DependentUpon>
    129129    </Compile>
     130    <Compile Include="ExperimentTreeView.cs">
     131      <SubType>UserControl</SubType>
     132    </Compile>
     133    <Compile Include="ExperimentTreeView.Designer.cs">
     134      <DependentUpon>ExperimentTreeView.cs</DependentUpon>
     135    </Compile>
    130136    <Compile Include="IOptimizerView.cs">
    131137      <SubType>UserControl</SubType>
  • trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

    r5445 r6471  
    220220        if (clearRuns) runs.Clear();
    221221        Optimizer.Prepare(clearRuns);
     222      } else {
     223        ExecutionState = ExecutionState.Stopped;
    222224      }
    223225    }
Note: See TracChangeset for help on using the changeset viewer.