Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/30/10 13:56:28 (14 years ago)
Author:
cneumuel
Message:

Stabilization of Hive, Improvement HiveExperiment GUI (#1115)

Location:
branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Experiment.Views/3.3
Files:
1 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

    r4120 r4121  
    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     <Reference Include="HeuristicLab.Hive.Experiment.Views-3.3, Version=3.3.0.4119, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    77     <Reference Include="HeuristicLab.Hive.Server.Console-3.3">
    78       <HintPath>..\..\HeuristicLab.Hive.Server.Console\3.3\obj\Debug\HeuristicLab.Hive.Server.Console-3.3.dll</HintPath>
     75    <Reference Include="HeuristicLab.DataAccess-3.3, Version=3.3.0.4091, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     76      <SpecificVersion>False</SpecificVersion>
    7977    </Reference>
    8078    <Reference Include="HeuristicLab.MainForm-3.3">
    … …  
    9391      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    9492    </Reference>
    95     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     93    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     94      <SpecificVersion>False</SpecificVersion>
     95    </Reference>
    9696    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    9797      <HintPath>..\..\..\..\..\..\..\..\..\Programme\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    … …  
    107107  </ItemGroup>
    108108  <ItemGroup>
     109    <Compile Include="ControlExtensions.cs" />
    109110    <Compile Include="HeuristicLabHiveExperimentViewsPlugin.cs" />
    110111    <Compile Include="HiveExperimentView.cs">

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

    r4116 r4121  
    2828  [Plugin("HeuristicLab.Hive.Experiment.Views", "3.3")]
    2929  [PluginFile("HeuristicLab.Hive.Experiment.Views-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3031  [PluginDependency("HeuristicLab.Common", "3.3")]
     32  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3133  [PluginDependency("HeuristicLab.Core", "3.3")]
    3234  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
     35  [PluginDependency("HeuristicLab.Data", "3.3")]
     36  [PluginDependency("HeuristicLab.DataAccess", "3.3")]
     37  [PluginDependency("HeuristicLab.Hive.Contracts", "3.3")]
     38  [PluginDependency("HeuristicLab.Hive.Experiment", "3.3")]
     39  [PluginDependency("HeuristicLab.Hive.JobBase", "3.3")]
    3340  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    34   [PluginDependency("HeuristicLab.Hive.Experiment", "3.3")]
     41  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
     42  [PluginDependency("HeuristicLab.Operators.Views", "3.3")]
     43  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     44  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
     45  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3546  public class HeuristicLabHiveExperimentViewsPlugin : PluginBase {
    3647

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

    r4120 r4121  
    2222      InitializeComponent();
    2323      itemsGroupBox.Text = "Jobs";
    24       //this.ReadOnly = true;
     24      this.viewHost.ReadOnly = true;
    2525    }
    2626

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

    r4120 r4121  
    5252      this.dateCalculatedText = new System.Windows.Forms.TextBox();
    5353      this.dateCalculatedLabel = new System.Windows.Forms.Label();
     54      this.jobStatusGroupBox = new System.Windows.Forms.GroupBox();
     55      this.percentageProgressBar = new System.Windows.Forms.ProgressBar();
    5456      this.snapshotGroupBox.SuspendLayout();
     57      this.jobStatusGroupBox.SuspendLayout();
    5558      this.SuspendLayout();
    5659      //
    … …  
    5861      //
    5962      this.stateLabel.AutoSize = true;
    60       this.stateLabel.Location = new System.Drawing.Point(4, 4);
     63      this.stateLabel.Location = new System.Drawing.Point(7, 19);
    6164      this.stateLabel.Name = "stateLabel";
    6265      this.stateLabel.Size = new System.Drawing.Size(35, 13);
    … …  
    6770      //
    6871      this.userIdLabel.AutoSize = true;
    69       this.userIdLabel.Location = new System.Drawing.Point(4, 26);
     72      this.userIdLabel.Location = new System.Drawing.Point(4, 3);
    7073      this.userIdLabel.Name = "userIdLabel";
    7174      this.userIdLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    7780      this.stateTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    7881                  | System.Windows.Forms.AnchorStyles.Right)));
    79       this.stateTextBox.Location = new System.Drawing.Point(92, 4);
     82      this.stateTextBox.Location = new System.Drawing.Point(95, 19);
    8083      this.stateTextBox.Name = "stateTextBox";
    81       this.stateTextBox.Size = new System.Drawing.Size(319, 20);
     84      this.stateTextBox.Size = new System.Drawing.Size(395, 20);
    8285      this.stateTextBox.TabIndex = 2;
    8386      //
    … …  
    8689      this.userIdTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    8790                  | System.Windows.Forms.AnchorStyles.Right)));
    88       this.userIdTextBox.Location = new System.Drawing.Point(92, 26);
     91      this.userIdTextBox.Location = new System.Drawing.Point(92, 3);
    8992      this.userIdTextBox.Name = "userIdTextBox";
    90       this.userIdTextBox.Size = new System.Drawing.Size(319, 20);
     93      this.userIdTextBox.Size = new System.Drawing.Size(411, 20);
    9194      this.userIdTextBox.TabIndex = 3;
    9295      //
    9396      // percentageTextBox
    9497      //
    95       this.percentageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    96                   | System.Windows.Forms.AnchorStyles.Right)));
    97       this.percentageTextBox.Location = new System.Drawing.Point(92, 48);
     98      this.percentageTextBox.Location = new System.Drawing.Point(95, 41);
    9899      this.percentageTextBox.Name = "percentageTextBox";
    99       this.percentageTextBox.Size = new System.Drawing.Size(319, 20);
     100      this.percentageTextBox.Size = new System.Drawing.Size(52, 20);
    100101      this.percentageTextBox.TabIndex = 4;
    101102      //
    … …  
    104105      this.dateCreatedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    105106                  | System.Windows.Forms.AnchorStyles.Right)));
    106       this.dateCreatedTextBox.Location = new System.Drawing.Point(92, 70);
     107      this.dateCreatedTextBox.Location = new System.Drawing.Point(95, 63);
    107108      this.dateCreatedTextBox.Name = "dateCreatedTextBox";
    108       this.dateCreatedTextBox.Size = new System.Drawing.Size(319, 20);
     109      this.dateCreatedTextBox.Size = new System.Drawing.Size(395, 20);
    109110      this.dateCreatedTextBox.TabIndex = 5;
    110111      //
    … …  
    113114      this.dateFinishedTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    114115                  | System.Windows.Forms.AnchorStyles.Right)));
    115       this.dateFinishedTextBox.Location = new System.Drawing.Point(92, 114);
     116      this.dateFinishedTextBox.Location = new System.Drawing.Point(95, 107);
    116117      this.dateFinishedTextBox.Name = "dateFinishedTextBox";
    117       this.dateFinishedTextBox.Size = new System.Drawing.Size(319, 20);
     118      this.dateFinishedTextBox.Size = new System.Drawing.Size(395, 20);
    118119      this.dateFinishedTextBox.TabIndex = 6;
    119120      //
    … …  
    122123      this.priorityTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    123124                  | System.Windows.Forms.AnchorStyles.Right)));
    124       this.priorityTextBox.Location = new System.Drawing.Point(92, 136);
     125      this.priorityTextBox.Location = new System.Drawing.Point(92, 25);
    125126      this.priorityTextBox.Name = "priorityTextBox";
    126       this.priorityTextBox.Size = new System.Drawing.Size(319, 20);
     127      this.priorityTextBox.Size = new System.Drawing.Size(411, 20);
    127128      this.priorityTextBox.TabIndex = 7;
    128129      //
    … …  
    131132      this.coresNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    132133                  | System.Windows.Forms.AnchorStyles.Right)));
    133       this.coresNeededTextBox.Location = new System.Drawing.Point(92, 158);
     134      this.coresNeededTextBox.Location = new System.Drawing.Point(92, 47);
    134135      this.coresNeededTextBox.Name = "coresNeededTextBox";
    135       this.coresNeededTextBox.Size = new System.Drawing.Size(319, 20);
     136      this.coresNeededTextBox.Size = new System.Drawing.Size(411, 20);
    136137      this.coresNeededTextBox.TabIndex = 8;
    137138      //
    … …  
    140141      this.memoryNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    141142                  | System.Windows.Forms.AnchorStyles.Right)));
    142       this.memoryNeededTextBox.Location = new System.Drawing.Point(92, 180);
     143      this.memoryNeededTextBox.Location = new System.Drawing.Point(92, 69);
    143144      this.memoryNeededTextBox.Name = "memoryNeededTextBox";
    144       this.memoryNeededTextBox.Size = new System.Drawing.Size(319, 20);
     145      this.memoryNeededTextBox.Size = new System.Drawing.Size(411, 20);
    145146      this.memoryNeededTextBox.TabIndex = 9;
    146147      //
    … …  
    149150      this.pluginsNeededTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    150151                  | System.Windows.Forms.AnchorStyles.Right)));
    151       this.pluginsNeededTextBox.Location = new System.Drawing.Point(92, 202);
     152      this.pluginsNeededTextBox.Location = new System.Drawing.Point(92, 91);
    152153      this.pluginsNeededTextBox.Name = "pluginsNeededTextBox";
    153       this.pluginsNeededTextBox.Size = new System.Drawing.Size(319, 20);
     154      this.pluginsNeededTextBox.Size = new System.Drawing.Size(411, 20);
    154155      this.pluginsNeededTextBox.TabIndex = 10;
    155156      //
    … …  
    158159      this.projectTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    159160                  | System.Windows.Forms.AnchorStyles.Right)));
    160       this.projectTextBox.Location = new System.Drawing.Point(92, 224);
     161      this.projectTextBox.Location = new System.Drawing.Point(92, 113);
    161162      this.projectTextBox.Name = "projectTextBox";
    162       this.projectTextBox.Size = new System.Drawing.Size(319, 20);
     163      this.projectTextBox.Size = new System.Drawing.Size(411, 20);
    163164      this.projectTextBox.TabIndex = 11;
    164165      //
    … …  
    166167      //
    167168      this.percentageLabel.AutoSize = true;
    168       this.percentageLabel.Location = new System.Drawing.Point(4, 48);
     169      this.percentageLabel.Location = new System.Drawing.Point(7, 41);
    169170      this.percentageLabel.Name = "percentageLabel";
    170171      this.percentageLabel.Size = new System.Drawing.Size(65, 13);
    … …  
    175176      //
    176177      this.dateCreatedLabel.AutoSize = true;
    177       this.dateCreatedLabel.Location = new System.Drawing.Point(4, 70);
     178      this.dateCreatedLabel.Location = new System.Drawing.Point(7, 63);
    178179      this.dateCreatedLabel.Name = "dateCreatedLabel";
    179180      this.dateCreatedLabel.Size = new System.Drawing.Size(70, 13);
    … …  
    184185      //
    185186      this.dateFinishedLabel.AutoSize = true;
    186       this.dateFinishedLabel.Location = new System.Drawing.Point(4, 114);
     187      this.dateFinishedLabel.Location = new System.Drawing.Point(7, 107);
    187188      this.dateFinishedLabel.Name = "dateFinishedLabel";
    188189      this.dateFinishedLabel.Size = new System.Drawing.Size(72, 13);
    … …  
    193194      //
    194195      this.priorityLabel.AutoSize = true;
    195       this.priorityLabel.Location = new System.Drawing.Point(4, 136);
     196      this.priorityLabel.Location = new System.Drawing.Point(4, 25);
    196197      this.priorityLabel.Name = "priorityLabel";
    197198      this.priorityLabel.Size = new System.Drawing.Size(41, 13);
    … …  
    202203      //
    203204      this.coresNeededLabel.AutoSize = true;
    204       this.coresNeededLabel.Location = new System.Drawing.Point(4, 158);
     205      this.coresNeededLabel.Location = new System.Drawing.Point(4, 47);
    205206      this.coresNeededLabel.Name = "coresNeededLabel";
    206207      this.coresNeededLabel.Size = new System.Drawing.Size(75, 13);
    … …  
    211212      //
    212213      this.memoryNeededLabel.AutoSize = true;
    213       this.memoryNeededLabel.Location = new System.Drawing.Point(4, 180);
     214      this.memoryNeededLabel.Location = new System.Drawing.Point(4, 69);
    214215      this.memoryNeededLabel.Name = "memoryNeededLabel";
    215216      this.memoryNeededLabel.Size = new System.Drawing.Size(85, 13);
    … …  
    220221      //
    221222      this.pluginsNeededLabel.AutoSize = true;
    222       this.pluginsNeededLabel.Location = new System.Drawing.Point(4, 202);
     223      this.pluginsNeededLabel.Location = new System.Drawing.Point(4, 91);
    223224      this.pluginsNeededLabel.Name = "pluginsNeededLabel";
    224225      this.pluginsNeededLabel.Size = new System.Drawing.Size(82, 13);
    … …  
    229230      //
    230231      this.projectLabel.AutoSize = true;
    231       this.projectLabel.Location = new System.Drawing.Point(4, 224);
     232      this.projectLabel.Location = new System.Drawing.Point(4, 113);
    232233      this.projectLabel.Name = "projectLabel";
    233234      this.projectLabel.Size = new System.Drawing.Size(43, 13);
    … …  
    244245      this.snapshotGroupBox.Controls.Add(this.snapshotTimeLabel);
    245246      this.snapshotGroupBox.Controls.Add(this.snapshotStatusLabel);
    246       this.snapshotGroupBox.Location = new System.Drawing.Point(7, 246);
     247      this.snapshotGroupBox.Location = new System.Drawing.Point(7, 279);
    247248      this.snapshotGroupBox.Name = "snapshotGroupBox";
    248       this.snapshotGroupBox.Size = new System.Drawing.Size(404, 100);
     249      this.snapshotGroupBox.Size = new System.Drawing.Size(496, 100);
    249250      this.snapshotGroupBox.TabIndex = 21;
    250251      this.snapshotGroupBox.TabStop = false;
    … …  
    254255      //
    255256      this.openSnapshotButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    256       this.openSnapshotButton.Location = new System.Drawing.Point(297, 67);
     257      this.openSnapshotButton.Location = new System.Drawing.Point(389, 67);
    257258      this.openSnapshotButton.Name = "openSnapshotButton";
    258259      this.openSnapshotButton.Size = new System.Drawing.Size(101, 26);
    … …  
    268269      this.snapshotTimeText.Location = new System.Drawing.Point(45, 41);
    269270      this.snapshotTimeText.Name = "snapshotTimeText";
    270       this.snapshotTimeText.Size = new System.Drawing.Size(353, 20);
     271      this.snapshotTimeText.Size = new System.Drawing.Size(445, 20);
    271272      this.snapshotTimeText.TabIndex = 24;
    272273      //
    … …  
    277278      this.snapshotStatusText.Location = new System.Drawing.Point(45, 19);
    278279      this.snapshotStatusText.Name = "snapshotStatusText";
    279       this.snapshotStatusText.Size = new System.Drawing.Size(353, 20);
     280      this.snapshotStatusText.Size = new System.Drawing.Size(445, 20);
    280281      this.snapshotStatusText.TabIndex = 23;
    281282      //
    … …  
    302303      this.dateCalculatedText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    303304                  | System.Windows.Forms.AnchorStyles.Right)));
    304       this.dateCalculatedText.Location = new System.Drawing.Point(92, 92);
     305      this.dateCalculatedText.Location = new System.Drawing.Point(95, 85);
    305306      this.dateCalculatedText.Name = "dateCalculatedText";
    306       this.dateCalculatedText.Size = new System.Drawing.Size(319, 20);
     307      this.dateCalculatedText.Size = new System.Drawing.Size(395, 20);
    307308      this.dateCalculatedText.TabIndex = 22;
    308309      //
    … …  
    310311      //
    311312      this.dateCalculatedLabel.AutoSize = true;
    312       this.dateCalculatedLabel.Location = new System.Drawing.Point(4, 92);
     313      this.dateCalculatedLabel.Location = new System.Drawing.Point(7, 85);
    313314      this.dateCalculatedLabel.Name = "dateCalculatedLabel";
    314315      this.dateCalculatedLabel.Size = new System.Drawing.Size(83, 13);
    … …  
    316317      this.dateCalculatedLabel.Text = "DateCalculated:";
    317318      //
     319      // jobStatusGroupBox
     320      //
     321      this.jobStatusGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     322                  | System.Windows.Forms.AnchorStyles.Right)));
     323      this.jobStatusGroupBox.Controls.Add(this.percentageProgressBar);
     324      this.jobStatusGroupBox.Controls.Add(this.stateTextBox);
     325      this.jobStatusGroupBox.Controls.Add(this.dateCalculatedLabel);
     326      this.jobStatusGroupBox.Controls.Add(this.stateLabel);
     327      this.jobStatusGroupBox.Controls.Add(this.dateCalculatedText);
     328      this.jobStatusGroupBox.Controls.Add(this.dateFinishedTextBox);
     329      this.jobStatusGroupBox.Controls.Add(this.percentageTextBox);
     330      this.jobStatusGroupBox.Controls.Add(this.dateCreatedTextBox);
     331      this.jobStatusGroupBox.Controls.Add(this.percentageLabel);
     332      this.jobStatusGroupBox.Controls.Add(this.dateCreatedLabel);
     333      this.jobStatusGroupBox.Controls.Add(this.dateFinishedLabel);
     334      this.jobStatusGroupBox.Location = new System.Drawing.Point(7, 139);
     335      this.jobStatusGroupBox.Name = "jobStatusGroupBox";
     336      this.jobStatusGroupBox.Size = new System.Drawing.Size(496, 134);
     337      this.jobStatusGroupBox.TabIndex = 24;
     338      this.jobStatusGroupBox.TabStop = false;
     339      this.jobStatusGroupBox.Text = "Job Status";
     340      //
     341      // percentageProgressBar
     342      //
     343      this.percentageProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     344                  | System.Windows.Forms.AnchorStyles.Right)));
     345      this.percentageProgressBar.Location = new System.Drawing.Point(153, 41);
     346      this.percentageProgressBar.Name = "percentageProgressBar";
     347      this.percentageProgressBar.Size = new System.Drawing.Size(337, 20);
     348      this.percentageProgressBar.TabIndex = 25;
     349      //
    318350      // JobItemView
    319351      //
    320352      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    321353      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    322       this.Controls.Add(this.dateCalculatedLabel);
    323       this.Controls.Add(this.dateCalculatedText);
     354      this.Controls.Add(this.jobStatusGroupBox);
    324355      this.Controls.Add(this.snapshotGroupBox);
    325356      this.Controls.Add(this.projectLabel);
    … …  
    328359      this.Controls.Add(this.coresNeededLabel);
    329360      this.Controls.Add(this.priorityLabel);
    330       this.Controls.Add(this.dateFinishedLabel);
    331       this.Controls.Add(this.dateCreatedLabel);
    332       this.Controls.Add(this.percentageLabel);
    333361      this.Controls.Add(this.projectTextBox);
    334362      this.Controls.Add(this.pluginsNeededTextBox);
    … …  
    336364      this.Controls.Add(this.coresNeededTextBox);
    337365      this.Controls.Add(this.priorityTextBox);
    338       this.Controls.Add(this.dateFinishedTextBox);
    339       this.Controls.Add(this.dateCreatedTextBox);
    340       this.Controls.Add(this.percentageTextBox);
    341366      this.Controls.Add(this.userIdTextBox);
    342       this.Controls.Add(this.stateTextBox);
    343367      this.Controls.Add(this.userIdLabel);
    344       this.Controls.Add(this.stateLabel);
    345368      this.Name = "JobItemView";
    346       this.Size = new System.Drawing.Size(414, 417);
     369      this.Size = new System.Drawing.Size(506, 409);
    347370      this.snapshotGroupBox.ResumeLayout(false);
    348371      this.snapshotGroupBox.PerformLayout();
     372      this.jobStatusGroupBox.ResumeLayout(false);
     373      this.jobStatusGroupBox.PerformLayout();
    349374      this.ResumeLayout(false);
    350375      this.PerformLayout();
    … …  
    382407    private System.Windows.Forms.TextBox dateCalculatedText;
    383408    private System.Windows.Forms.Label dateCalculatedLabel;
     409    private System.Windows.Forms.GroupBox jobStatusGroupBox;
     410    private System.Windows.Forms.ProgressBar percentageProgressBar;
    384411  }
    385412}

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

    r4120 r4121  
    3434      base.OnContentChanged();
    3535      if (Content != null) {
     36        Content_JobDtoChanged(this, EventArgs.Empty);
     37        if (Content.LatestSnapshot != null) {
     38          snapshotStatusText.InvokeIfRequired(c => c.Text = Content.LatestSnapshot.StatusMessage);
     39          snapshotTimeText.InvokeIfRequired(c => { c.Text = Content.LatestSnapshotTime.ToString(); });
     40        }
     41      }
     42    }
     43
     44    protected override void RegisterContentEvents() {
     45      base.RegisterContentEvents();
     46      Content.LatestSnapshotChanged += new EventHandler(Content_LatestSnapshotChanged);
     47      Content.JobDtoChanged += new EventHandler(Content_JobDtoChanged);
     48    }
     49
     50    protected override void DeregisterContentEvents() {
     51      Content.LatestSnapshotChanged -= new EventHandler(Content_LatestSnapshotChanged);
     52      Content.JobDtoChanged -= new EventHandler(Content_JobDtoChanged);
     53      base.DeregisterContentEvents();
     54    }
     55
     56    void Content_JobDtoChanged(object sender, EventArgs e) {
     57      if (InvokeRequired) {
     58        Invoke(new EventHandler(Content_JobDtoChanged), sender, e);
     59      } else {
    3660        this.stateTextBox.Text = Content.JobDto.State.ToString();
    3761        this.userIdTextBox.Text = Content.JobDto.UserId.ToString();
    38         this.percentageTextBox.Text = Content.JobDto.Percentage.ToString();
     62        this.percentageTextBox.Text = (Content.JobDto.Percentage*100).ToString() + "%";
     63        this.percentageProgressBar.Value = Convert.ToInt32(Content.JobDto.Percentage * percentageProgressBar.Maximum);
    3964        this.dateCreatedTextBox.Text = Content.JobDto.DateCreated.ToString();
    4065        this.dateCalculatedText.Text = Content.JobDto.DateCalculated.ToString();
    … …  
    4570        this.pluginsNeededTextBox.Text = string.Join(", ", Content.JobDto.PluginsNeeded.Select(x => x.Name + "-" + x.Version).ToArray());
    4671        this.projectTextBox.Text = Content.JobDto.Project != null ? Content.JobDto.Project.Name : "-";
     72      }
     73    }
     74
     75    void Content_LatestSnapshotChanged(object sender, EventArgs e) {
     76      if (InvokeRequired) {
     77        Invoke(new EventHandler(Content_LatestSnapshotChanged), sender, e);
     78      } else {
    4779        if (Content.LatestSnapshot != null) {
    4880          snapshotStatusText.Text = Content.LatestSnapshot.StatusMessage;
    4981          snapshotTimeText.Text = Content.LatestSnapshotTime.ToString();
     82        } else {
     83          snapshotStatusText.Text = "";
     84          snapshotTimeText.Text = "";
    5085        }
     86        SetEnabledStateOfControls();
    5187      }
    52     }
    53 
    54     protected override void RegisterContentEvents() {
    55       base.RegisterContentEvents();
    56       Content.LatestSnapshotChanged += new EventHandler(Content_LatestSnapshotChanged);
    57     }
    58 
    59     protected override void DeregisterContentEvents() {
    60       Content.LatestSnapshotChanged -= new EventHandler(Content_LatestSnapshotChanged);
    61       base.DeregisterContentEvents();
    62     }
    63 
    64     void Content_LatestSnapshotChanged(object sender, EventArgs e) {
    65       if (Content.LatestSnapshot != null) {
    66         snapshotStatusText.Text = Content.LatestSnapshot.StatusMessage;
    67         snapshotTimeText.Text = Content.LatestSnapshotTime.ToString();
    68       } else {
    69         snapshotStatusText.Text = "";
    70         snapshotTimeText.Text = "";
    71       }
    72       SetEnabledStateOfControls();
    7388    }
    7489
    … …  
    7691      base.SetEnabledStateOfControls();
    7792      openSnapshotButton.Enabled = Content != null && Content.LatestSnapshot != null;
     93      this.stateTextBox.ReadOnly = this.ReadOnly;
     94      this.userIdTextBox.ReadOnly = this.ReadOnly;
     95      this.percentageTextBox.ReadOnly = this.ReadOnly;
     96      this.dateCreatedTextBox.ReadOnly = this.ReadOnly;
     97      this.dateCalculatedText.ReadOnly = this.ReadOnly;
     98      this.dateFinishedTextBox.ReadOnly = this.ReadOnly;
     99      this.priorityTextBox.ReadOnly = this.ReadOnly;
     100      this.coresNeededTextBox.ReadOnly = this.ReadOnly;
     101      this.memoryNeededTextBox.ReadOnly = this.ReadOnly;
     102      this.pluginsNeededTextBox.ReadOnly = this.ReadOnly;
     103      this.projectTextBox.ReadOnly = this.ReadOnly;
     104      this.snapshotStatusText.ReadOnly = this.ReadOnly;
     105      this.snapshotTimeText.ReadOnly = this.ReadOnly;
    78106    }
    79107

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

    r4120 r4121  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
    120   <metadata name="stateTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    121     <value>True</value>
    122   </metadata>
    123   <metadata name="userIdTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    124     <value>True</value>
    125   </metadata>
    126   <metadata name="percentageTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    127     <value>True</value>
    128   </metadata>
    129   <metadata name="dateCreatedTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    130     <value>True</value>
    131   </metadata>
    132   <metadata name="dateFinishedTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    133     <value>True</value>
    134   </metadata>
    135   <metadata name="priorityTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    136     <value>True</value>
    137   </metadata>
    138   <metadata name="coresNeededTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    139     <value>True</value>
    140   </metadata>
    141   <metadata name="memoryNeededTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    142     <value>True</value>
    143   </metadata>
    144   <metadata name="pluginsNeededTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    145     <value>True</value>
    146   </metadata>
    147   <metadata name="projectTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    148     <value>True</value>
    149   </metadata>
    150   <metadata name="snapshotStatusText.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    151     <value>True</value>
    152   </metadata>
    153   <metadata name="dateCalculatedText.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    154     <value>True</value>
    155   </metadata>
    156120</root>

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

    r4120 r4121  
    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.4119")]
    58 [assembly: AssemblyFileVersion("3.3.0.4119")]
    59 [assembly: AssemblyBuildDate("2010/07/29 16:49:22")]
     57[assembly: AssemblyVersion("3.3.0.4120")]
     58[assembly: AssemblyFileVersion("3.3.0.4120")]
     59[assembly: AssemblyBuildDate("2010/07/30 13:39:18")]
Note: See TracChangeset for help on using the changeset viewer.