From 87ae42c3da77b58234de55372cc85ce2a865b3c6 Mon Sep 17 00:00:00 2001
From: Erik <erik@busn.uconn.edu>
Date: Wed, 18 Apr 2012 14:33:42 -0400
Subject: [PATCH] Minor tweaks to GUI.  Added program selection in code.

---
 DataScraperGUI/MainWindow.xaml           | 11 ++++++-----
 DataScraperGUI/MainWindow.xaml.cs        | 24 ++++++++++++++++++++++--
 DataScraperGUI/Programs/NormalProgram.cs |  5 ++++-
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/DataScraperGUI/MainWindow.xaml b/DataScraperGUI/MainWindow.xaml
index 41a27ad..d674142 100644
--- a/DataScraperGUI/MainWindow.xaml
+++ b/DataScraperGUI/MainWindow.xaml
@@ -1,13 +1,14 @@
 <Window x:Class="DataScraperGUI.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="UConn ECE Senior Design - Group 155 - DataScraper" Height="400" Width="525">
+        Title="UConn ECE Senior Design - Group 155 - HVAC Tester" Height="400" Width="525">
     <Grid>
         <ComboBox Height="23" HorizontalAlignment="Left" Margin="12,46,0,0" Name="programComboBox" VerticalAlignment="Top" Width="479">
-            <ComboBoxItem Content="Normal program.  (Minor variations, no major events.)" IsSelected="True" />
-            <ComboBoxItem Content="Temperature too cold in office." />
-            <ComboBoxItem Content="Humidity too high in office." />
-            <ComboBoxItem Content="VAV is not responding." />
+            <ComboBoxItem Content="Normal" IsSelected="True" />
+            <ComboBoxItem Content="Temperature too COLD" />
+            <ComboBoxItem Content="Temperature too HOT" />
+            <ComboBoxItem Content="No air flow" />
+            <ComboBoxItem Content="Air too dry" />
         </ComboBox>
         <Label Content="Step 1: Choose a program." Height="28" HorizontalAlignment="Left" Margin="12,12,0,0" Name="label1" VerticalAlignment="Top" />
         <Label Content="Step 2: Choose a run-time duration." Height="28" HorizontalAlignment="Left" Margin="12,75,0,0" Name="label2" VerticalAlignment="Top" />
diff --git a/DataScraperGUI/MainWindow.xaml.cs b/DataScraperGUI/MainWindow.xaml.cs
index 33b73bf..9af28cd 100644
--- a/DataScraperGUI/MainWindow.xaml.cs
+++ b/DataScraperGUI/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Windows;
@@ -30,10 +31,29 @@ namespace DataScraperGUI {
         }
 
         private void runButton_Click (object sender, RoutedEventArgs e) {
+            cancelButton.IsEnabled = true; // Enable the cancel button.
             logger.LogWarning("Run button pressed!");
 
-            var p = new NormalProgram(logger, progressBar);
-            p.Execute();
+            // Grab the selected program
+            var pText = programComboBox.SelectionBoxItem;
+            
+            if (pText.Equals("Normal")) {
+                // Run normal program
+                var p = new NormalProgram(logger, progressBar);
+                p.Execute();
+            } else if (pText.Equals("Temperature too COLD")) {
+                // Run temp too cold program
+            } else if (pText.Equals("Temperature too HOT")) {
+                // Run temp too hot program
+            } else if (pText.Equals("No air flow")) {
+                // Run no air flow program
+            } else if (pText.Equals("Air too dry")) {
+                // Run air too dry program
+            } else {
+                logger.LogError("Program not selected or system fault.");
+            }
+
+            cancelButton.IsEnabled = false; // Disable the cancel button.
         }
     }
 }
diff --git a/DataScraperGUI/Programs/NormalProgram.cs b/DataScraperGUI/Programs/NormalProgram.cs
index e9b7cdd..11fc68b 100644
--- a/DataScraperGUI/Programs/NormalProgram.cs
+++ b/DataScraperGUI/Programs/NormalProgram.cs
@@ -14,17 +14,20 @@ namespace DataScraperGUI.Programs {
         public NormalProgram (Logger l, ProgressBar p) : base(l, p) { }
 
         public override void Execute() {
+            logger.LogMessage("Starting the 'Normal' program.");
             // Setup Simulation
             sb = new StringBuilder();
 
             GenerateHeader();  // Write the CSV header
 
             logger.LogError("This program has not yet been implemented.");
+            
+            logger.LogMessage("Ending the 'Normal' program.");
             progressBar.Value = 100;
         }
 
         private void GenerateHeader () {
-            
+            sb.AppendLine();
         }
     }
 }