Changeset 6225 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4

Timestamp:

05/17/11 15:10:50 (13 years ago)

Author:

ascheibe

Message:

#1233

• Slave UI now uses tab pages
• balloon tips are displayed on receiving new jobs

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4

Files:

• AboutView.Designer.cs (added)
• AboutView.cs (added)
• AboutView.resx (added)
• HeuristicLab.Clients.Hive.Slave.Views-3.4.csproj (modified) (4 diffs)
• LogView.Designer.cs (added)
• LogView.cs (added)
• LogView.resx (added)
• Properties/Settings.Designer.cs (added)
• Properties/Settings.settings (added)
• SlaveAboutDialog.Designer.cs (deleted)
• SlaveAboutDialog.cs (deleted)
• SlaveAboutDialog.resx (deleted)
• SlaveItem.cs (modified) (1 diff)
• SlaveView.Designer.cs (modified) (9 diffs)
• SlaveView.cs (modified) (4 diffs)
• app.config (added)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/HeuristicLab.Clients.Hive.Slave.Views-3.4.csproj

@@ -123 +123 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AboutView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="AboutView.Designer.cs">
+      <DependentUpon>AboutView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LogView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="LogView.Designer.cs">
+      <DependentUpon>LogView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -128 +140 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="SlaveAboutDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="SlaveAboutDialog.Designer.cs">
-      <DependentUpon>SlaveAboutDialog.cs</DependentUpon>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
     <Compile Include="SlaveItem.cs" />
+    <None Include="app.config" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <None Include="HeuristicLabClientsHiveSlaveViewsPlugin.cs.frame" />
@@ -145 +157 @@
     <Compile Include="HeuristicLabClientsHiveSlaveViewsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="Properties\Settings.settings">
+      <Generator>PublicSettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>
@@ -156 +172 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="AboutView.resx">
+      <DependentUpon>AboutView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LogView.resx">
+      <DependentUpon>LogView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SlaveAboutDialog.resx">
-      <DependentUpon>SlaveAboutDialog.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="SlaveView.resx">

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs

@@ -135 +135 @@
     }
 
+    private int lastJobsFetched = 0;
+
     public event EventHandler<EventArgs<StatusCommons>> SlaveStatusChanged;
