Merge branch 'master' of github.com:collin80/SavvyCAN

Conflicts:
	SavvyCAN.pro
	mainwindow.cpp
	mainwindow.h

mainwindow.cpp

@@ -10,9 +10,13 @@
 
 /*
 Things that were planned for the GVRET-PC project but never completed.
+
 Single / Multi state - The goal is to find bits that change based on toggles or discrete state items (shifters, etc)
+
 Range state - Find things that range like accelerator pedal inputs, road speed, tach, etc
+
 fuzzy scope - Try to find potential places where a given value might be stored - offer guesses and the program tries to find candidates for you
+or, try to find things that appear to be multi-byte integers
 */
 
 QString MainWindow::loadedFileName = "";
@@ -105,6 +109,7 @@ MainWindow::MainWindow(QWidget *parent) :
     comparatorWindow = NULL;
     settingsDialog = NULL;
     firmwareUploaderWindow = NULL;
+    discreteStateWindow = NULL;
     dbcHandler = new DBCHandler;
     bDirty = false;
     inhibitFilterUpdate = false;
@@ -226,6 +231,12 @@ MainWindow::~MainWindow()
         delete settingsDialog;
     }
 
+    if (discreteStateWindow)
+    {
+        discreteStateWindow->close();
+        delete discreteStateWindow;
+    }
+
     delete ui;
     delete dbcHandler;
     model->clearFrames();
@@ -1001,7 +1012,11 @@ void MainWindow::showComparisonWindow()
 
 void MainWindow::showSingleMultiWindow()
 {
-    //not done yet
+    if (!discreteStateWindow)
+    {
+        discreteStateWindow = new DiscreteStateWindow(model->getListReference());
+    }
+    discreteStateWindow->show();
 }
 
 void MainWindow::showRangeWindow()