Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/02/10 17:27:24 (14 years ago)
Author:
cneumuel
Message:
  • Made HiveExperiment storable, so that a running HiveExperiment can be disconnected, stored and later resumed. (#1115)
  • Added Log to each JobItem (#1115)
Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

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

    r4121 r4133  
    7373      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    7474    </Reference>
    75     <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.4091, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    76       <SpecificVersion>False</SpecificVersion>
    77     </Reference>
    7875    <Reference Include="HeuristicLab.MainForm-3.3">
    7976      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
    … …  
    9188      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    9289    </Reference>
    93     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     90    <Reference Include="HeuristicLab.Persistence-3.3">
    9491      <SpecificVersion>False</SpecificVersion>
    9592    </Reference>
    … …  
    128125    </Compile>
    129126    <Compile Include="Properties\AssemblyInfo.cs" />
     127    <Compile Include="Properties\Resources.Designer.cs">
     128      <AutoGen>True</AutoGen>
     129      <DesignTime>True</DesignTime>
     130      <DependentUpon>Resources.resx</DependentUpon>
     131    </Compile>
    130132  </ItemGroup>
    131133  <ItemGroup>
    … …  
    134136  </ItemGroup>
    135137  <ItemGroup>
     138    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.3\HeuristicLab.DataAccess-3.3.csproj">
     139      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     140      <Name>HeuristicLab.DataAccess-3.3</Name>
     141    </ProjectReference>
    136142    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.3\HeuristicLab.Hive.Contracts-3.3.csproj">
    137143      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
    … …  
    154160      <DependentUpon>JobItemView.cs</DependentUpon>
    155161    </EmbeddedResource>
     162    <EmbeddedResource Include="Properties\Resources.resx">
     163      <Generator>ResXFileCodeGenerator</Generator>
     164      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     165    </EmbeddedResource>
    156166  </ItemGroup>
    157167  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

    r4120 r4133  
    6666      this.serverUrlTextBox = new System.Windows.Forms.TextBox();
    6767      this.resourceIdsTextBox = new System.Windows.Forms.TextBox();
     68      this.disconnectButton = new System.Windows.Forms.Button();
     69      this.reconnectButton = new System.Windows.Forms.Button();
    6870      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    6971      this.tabControl.SuspendLayout();
    … …  
    308310      this.resourceIdsTextBox.Validated += new System.EventHandler(this.resourceIdsTextBox_Validated);
    309311      //
     312      // disconnectButton
     313      //
     314      this.disconnectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     315      this.disconnectButton.Enabled = false;
     316      this.disconnectButton.Image = ((System.Drawing.Image)(resources.GetObject("disconnectButton.Image")));
     317      this.disconnectButton.Location = new System.Drawing.Point(120, 500);
     318      this.disconnectButton.Name = "disconnectButton";
     319      this.disconnectButton.Size = new System.Drawing.Size(24, 24);
     320      this.disconnectButton.TabIndex = 15;
     321      this.toolTip.SetToolTip(this.disconnectButton, "Disconnect from Hive (Jobs will be continue to be calculated)");
     322      this.disconnectButton.UseVisualStyleBackColor = true;
     323      this.disconnectButton.Click += new System.EventHandler(this.disconnectButton_Click);
     324      //
     325      // reconnectButton
     326      //
     327      this.reconnectButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     328      this.reconnectButton.Enabled = false;
     329      this.reconnectButton.Image = ((System.Drawing.Image)(resources.GetObject("reconnectButton.Image")));
     330      this.reconnectButton.Location = new System.Drawing.Point(150, 500);
     331      this.reconnectButton.Name = "reconnectButton";
     332      this.reconnectButton.Size = new System.Drawing.Size(24, 24);
     333      this.reconnectButton.TabIndex = 16;
     334      this.toolTip.SetToolTip(this.reconnectButton, "Reconnect to Hive");
     335      this.reconnectButton.UseVisualStyleBackColor = true;
     336      this.reconnectButton.Click += new System.EventHandler(this.reconnectButton_Click);
     337      //
    310338      // HiveExperimentView
    311339      //
    312340      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    313341      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     342      this.Controls.Add(this.reconnectButton);
     343      this.Controls.Add(this.disconnectButton);
    314344      this.Controls.Add(this.resourceIdsTextBox);
    315345      this.Controls.Add(this.serverUrlTextBox);
    … …  
    340370      this.Controls.SetChildIndex(this.serverUrlTextBox, 0);
    341371      this.Controls.SetChildIndex(this.resourceIdsTextBox, 0);
     372      this.Controls.SetChildIndex(this.disconnectButton, 0);
     373      this.Controls.SetChildIndex(this.reconnectButton, 0);
    342374      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    343375      this.tabControl.ResumeLayout(false);
    … …  
    371403    private Core.Views.LogView logView;
    372404    private JobItemListView jobListView;
     405    private System.Windows.Forms.Button disconnectButton;
     406    private System.Windows.Forms.Button reconnectButton;
    373407
    374408  }

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

    r4120 r4133  
    5858      Content.Stopped -= new EventHandler(Content_Stopped);
    5959      Content.ExperimentChanged -= new EventHandler(Content_ExperimentChanged);
     60      Content.IsResultsPollingChanged -= new EventHandler(Content_IsResultsPollingChanged);
    6061      base.DeregisterContentEvents();
    6162    }
     63
    6264    protected override void RegisterContentEvents() {
    6365      base.RegisterContentEvents();
    … …  
    6971      Content.Paused += new EventHandler(Content_Paused);
    7072      Content.Stopped += new EventHandler(Content_Stopped);
     73      Content.IsResultsPollingChanged += new EventHandler(Content_IsResultsPollingChanged);
    7174      Content.ExperimentChanged += new EventHandler(Content_ExperimentChanged);
    7275    }
    … …  
    130133      else {
    131134        nameTextBox.Enabled = descriptionTextBox.Enabled = false;
    132         Locked = true;
    133135        SetEnabledStateOfExecutableButtons();
    134136      }
    … …  
    139141      else {
    140142        nameTextBox.Enabled = descriptionTextBox.Enabled = true;
    141         Locked = false;
    142143        SetEnabledStateOfExecutableButtons();
    143144      }
    … …  
    164165        ErrorHandling.ShowErrorDialog(this, e.Value);
    165166    }
     167    private void Content_IsResultsPollingChanged(object sender, EventArgs e) {
     168      if (InvokeRequired)
     169        Invoke(new EventHandler(Content_IsResultsPollingChanged), sender, e);
     170      else {
     171        SetEnabledStateOfControls();
     172      }
     173    }
    166174    #endregion
    167175
    … …  
    179187      Content.Prepare();
    180188    }
    181     #endregion
    182 
    183     #region Helpers
    184     private void SetEnabledStateOfExecutableButtons() {
    185       if (Content == null) {
    186         startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = false;
    187       } else {
    188         startButton.Enabled = (Content.ExecutionState == ExecutionState.Prepared) || (Content.ExecutionState == ExecutionState.Paused);
    189         //pauseButton.Enabled = Content.ExecutionState == ExecutionState.Started;
    190         pauseButton.Enabled = false; // disabled for now
    191         stopButton.Enabled = (Content.ExecutionState == ExecutionState.Started) || (Content.ExecutionState == ExecutionState.Paused);
    192         resetButton.Enabled = Content.ExecutionState != ExecutionState.Started;
    193        
    194       }
    195     }
    196     #endregion
    197189
    198190    private void serverUrlTextBox_Validating(object sender, System.ComponentModel.CancelEventArgs e) {
    … …  
    235227    }
    236228
     229    private void disconnectButton_Click(object sender, EventArgs e) {
     230      if (Content != null) {
     231        Content.StopResultPolling();
     232        SetEnabledStateOfControls();
     233      }
     234    }
     235
     236    private void reconnectButton_Click(object sender, EventArgs e) {
     237      if (Content != null) {
     238        Content.StartResultPolling();
     239        SetEnabledStateOfControls();
     240      }
     241    }
     242    #endregion
     243
     244    #region Helpers
     245    private void SetEnabledStateOfExecutableButtons() {
     246      if (Content == null) {
     247        startButton.Enabled = pauseButton.Enabled = stopButton.Enabled = resetButton.Enabled = reconnectButton.Enabled = disconnectButton.Enabled = false;
     248      } else {
     249        startButton.Enabled = Content.ExecutionState == ExecutionState.Prepared;
     250        pauseButton.Enabled = false; // disabled for now
     251        stopButton.Enabled = Content.ExecutionState == ExecutionState.Started && Content.IsPollingResults;
     252        resetButton.Enabled = Content.ExecutionState != ExecutionState.Started;
     253        reconnectButton.Enabled = (Content.ExecutionState == ExecutionState.Started) && !Content.IsPollingResults;
     254        disconnectButton.Enabled = (Content.ExecutionState == ExecutionState.Started) && Content.IsPollingResults;
     255
     256        this.Locked = Content.ExecutionState == ExecutionState.Started && Content.IsPollingResults;
     257      }
     258    }
     259    #endregion
    237260  }
    238261}

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

    r4120 r4133  
    121121    <value>102, 17</value>
    122122  </metadata>
     123  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     124    <value>102, 17</value>
     125  </metadata>
    123126  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124127    <value>17, 17</value>
    … …  
    128131    <value>
    129132        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    130         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
    131         CwgBwL2l2gAAALZJREFUOE9j/P//PwNFAGQAOi7bn+2GTRybGIZmkKKEGRH/iTUEpwGWZfpEGYLVgKgp
     133        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBgAA
     134        CwYBZDTpJAAAALZJREFUOE9j/P//PwNFAGQAOi7bn+2GTRybGIZmkKKEGRH/iTUEpwGWZfpEGYLVgKgp
    132135        Qf833Fr8nxhDsBoQPMEbZDtRhmA1wKfLGWwACEctCsDrEqwGODZb/M/YEAvWbNus/1+nWOG/RBo3iFZD
    133136        jwmsBpjX6KFo5k9gwaoZnIawxa1eqTLcZnyacRqgki8FdjYhzTgNkM4QJEozTgNEkjlx+pmoQMQW2rjy
    … …  
    138141    <value>
    139142        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    140         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
    141         CwgBwL2l2gAAAXJJREFUOE+tkj1IQmEYhWsoaIi2xmhpiYSgKFoiCMLJJYSEJiEI0mgIyqjA6vaLUKIU
     143        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBgAA
     144        CwYBZDTpJAAAAXJJREFUOE+tkj1IQmEYhWsoaIi2xmhpiYSgKFoiCMLJJYSEJiEI0mgIyqjA6vaLUKIU
    142145        iZlJKKUoWEbZDzVYCYlQYVxcNDIoRND8ud7idD83C27g7YNvPM8573nfcgBlgh4BCPmCxIX0Qtx/ATTu
    143146        Lyy78ph3ZKC2pTBlSWB86w2jhleMrD9jWB9N/jQsSkDEj5FPPERZ+J7yOL5j4PYzsPsYGL1piKR7nL64
    … …  
    151154    <value>
    152155        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    153         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
    154         CwgBwL2l2gAAAYNJREFUOE9j/P//PwNFAGQAJZgizWDXI9veu/nvfxhuW/vtf+OKz/9rF7//XzHv1f+S
     156        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBgAA
     157        CwYBZDTpJAAAAYNJREFUOE9j/P//PwNFAGQAJZgizWDXI9veu/nvfxhuW/vtf+OKz/9rF7//XzHv1f+S
    155158        2c//F0x//L901mOgFoSrUQzo2vDr/6aT3/6vPPTl/4I9n/5ffvDzf+/ad/+bl74BG5I3/cV/3dBVuA0A
    156159        2bri4Jf/83Z9+n/ryS+Qwv8NS978L5378n/O1Of/k3qf/Vf1W4TbAJCT5+z49P/hyx9gzSBQMvvl/6wp
    … …  
    164167    <value>
    165168        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
    166         YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALCAAA
    167         CwgBwL2l2gAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB
     169        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBgAA
     170        CwYBZDTpJAAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB
     171        SPPVh3/+64auAqr9z4DOJ2hA29pv/289/f1f1W8R2AB0PkEDGld8/n/54e//cm6zwAag8wkaULv4/f8T
     172        13//F7ObBDYAnU/QgIp5r/7vvvDzP79ZN9gAdD5BA0pmP/+//uTP/5wGrWAD0PkEDSiY/vj/gj2f/7Pq
     173        NIINQOcTNAAU/2y6TXAD0PkEDSA1ZVI/KZPqAgBmE8VVB/UQsAAAAABJRU5ErkJggg==
     174</value>
     175  </data>
     176  <data name="disconnectButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     177    <value>
     178        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
     179        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBQAA
     180        CwUByY3ISQAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB
     181        SPPVh3/+64auAqr9z4DOJ2hA29pv/289/f1f1W8R2AB0PkEDGld8/n/54e//cm6zwAag8wkaULv4/f8T
     182        13//F7ObBDYAnU/QgIp5r/7vvvDzP79ZN9gAdD5BA0pmP/+//uTP/5wGrWAD0PkEDSiY/vj/gj2f/7Pq
     183        NIINQOcTNAAU/2y6TXAD0PkEDSA1ZVI/KZPqAgBmE8VVB/UQsAAAAABJRU5ErkJggg==
     184</value>
     185  </data>
     186  <data name="reconnectButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     187    <value>
     188        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
     189        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBAAA
     190        CwQBG8oqrQAAAMZJREFUOE9j/P//PwNFAGQAJZgizWDXU2I7VgN6N//937Xh1/+8qY8+gRSg89EtxHAB
    168191        SPPVh3/+64auAqr9z4DOJ2hA29pv/289/f1f1W8R2AB0PkEDGld8/n/54e//cm6zwAag8wkaULv4/f8T
    169192        13//F7ObBDYAnU/QgIp5r/7vvvDzP79ZN9gAdD5BA0pmP/+//uTP/5wGrWAD0PkEDSiY/vj/gj2f/7Pq

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

    r4121 r4133  
    5454      this.jobStatusGroupBox = new System.Windows.Forms.GroupBox();
    5555      this.percentageProgressBar = new System.Windows.Forms.ProgressBar();
     56      this.tabControl = new System.Windows.Forms.TabControl();
     57      this.detailsTabPage = new System.Windows.Forms.TabPage();
     58      this.logTabPage = new System.Windows.Forms.TabPage();
     59      this.logView = new HeuristicLab.Core.Views.LogView();
    5660      this.snapshotGroupBox.SuspendLayout();
    5761      this.jobStatusGroupBox.SuspendLayout();
     62      this.tabControl.SuspendLayout();
     63      this.detailsTabPage.SuspendLayout();
     64      this.logTabPage.SuspendLayout();
    5865      this.SuspendLayout();
    5966      //
    … …  
    7077      //
    7178      this.userIdLabel.AutoSize = true;
    72       this.userIdLabel.Location = new System.Drawing.Point(4, 3);
     79      this.userIdLabel.Location = new System.Drawing.Point(3, 3);
    7380      this.userIdLabel.Name = "userIdLabel";
    7481      this.userIdLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    8289      this.stateTextBox.Location = new System.Drawing.Point(95, 19);
    8390      this.stateTextBox.Name = "stateTextBox";
    84       this.stateTextBox.Size = new System.Drawing.Size(395, 20);
     91      this.stateTextBox.Size = new System.Drawing.Size(432, 20);
    8592      this.stateTextBox.TabIndex = 2;
    8693      //
    … …  
    8996      this.userIdTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    9097                  | System.Windows.Forms.AnchorStyles.Right)));
    91       this.userIdTextBox.Location = new System.Drawing.Point(92, 3);
     98      this.userIdTextBox.Location = new System.Drawing.Point(91, 3);
    9299      this.userIdTextBox.Name = "userIdTextBox";
    93       this.userIdTextBox.Size = new System.Drawing.Size(411, 20);
     100      this.userIdTextBox.Size = new System.Drawing.Size(448, 20);
    94101      this.userIdTextBox.TabIndex = 3;
    95102      //
    … …  
    107114      this.dateCreatedTextBox.Location = new System.Drawing.Point(95, 63);
    108115      this.dateCreatedTextBox.Name = "dateCreatedTextBox";
    109       this.dateCreatedTextBox.Size = new System.Drawing.Size(395, 20);
     116      this.dateCreatedTextBox.Size = new System.Drawing.Size(432, 20);
    110117      this.dateCreatedTextBox.TabIndex = 5;
    111118      //
    … …  
    116123      this.dateFinishedTextBox.Location = new System.Drawing.Point(95, 107);
    117124      this.dateFinishedTextBox.Name = "dateFinishedTextBox";
    118       this.dateFinishedTextBox.Size = new System.Drawing.Size(395, 20);
     125      this.dateFinishedTextBox.Size = new System.Drawing.Size(432, 20);
    119126      this.dateFinishedTextBox.TabIndex = 6;
    120127      //
    … …  
    123130      this.priorityTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    124131                  | System.Windows.Forms.AnchorStyles.Right)));
    125       this.priorityTextBox.Location = new System.Drawing.Point(92, 25);
     132      this.priorityTextBox.Location = new System.Drawing.Point(91, 25);
    126133      this.priorityTextBox.Name = "priorityTextBox";
    127       this.priorityTextBox.Size = new System.Drawing.Size(411, 20);
     134      this.priorityTextBox.Size = new System.Drawing.Size(448, 20);
    128135      this.priorityTextBox.TabIndex = 7;
    129136      //
    … …  
    132139      this.coresNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    133140                  | System.Windows.Forms.AnchorStyles.Right)));
    134       this.coresNeededTextBox.Location = new System.Drawing.Point(92, 47);
     141      this.coresNeededTextBox.Location = new System.Drawing.Point(91, 47);
    135142      this.coresNeededTextBox.Name = "coresNeededTextBox";
    136       this.coresNeededTextBox.Size = new System.Drawing.Size(411, 20);
     143      this.coresNeededTextBox.Size = new System.Drawing.Size(448, 20);
    137144      this.coresNeededTextBox.TabIndex = 8;
    138145      //
    … …  
    141148      this.memoryNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    142149                  | System.Windows.Forms.AnchorStyles.Right)));
    143       this.memoryNeededTextBox.Location = new System.Drawing.Point(92, 69);
     150      this.memoryNeededTextBox.Location = new System.Drawing.Point(91, 69);
    144151      this.memoryNeededTextBox.Name = "memoryNeededTextBox";
    145       this.memoryNeededTextBox.Size = new System.Drawing.Size(411, 20);
     152      this.memoryNeededTextBox.Size = new System.Drawing.Size(448, 20);
    146153      this.memoryNeededTextBox.TabIndex = 9;
    147154      //
    … …  
    150157      this.pluginsNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    151158                  | System.Windows.Forms.AnchorStyles.Right)));
    152       this.pluginsNeededTextBox.Location = new System.Drawing.Point(92, 91);
     159      this.pluginsNeededTextBox.Location = new System.Drawing.Point(91, 91);
    153160      this.pluginsNeededTextBox.Name = "pluginsNeededTextBox";
    154       this.pluginsNeededTextBox.Size = new System.Drawing.Size(411, 20);
     161      this.pluginsNeededTextBox.Size = new System.Drawing.Size(448, 20);
    155162      this.pluginsNeededTextBox.TabIndex = 10;
    156163      //
    … …  
    159166      this.projectTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    160167                  | System.Windows.Forms.AnchorStyles.Right)));
    161       this.projectTextBox.Location = new System.Drawing.Point(92, 113);
     168      this.projectTextBox.Location = new System.Drawing.Point(91, 113);
    162169      this.projectTextBox.Name = "projectTextBox";
    163       this.projectTextBox.Size = new System.Drawing.Size(411, 20);
     170      this.projectTextBox.Size = new System.Drawing.Size(448, 20);
    164171      this.projectTextBox.TabIndex = 11;
    165172      //
    … …  
    194201      //
    195202      this.priorityLabel.AutoSize = true;
    196       this.priorityLabel.Location = new System.Drawing.Point(4, 25);
     203      this.priorityLabel.Location = new System.Drawing.Point(3, 25);
    197204      this.priorityLabel.Name = "priorityLabel";
    198205      this.priorityLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    203210      //
    204211      this.coresNeededLabel.AutoSize = true;
    205       this.coresNeededLabel.Location = new System.Drawing.Point(4, 47);
     212      this.coresNeededLabel.Location = new System.Drawing.Point(3, 47);
    206213      this.coresNeededLabel.Name = "coresNeededLabel";
    207214      this.coresNeededLabel.Size = new System.Drawing.Size(75, 13);
    … …  
    212219      //
    213220      this.memoryNeededLabel.AutoSize = true;
    214       this.memoryNeededLabel.Location = new System.Drawing.Point(4, 69);
     221      this.memoryNeededLabel.Location = new System.Drawing.Point(3, 69);
    215222      this.memoryNeededLabel.Name = "memoryNeededLabel";
    216223      this.memoryNeededLabel.Size = new System.Drawing.Size(85, 13);
    … …  
    221228      //
    222229      this.pluginsNeededLabel.AutoSize = true;
    223       this.pluginsNeededLabel.Location = new System.Drawing.Point(4, 91);
     230      this.pluginsNeededLabel.Location = new System.Drawing.Point(3, 91);
    224231      this.pluginsNeededLabel.Name = "pluginsNeededLabel";
    225232      this.pluginsNeededLabel.Size = new System.Drawing.Size(82, 13);
    … …  
    230237      //
    231238      this.projectLabel.AutoSize = true;
    232       this.projectLabel.Location = new System.Drawing.Point(4, 113);
     239      this.projectLabel.Location = new System.Drawing.Point(3, 113);
    233240      this.projectLabel.Name = "projectLabel";
    234241      this.projectLabel.Size = new System.Drawing.Size(43, 13);
    … …  
    245252      this.snapshotGroupBox.Controls.Add(this.snapshotTimeLabel);
    246253      this.snapshotGroupBox.Controls.Add(this.snapshotStatusLabel);
    247       this.snapshotGroupBox.Location = new System.Drawing.Point(7, 279);
     254      this.snapshotGroupBox.Location = new System.Drawing.Point(6, 279);
    248255      this.snapshotGroupBox.Name = "snapshotGroupBox";
    249       this.snapshotGroupBox.Size = new System.Drawing.Size(496, 100);
     256      this.snapshotGroupBox.Size = new System.Drawing.Size(533, 100);
    250257      this.snapshotGroupBox.TabIndex = 21;
    251258      this.snapshotGroupBox.TabStop = false;
    … …  
    255262      //
    256263      this.openSnapshotButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    257       this.openSnapshotButton.Location = new System.Drawing.Point(389, 67);
     264      this.openSnapshotButton.Location = new System.Drawing.Point(426, 67);
    258265      this.openSnapshotButton.Name = "openSnapshotButton";
    259266      this.openSnapshotButton.Size = new System.Drawing.Size(101, 26);
    … …  
    269276      this.snapshotTimeText.Location = new System.Drawing.Point(45, 41);
    270277      this.snapshotTimeText.Name = "snapshotTimeText";
    271       this.snapshotTimeText.Size = new System.Drawing.Size(445, 20);
     278      this.snapshotTimeText.Size = new System.Drawing.Size(482, 20);
    272279      this.snapshotTimeText.TabIndex = 24;
    273280      //
    … …  
    278285      this.snapshotStatusText.Location = new System.Drawing.Point(45, 19);
    279286      this.snapshotStatusText.Name = "snapshotStatusText";
    280       this.snapshotStatusText.Size = new System.Drawing.Size(445, 20);
     287      this.snapshotStatusText.Size = new System.Drawing.Size(482, 20);
    281288      this.snapshotStatusText.TabIndex = 23;
    282289      //
    … …  
    305312      this.dateCalculatedText.Location = new System.Drawing.Point(95, 85);
    306313      this.dateCalculatedText.Name = "dateCalculatedText";
    307       this.dateCalculatedText.Size = new System.Drawing.Size(395, 20);
     314      this.dateCalculatedText.Size = new System.Drawing.Size(432, 20);
    308315      this.dateCalculatedText.TabIndex = 22;
    309316      //
    … …  
    332339      this.jobStatusGroupBox.Controls.Add(this.dateCreatedLabel);
    333340      this.jobStatusGroupBox.Controls.Add(this.dateFinishedLabel);
    334       this.jobStatusGroupBox.Location = new System.Drawing.Point(7, 139);
     341      this.jobStatusGroupBox.Location = new System.Drawing.Point(6, 139);
    335342      this.jobStatusGroupBox.Name = "jobStatusGroupBox";
    336       this.jobStatusGroupBox.Size = new System.Drawing.Size(496, 134);
     343      this.jobStatusGroupBox.Size = new System.Drawing.Size(533, 134);
    337344      this.jobStatusGroupBox.TabIndex = 24;
    338345      this.jobStatusGroupBox.TabStop = false;
    … …  
    345352      this.percentageProgressBar.Location = new System.Drawing.Point(153, 41);
    346353      this.percentageProgressBar.Name = "percentageProgressBar";
    347       this.percentageProgressBar.Size = new System.Drawing.Size(337, 20);
     354      this.percentageProgressBar.Size = new System.Drawing.Size(374, 20);
    348355      this.percentageProgressBar.TabIndex = 25;
     356      //
     357      // tabControl
     358      //
     359      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     360                  | System.Windows.Forms.AnchorStyles.Left)
     361                  | System.Windows.Forms.AnchorStyles.Right)));
     362      this.tabControl.Controls.Add(this.detailsTabPage);
     363      this.tabControl.Controls.Add(this.logTabPage);
     364      this.tabControl.Location = new System.Drawing.Point(3, 3);
     365      this.tabControl.Name = "tabControl";
     366      this.tabControl.SelectedIndex = 0;
     367      this.tabControl.Size = new System.Drawing.Size(550, 479);
     368      this.tabControl.TabIndex = 25;
     369      //
     370      // detailsTabPage
     371      //
     372      this.detailsTabPage.Controls.Add(this.userIdLabel);
     373      this.detailsTabPage.Controls.Add(this.jobStatusGroupBox);
     374      this.detailsTabPage.Controls.Add(this.userIdTextBox);
     375      this.detailsTabPage.Controls.Add(this.snapshotGroupBox);
     376      this.detailsTabPage.Controls.Add(this.priorityTextBox);
     377      this.detailsTabPage.Controls.Add(this.projectLabel);
     378      this.detailsTabPage.Controls.Add(this.coresNeededTextBox);
     379      this.detailsTabPage.Controls.Add(this.pluginsNeededLabel);
     380      this.detailsTabPage.Controls.Add(this.memoryNeededTextBox);
     381      this.detailsTabPage.Controls.Add(this.memoryNeededLabel);
     382      this.detailsTabPage.Controls.Add(this.pluginsNeededTextBox);
     383      this.detailsTabPage.Controls.Add(this.coresNeededLabel);
     384      this.detailsTabPage.Controls.Add(this.projectTextBox);
     385      this.detailsTabPage.Controls.Add(this.priorityLabel);
     386      this.detailsTabPage.Location = new System.Drawing.Point(4, 22);
     387      this.detailsTabPage.Name = "detailsTabPage";
     388      this.detailsTabPage.Padding = new System.Windows.Forms.Padding(3);
     389      this.detailsTabPage.Size = new System.Drawing.Size(542, 453);
     390      this.detailsTabPage.TabIndex = 0;
     391      this.detailsTabPage.Text = "Details";
     392      this.detailsTabPage.UseVisualStyleBackColor = true;
     393      //
     394      // logTabPage
     395      //
     396      this.logTabPage.Controls.Add(this.logView);
     397      this.logTabPage.Location = new System.Drawing.Point(4, 22);
     398      this.logTabPage.Name = "logTabPage";
     399      this.logTabPage.Padding = new System.Windows.Forms.Padding(3);
     400      this.logTabPage.Size = new System.Drawing.Size(542, 453);
     401      this.logTabPage.TabIndex = 1;
     402      this.logTabPage.Text = "Log";
     403      this.logTabPage.UseVisualStyleBackColor = true;
     404      //
     405      // logView
     406      //
     407      this.logView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     408                  | System.Windows.Forms.AnchorStyles.Left)
     409                  | System.Windows.Forms.AnchorStyles.Right)));
     410      this.logView.Caption = "Log View";
     411      this.logView.Content = null;
     412      this.logView.Location = new System.Drawing.Point(3, 3);
     413      this.logView.Name = "logView";
     414      this.logView.ReadOnly = false;
     415      this.logView.Size = new System.Drawing.Size(536, 447);
     416      this.logView.TabIndex = 0;
    349417      //
    350418      // JobItemView
    … …  
    352420      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    353421      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    354       this.Controls.Add(this.jobStatusGroupBox);
    355       this.Controls.Add(this.snapshotGroupBox);
    356       this.Controls.Add(this.projectLabel);
    357       this.Controls.Add(this.pluginsNeededLabel);
    358       this.Controls.Add(this.memoryNeededLabel);
    359       this.Controls.Add(this.coresNeededLabel);
    360       this.Controls.Add(this.priorityLabel);
    361       this.Controls.Add(this.projectTextBox);
    362       this.Controls.Add(this.pluginsNeededTextBox);
    363       this.Controls.Add(this.memoryNeededTextBox);
    364       this.Controls.Add(this.coresNeededTextBox);
    365       this.Controls.Add(this.priorityTextBox);
    366       this.Controls.Add(this.userIdTextBox);
    367       this.Controls.Add(this.userIdLabel);
     422      this.Controls.Add(this.tabControl);
    368423      this.Name = "JobItemView";
    369       this.Size = new System.Drawing.Size(506, 409);
     424      this.Size = new System.Drawing.Size(556, 485);
    370425      this.snapshotGroupBox.ResumeLayout(false);
    371426      this.snapshotGroupBox.PerformLayout();
    372427      this.jobStatusGroupBox.ResumeLayout(false);
    373428      this.jobStatusGroupBox.PerformLayout();
     429      this.tabControl.ResumeLayout(false);
     430      this.detailsTabPage.ResumeLayout(false);
     431      this.detailsTabPage.PerformLayout();
     432      this.logTabPage.ResumeLayout(false);
    374433      this.ResumeLayout(false);
    375       this.PerformLayout();
    376434
    377435    }
    … …  
    409467    private System.Windows.Forms.GroupBox jobStatusGroupBox;
    410468    private System.Windows.Forms.ProgressBar percentageProgressBar;
     469    private System.Windows.Forms.TabControl tabControl;
     470    private System.Windows.Forms.TabPage detailsTabPage;
     471    private System.Windows.Forms.TabPage logTabPage;
     472    private Core.Views.LogView logView;
    411473  }
    412474}

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

    r4121 r4133  
    3434      base.OnContentChanged();
    3535      if (Content != null) {
     36        logView.Content = Content.Log;
    3637        Content_JobDtoChanged(this, EventArgs.Empty);
    3738        if (Content.LatestSnapshot != null) {

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

    r4121 r4133  
    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.4120")]
    58 [assembly: AssemblyFileVersion("3.3.0.4120")]
    59 [assembly: AssemblyBuildDate("2010/07/30 13:39:18")]
     57[assembly: AssemblyVersion("3.3.0.4121")]
     58[assembly: AssemblyFileVersion("3.3.0.4121")]
     59[assembly: AssemblyBuildDate("2010/08/02 17:23:51")]
Note: See TracChangeset for help on using the changeset viewer.