+    public void OnUserVisibleMessageFired(string msg) {
+      var handler = UserVisibleMessageFired;
+      if (handler != null) handler(this, new EventArgs<string>(msg));
+    }
+
+    public event EventHandler<EventArgs<string>> UserVisibleMessageFired;
     public void OnStatusChanged(StatusCommons status) {
       var handler = SlaveStatusChanged;
       if (handler != null) handler(this, new EventArgs<StatusCommons>(status));
+
+      int diff = status.JobsFetched - lastJobsFetched;
+      lastJobsFetched = status.JobsFetched;
+      if (diff > 0) {
+        OnUserVisibleMessageFired(string.Format("HeuristicLab Hive received {0} new jobs!", diff));
+      }
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-      System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-      System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
-      this.txtLog = new System.Windows.Forms.TextBox();
+      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea6 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+      System.Windows.Forms.DataVisualization.Charting.Legend legend6 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+      System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
       this.btnPauseAll = new System.Windows.Forms.Button();
       this.btnStopAll = new System.Windows.Forms.Button();
       this.btnRestart = new System.Windows.Forms.Button();
       this.btnSleep = new System.Windows.Forms.Button();
-      this.btnAbout = new System.Windows.Forms.Button();
       this.jobChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
       this.btnRestartService = new System.Windows.Forms.Button();
@@ -59 +57 @@
       this.SuspendLayout();
       // 
-      // txtLog
-      // 
-      this.txtLog.BackColor = System.Drawing.Color.White;
-      this.txtLog.Location = new System.Drawing.Point(3, 184);
-      this.txtLog.Multiline = true;
-      this.txtLog.Name = "txtLog";
-      this.txtLog.ReadOnly = true;
-      this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.txtLog.Size = new System.Drawing.Size(584, 239);
-      this.txtLog.TabIndex = 1;
-      // 
       // btnPauseAll
       // 
+      this.btnPauseAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.btnPauseAll.Location = new System.Drawing.Point(476, 3);
       this.btnPauseAll.Name = "btnPauseAll";
@@ -82 +70 @@
       // btnStopAll
       // 
+      this.btnStopAll.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.btnStopAll.Location = new System.Drawing.Point(476, 32);
       this.btnStopAll.Name = "btnStopAll";
@@ -92 +81 @@
       // btnRestart
       // 
+      this.btnRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.btnRestart.Location = new System.Drawing.Point(476, 90);
       this.btnRestart.Name = "btnRestart";
@@ -102 +92 @@
       // btnSleep
       // 
+      this.btnSleep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.btnSleep.Location = new System.Drawing.Point(476, 61);
       this.btnSleep.Name = "btnSleep";
@@ -110 +101 @@
       this.btnSleep.Click += new System.EventHandler(this.btnSleep_Click);
       // 
-      // btnAbout
-      // 
-      this.btnAbout.Location = new System.Drawing.Point(476, 149);
-      this.btnAbout.Name = "btnAbout";
-      this.btnAbout.Size = new System.Drawing.Size(111, 28);
-      this.btnAbout.TabIndex = 6;
-      this.btnAbout.Text = "About Hive";
-      this.btnAbout.UseVisualStyleBackColor = true;
-      this.btnAbout.Click += new System.EventHandler(this.btnAbout_Click);
-      // 
       // jobChart
       // 
-      chartArea1.Name = "ChartArea1";
-      this.jobChart.ChartAreas.Add(chartArea1);
-      legend1.Name = "Legend1";
-      this.jobChart.Legends.Add(legend1);
+      chartArea6.Name = "ChartArea1";
+      this.jobChart.ChartAreas.Add(chartArea6);
+      legend6.Name = "Legend1";
+      this.jobChart.Legends.Add(legend6);
       this.jobChart.Location = new System.Drawing.Point(3, 3);
       this.jobChart.Name = "jobChart";
-      series1.ChartArea = "ChartArea1";
-      series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Doughnut;
-      series1.Legend = "Legend1";
-      series1.Name = "Series1";
-      this.jobChart.Series.Add(series1);
+      series6.ChartArea = "ChartArea1";
+      series6.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Doughnut;
+      series6.Legend = "Legend1";
+      series6.Name = "Series1";
+      this.jobChart.Series.Add(series6);
       this.jobChart.Size = new System.Drawing.Size(293, 174);
       this.jobChart.TabIndex = 7;
@@ -138 +119 @@
       // btnRestartService
       // 
+      this.btnRestartService.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.btnRestartService.Location = new System.Drawing.Point(476, 119);
       this.btnRestartService.Name = "btnRestartService";
@@ -152 +134 @@
       this.Controls.Add(this.btnRestartService);
       this.Controls.Add(this.jobChart);
-      this.Controls.Add(this.btnAbout);
       this.Controls.Add(this.btnSleep);
       this.Controls.Add(this.btnRestart);
       this.Controls.Add(this.btnStopAll);
       this.Controls.Add(this.btnPauseAll);
-      this.Controls.Add(this.txtLog);
       this.Name = "SlaveView";
       this.Size = new System.Drawing.Size(590, 426);
       ((System.ComponentModel.ISupportInitialize)(this.jobChart)).EndInit();
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }
@@ -168 +147 @@
     #endregion
 
-    private System.Windows.Forms.TextBox txtLog;
     private System.Windows.Forms.Button btnPauseAll;
     private System.Windows.Forms.Button btnStopAll;
     private System.Windows.Forms.Button btnRestart;
     private System.Windows.Forms.Button btnSleep;
-    private System.Windows.Forms.Button btnAbout;
     private System.Windows.Forms.DataVisualization.Charting.Chart jobChart;
     private System.Windows.Forms.Button btnRestartService;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs

@@ -58 +58 @@
     #region Register Content Events
     protected override void DeregisterContentEvents() {
-      Content.SlaveMessageLogged -= new System.EventHandler<EventArgs<string>>(Content_SlaveMessageLogged);
       Content.SlaveShutdown -= new System.EventHandler(Content_SlaveShutdown);
       Content.SlaveStatusChanged -= new System.EventHandler<EventArgs<StatusCommons>>(Content_SlaveStatusChanged);
@@ -68 +67 @@
       base.RegisterContentEvents();
 
-      Content.SlaveMessageLogged += new System.EventHandler<EventArgs<string>>(Content_SlaveMessageLogged);
       Content.SlaveShutdown += new System.EventHandler(Content_SlaveShutdown);
       Content.SlaveStatusChanged += new System.EventHandler<EventArgs<StatusCommons>>(Content_SlaveStatusChanged);
@@ -110 +108 @@
 
     void Content_SlaveShutdown(object sender, System.EventArgs e) {
-      txtLog.AppendText("Slave did shutdown" + Environment.NewLine);
       Task.Factory.StartNew(Connector);
-    }
-
-    void Content_SlaveMessageLogged(object sender, EventArgs<string> e) {
-      txtLog.AppendText(e.Value + Environment.NewLine);
     }
     #endregion
@@ -168 +161 @@
     }
 
-    private void btnAbout_Click(object sender, System.EventArgs e) {
-      SlaveAboutDialog diag = new SlaveAboutDialog();
-      diag.ShowDialog();
-    }
-
     private void btnRestartService_Click(object sender, EventArgs e) {
       if (CheckRunAsAdmin()) {