Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/29/10 16:58:35 (14 years ago)
Author:
cneumuel
Message:

further improvement and stabilisation of HiveExperiment (#1115)

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3

    • Property svn:ignore

      •  

        old new  
        11bin
        22obj
         3HeuristicLab.Hive.Experiment.Views-3.3.csproj.user

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HeuristicLab.Hive.Experiment.Views-3.3.csproj

    r4119 r4120  
    7373      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    7474    </Reference>
    75     <Reference Include="HeuristicLab.Hive.Experiment.Views-3.3, Version=3.3.0.4111, Culture=neutral, processorArchitecture=MSIL" />
     75    <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.4091, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     76    <Reference Include="HeuristicLab.Hive.Experiment.Views-3.3, Version=3.3.0.4119, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    7677    <Reference Include="HeuristicLab.Hive.Server.Console-3.3">
    7778      <HintPath>..\..\HeuristicLab.Hive.Server.Console\3.3\obj\Debug\HeuristicLab.Hive.Server.Console-3.3.dll</HintPath>
    … …  
    9293      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    9394    </Reference>
     95    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    9496    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    9597      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    … …  
    101103    <Reference Include="System.Xml.Linq" />
    102104    <Reference Include="System.Data.DataSetExtensions" />
    103     <Reference Include="Microsoft.CSharp" />
    104105    <Reference Include="System.Data" />
    105106    <Reference Include="System.Xml" />
    … …  
    113114      <DependentUpon>HiveExperimentView.cs</DependentUpon>
    114115    </Compile>
     116    <Compile Include="JobItemListView.cs">
     117      <SubType>UserControl</SubType>
     118    </Compile>
     119    <Compile Include="JobItemListView.Designer.cs">
     120      <DependentUpon>JobItemListView.cs</DependentUpon>
     121    </Compile>
     122    <Compile Include="JobItemView.cs">
     123      <SubType>UserControl</SubType>
     124    </Compile>
     125    <Compile Include="JobItemView.Designer.cs">
     126      <DependentUpon>JobItemView.cs</DependentUpon>
     127    </Compile>
    115128    <Compile Include="Properties\AssemblyInfo.cs" />
    116129  </ItemGroup>
    … …  
    120133  </ItemGroup>
    121134  <ItemGroup>
     135    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
     136      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
     137      <Name>HeuristicLab.Hive.Contracts-3.3</Name>
     138    </ProjectReference>
    122139    <ProjectReference Include="..\..\HeuristicLab.Hive.Experiment\3.3\HeuristicLab.Hive.Experiment-3.3.csproj">
    123140      <Project>{A84C0A25-13D0-40A6-924F-53556D9691DC}</Project>
    124141      <Name>HeuristicLab.Hive.Experiment-3.3</Name>
     142    </ProjectReference>
     143    <ProjectReference Include="..\..\HeuristicLab.Hive.JobBase\3.3\HeuristicLab.Hive.JobBase-3.3.csproj">
     144      <Project>{21187322-52DD-4243-80A4-A85F0263E63B}</Project>
     145      <Name>HeuristicLab.Hive.JobBase-3.3</Name>
    125146    </ProjectReference>
    126147  </ItemGroup>
    … …  
    128149    <EmbeddedResource Include="HiveExperimentView.resx">
    129150      <DependentUpon>HiveExperimentView.cs</DependentUpon>
     151    </EmbeddedResource>
     152    <EmbeddedResource Include="JobItemView.resx">
     153      <DependentUpon>JobItemView.cs</DependentUpon>
    130154    </EmbeddedResource>
    131155  </ItemGroup>

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.Designer.cs

    r4116 r4120  
    5353      this.loadExperimentButton = new System.Windows.Forms.Button();
    5454      this.hiveStatusTabPage = new System.Windows.Forms.TabPage();
     55      this.jobListView = new HeuristicLab.Hive.Experiment.Views.JobItemListView();
     56      this.logTabPage = new System.Windows.Forms.TabPage();
     57      this.logView = new HeuristicLab.Core.Views.LogView();
    5558      this.startButton = new System.Windows.Forms.Button();
    5659      this.stopButton = new System.Windows.Forms.Button();
    … …  
    6669      this.tabControl.SuspendLayout();
    6770      this.experimentTabPage.SuspendLayout();
     71      this.hiveStatusTabPage.SuspendLayout();
     72      this.logTabPage.SuspendLayout();
    6873      this.SuspendLayout();
    6974      //
    … …  
    8590      this.tabControl.Controls.Add(this.experimentTabPage);
    8691      this.tabControl.Controls.Add(this.hiveStatusTabPage);
    87       this.tabControl.Location = new System.Drawing.Point(0, 135);
     92      this.tabControl.Controls.Add(this.logTabPage);
     93      this.tabControl.Location = new System.Drawing.Point(0, 99);
    8894      this.tabControl.Name = "tabControl";
    8995      this.tabControl.SelectedIndex = 0;
    90       this.tabControl.Size = new System.Drawing.Size(735, 359);
     96      this.tabControl.Size = new System.Drawing.Size(735, 395);
    9197      this.tabControl.TabIndex = 4;
    9298      //
    … …  
    100106      this.experimentTabPage.Name = "experimentTabPage";
    101107      this.experimentTabPage.Padding = new System.Windows.Forms.Padding(3);
    102       this.experimentTabPage.Size = new System.Drawing.Size(727, 333);
     108      this.experimentTabPage.Size = new System.Drawing.Size(727, 369);
    103109      this.experimentTabPage.TabIndex = 1;
    104110      this.experimentTabPage.Text = "Experiment";
    … …  
    149155      // hiveStatusTabPage
    150156      //
     157      this.hiveStatusTabPage.Controls.Add(this.jobListView);
    151158      this.hiveStatusTabPage.Location = new System.Drawing.Point(4, 22);
    152159      this.hiveStatusTabPage.Name = "hiveStatusTabPage";
    153160      this.hiveStatusTabPage.Padding = new System.Windows.Forms.Padding(3);
    154       this.hiveStatusTabPage.Size = new System.Drawing.Size(727, 333);
     161      this.hiveStatusTabPage.Size = new System.Drawing.Size(727, 369);
    155162      this.hiveStatusTabPage.TabIndex = 2;
    156163      this.hiveStatusTabPage.Text = "HiveStatus";
    157164      this.hiveStatusTabPage.UseVisualStyleBackColor = true;
     165      //
     166      // jobListView
     167      //
     168      this.jobListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     169                  | System.Windows.Forms.AnchorStyles.Left)
     170                  | System.Windows.Forms.AnchorStyles.Right)));
     171      this.jobListView.Caption = "JobList View";
     172      this.jobListView.Content = null;
     173      this.jobListView.Location = new System.Drawing.Point(3, 6);
     174      this.jobListView.Name = "jobListView";
     175      this.jobListView.ReadOnly = false;
     176      this.jobListView.Size = new System.Drawing.Size(721, 360);
     177      this.jobListView.TabIndex = 0;
     178      //
     179      // logTabPage
     180      //
     181      this.logTabPage.Controls.Add(this.logView);
     182      this.logTabPage.Location = new System.Drawing.Point(4, 22);
     183      this.logTabPage.Name = "logTabPage";
     184      this.logTabPage.Size = new System.Drawing.Size(727, 369);
     185      this.logTabPage.TabIndex = 3;
     186      this.logTabPage.Text = "Log";
     187      this.logTabPage.UseVisualStyleBackColor = true;
     188      //
     189      // logView
     190      //
     191      this.logView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     192                  | System.Windows.Forms.AnchorStyles.Left)
     193                  | System.Windows.Forms.AnchorStyles.Right)));
     194      this.logView.Caption = "Log View";
     195      this.logView.Content = null;
     196      this.logView.Location = new System.Drawing.Point(3, 4);
     197      this.logView.Name = "logView";
     198      this.logView.ReadOnly = false;
     199      this.logView.Size = new System.Drawing.Size(721, 362);
     200      this.logView.TabIndex = 0;
    158201      //
    159202      // startButton
    … …  
    300343      this.tabControl.ResumeLayout(false);
    301344      this.experimentTabPage.ResumeLayout(false);
     345      this.hiveStatusTabPage.ResumeLayout(false);
     346      this.logTabPage.ResumeLayout(false);
    302347      this.ResumeLayout(false);
    303348      this.PerformLayout();
    … …  
    323368    private System.Windows.Forms.Button loadExperimentButton;
    324369    private Core.Views.NamedItemView experimentNamedItemView;
     370    private System.Windows.Forms.TabPage logTabPage;
     371    private Core.Views.LogView logView;
     372    private JobItemListView jobListView;
    325373
    326374  }

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.cs

    r4119 r4120  
    8181        serverUrlTextBox.Text = Content.ServerUrl;
    8282        experimentNamedItemView.Content = Content.Experiment;
     83        logView.Content = Content.Log;
     84        jobListView.Content = Content.JobItems;
    8385      }
    8486    }
    … …  
    104106        Content.Prepare();
    105107      }
    106       SetEnabledStateOfExecutableButtons();
     108      SetEnabledStateOfControls();
    107109    }
    108110
    … …  
    189191        stopButton.Enabled = (Content.ExecutionState == ExecutionState.Started) || (Content.ExecutionState == ExecutionState.Paused);
    190192        resetButton.Enabled = Content.ExecutionState != ExecutionState.Started;
     193       
    191194      }
    192195    }

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/HiveExperimentView.resx

    r4116 r4120  
    128128    <value>
    129129        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    130         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
    131         CwsBbQSEtwAAALZJREFUOE9j/P//PwNFAGQAOi7bn+2GTRybGIZmkKKEGRH/iTUEpwGWZfpEGYLVgKgp
     130        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
     131        CwgBwL2l2gAAALZJREFUOE9j/P//PwNFAGQAOi7bn+2GTRybGIZmkKKEGRH/iTUEpwGWZfpEGYLVgKgp
    132132        Qf833Fr8nxhDsBoQPMEbZDtRhmA1wKfLGWwACEctCsDrEqwGODZb/M/YEAvWbNus/1+nWOG/RBo3iFZD
    133133        jwmsBpjX6KFo5k9gwaoZnIawxa1eqTLcZnyacRqgki8FdjYhzTgNkM4QJEozTgNEkjlx+pmoQMQW2rjy
    … …  
    138138    <value>
    139139        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    140         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
    141         CwsBbQSEtwAAAXJJREFUOE+tkj1IQmEYhWsoaIi2xmhpiYSgKFoiCMLJJYSEJiEI0mgIyqjA6vaLUKIU
     140        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
     141        CwgBwL2l2gAAAXJJREFUOE+tkj1IQmEYhWsoaIi2xmhpiYSgKFoiCMLJJYSEJiEI0mgIyqjA6vaLUKIU
    142142        iZlJKKUoWEbZDzVYCYlQYVxcNDIoRND8ud7idD83C27g7YNvPM8573nfcgBlgh4BCPmCxIX0Qtx/ATTu
    143143        Lyy78ph3ZKC2pTBlSWB86w2jhleMrD9jWB9N/jQsSkDEj5FPPERZ+J7yOL5j4PYzsPsYGL1piKR7nL64
    … …  
    151151    <value>
    152152        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    153         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
    154         CwsBbQSEtwAAAYNJREFUOE9j/P//PwNFAGQAJZgizWDXI9veu/nvfxhuW/vtf+OKz/9rF7//XzHv1f+S
     153        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
     154        CwgBwL2l2gAAAYNJREFUOE9j/P//PwNFAGQAJZgizWDXI9veu/nvfxhuW/vtf+OKz/9rF7//XzHv1f+S
    155155        2c//F0x//L901mOgFoSrUQzo2vDr/6aT3/6vPPTl/4I9n/5ffvDzf+/ad/+bl74BG5I3/cV/3dBVuA0A
    156156        2bri4Jf/83Z9+n/ryS+Qwv8NS978L5378n/O1Of/k3qf/Vf1W4TbAJCT5+z49P/hyx9gzSBQMvvl/6wp
    … …  
    164164    <value>
    165165        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    166         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCwAA
    167         CwsBbQSEtwAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB
     166        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
     167        CwgBwL2l2gAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB
    168168        SPPVh3/+64auAqr9z4DOJ2hA29pv/289/f1f1W8R2AB0PkEDGld8/n/54e//cm6zwAag8wkaULv4/f8T
    169169        13//F7ObBDYAnU/QgIp5r/7vvvDzP79ZN9gAdD5BA0pmP/+//uTP/5wGrWAD0PkEDSiY/vj/gj2f/7Pq

  • branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3/Properties/AssemblyInfo.cs

    r4119 r4120  
    5555// You can specify all the values or you can default the Revision and Build Numbers
    5656// by using the '*' as shown below:
    57 [assembly: AssemblyVersion("3.3.0.4116")]
    58 [assembly: AssemblyFileVersion("3.3.0.4116")]
    59 [assembly: AssemblyBuildDate("2010/07/28 17:42:56")]
     57[assembly: AssemblyVersion("3.3.0.4119")]
     58[assembly: AssemblyFileVersion("3.3.0.4119")]
     59[assembly: AssemblyBuildDate("2010/07/29 16:49:22")]
Note: See TracChangeset for help on using the changeset viewer.