Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7816


Ignore:
Timestamp:
05/14/12 17:58:58 (12 years ago)
Author:
spimming
Message:

#1807:

  • moved banner to wizardpage
  • set dock style when setting active page
  • set content in problem view
Location:
branches/DataAnalysisService
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj

    r7808 r7816  
    108108    <Compile Include="DataAnalysisExperimentWizard.cs" />
    109109    <Compile Include="ExperimentWizardMenuItem.cs" />
     110    <Compile Include="Plugin.cs" />
    110111    <Compile Include="ProblemDataPage.cs">
    111112      <SubType>UserControl</SubType>
    … …  
    121122  </ItemGroup>
    122123  <ItemGroup>
     124    <EmbeddedResource Include="ProblemDataPage.resx">
     125      <DependentUpon>ProblemDataPage.cs</DependentUpon>
     126    </EmbeddedResource>
     127  </ItemGroup>
     128  <ItemGroup>
    123129    <ProjectReference Include="..\..\HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard\3.3\HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.csproj">
    124130      <Project>{77169FE1-C48A-49AE-A0DD-67921D7835AB}</Project>
    125131      <Name>HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard</Name>
    126132    </ProjectReference>
    127   </ItemGroup>
    128   <ItemGroup>
    129     <EmbeddedResource Include="ProblemDataPage.resx">
    130       <DependentUpon>ProblemDataPage.cs</DependentUpon>
    131     </EmbeddedResource>
    132133  </ItemGroup>
    133134  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/ProblemDataPage.Designer.cs

    r7808 r7816  
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       this.wizardBanner1 = new HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.Controls.WizardBanner();
    2726      this.dataAnalysisProblemView = new HeuristicLab.Problems.DataAnalysis.Views.DataAnalysisProblemView();
    2827      this.SuspendLayout();
    2928      //
    30       // wizardBanner1
     29      // wizardBanner
    3130      //
    32       this.wizardBanner1.BackColor = System.Drawing.SystemColors.Window;
    33       this.wizardBanner1.Dock = System.Windows.Forms.DockStyle.Top;
    34       this.wizardBanner1.Location = new System.Drawing.Point(0, 0);
    35       this.wizardBanner1.Name = "wizardBanner1";
    36       this.wizardBanner1.Size = new System.Drawing.Size(713, 81);
    37       this.wizardBanner1.Subtitle = "Please select file ...";
    38       this.wizardBanner1.TabIndex = 0;
    39       this.wizardBanner1.Title = "Problem Data";
     31      this.wizardBanner.Size = new System.Drawing.Size(640, 81);
    4032      //
    4133      // dataAnalysisProblemView
    … …  
    4739      this.dataAnalysisProblemView.Name = "dataAnalysisProblemView";
    4840      this.dataAnalysisProblemView.ReadOnly = false;
    49       this.dataAnalysisProblemView.Size = new System.Drawing.Size(713, 371);
     41      this.dataAnalysisProblemView.Size = new System.Drawing.Size(640, 399);
    5042      this.dataAnalysisProblemView.TabIndex = 1;
    5143      //
    … …  
    5345      //
    5446      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     47      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    5548      this.Controls.Add(this.dataAnalysisProblemView);
    56       this.Controls.Add(this.wizardBanner1);
    5749      this.Name = "ProblemDataPage";
    58       this.Size = new System.Drawing.Size(713, 452);
     50      this.Size = new System.Drawing.Size(640, 480);
    5951      this.SetActive += new System.ComponentModel.CancelEventHandler(this.ProblemDataPage_SetActive);
     52      this.Controls.SetChildIndex(this.wizardBanner, 0);
     53      this.Controls.SetChildIndex(this.dataAnalysisProblemView, 0);
    6054      this.ResumeLayout(false);
    6155
    … …  
    6458    #endregion
    6559
    66     private Wizard.Controls.WizardBanner wizardBanner1;
    6760    private Problems.DataAnalysis.Views.DataAnalysisProblemView dataAnalysisProblemView;
    6861

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/ProblemDataPage.cs

    r7808 r7816  
    11using System.ComponentModel;
     2using HeuristicLab.Problems.DataAnalysis;
    23
    34namespace HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard {
    … …  
    56    public ProblemDataPage() {
    67      InitializeComponent();
     8      dataAnalysisProblemView.Content = new RegressionProblem();
    79    }
    810

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.csproj

    r7808 r7816  
    3838  </PropertyGroup>
    3939  <ItemGroup>
     40    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    4041    <Reference Include="System" />
    4142    <Reference Include="System.Core" />
    … …  
    6162      <DependentUpon>WizardBanner.cs</DependentUpon>
    6263    </Compile>
     64    <Compile Include="Plugin.cs" />
    6365    <Compile Include="Properties\AssemblyInfo.cs" />
    6466    <Compile Include="WizardBase.cs">
    … …  
    8688      <DependentUpon>WizardBase.cs</DependentUpon>
    8789    </EmbeddedResource>
     90    <EmbeddedResource Include="WizardPage.resx">
     91      <DependentUpon>WizardPage.cs</DependentUpon>
     92    </EmbeddedResource>
    8893  </ItemGroup>
    8994  <ItemGroup>

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/WizardBase.Designer.cs

    r7808 r7816  
    113113      this.etchedLine1.TabIndex = 0;
    114114      //
    115       // Wizard
     115      // WizardBase
    116116      //
    117117      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    … …  
    121121      this.Controls.Add(this.controlPanel);
    122122      this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
    123       this.Name = "Wizard";
     123      this.Name = "WizardBase";
    124124      this.Text = "Wizard";
    125125      this.Load += new System.EventHandler(this.Wizard_Load);

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/WizardBase.cs

    r7808 r7816  
    6060      }
    6161      page.Visible = true;
     62      page.Dock = DockStyle.Fill;
    6263      activePage = page;
    6364

  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard/3.3/WizardPage.Designer.cs

    r7803 r7816  
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       components = new System.ComponentModel.Container();
     26      this.wizardBanner = new HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard.Controls.WizardBanner();
     27      this.SuspendLayout();
     28      //
     29      // wizardBanner
     30      //
     31      this.wizardBanner.BackColor = System.Drawing.SystemColors.Window;
     32      this.wizardBanner.Dock = System.Windows.Forms.DockStyle.Top;
     33      this.wizardBanner.Location = new System.Drawing.Point(0, 0);
     34      this.wizardBanner.Name = "wizardBanner";
     35      this.wizardBanner.Size = new System.Drawing.Size(320, 81);
     36      this.wizardBanner.Subtitle = "Subtitle";
     37      this.wizardBanner.TabIndex = 0;
     38      this.wizardBanner.Title = "Title";
     39      //
     40      // WizardPage
     41      //
     42      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    2743      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     44      this.Controls.Add(this.wizardBanner);
     45      this.Name = "WizardPage";
     46      this.Size = new System.Drawing.Size(320, 240);
     47      this.ResumeLayout(false);
     48
    2849    }
    2950
    3051    #endregion
     52
     53    public Controls.WizardBanner wizardBanner;
     54
    3155  }
    3256}
Note: See TracChangeset for help on using the changeset viewer.