Updated the options to show version number

Classifier.Outlook/core/engine.cs

@@ -242,11 +242,29 @@ public void LogEventInformation(string sEvent)
     /// Get the current version number of the engine.
     /// </summary>
     /// <returns>int the engine version number</returns>
-    public int GetEngineVersion()
+    public int GetEngineVersionNumber()
     {
       return ClassifyEngine.GetEngineVersion();
     }
 
+    /// <summary>
+    /// Get the current version number of the engine.
+    /// </summary>
+    /// <returns>Version the engine version number</returns>
+    public Version GetEngineVersion()
+    {
+      //  get the version
+      var engineVersion = GetEngineVersionNumber();
+      var major = (int)(engineVersion / 1000000.0);
+
+      engineVersion -= (major * 1000000);
+      var minor = (int)(engineVersion / 1000.0);
+
+      engineVersion -= (minor * 1000);
+      var build = engineVersion;
+      return new Version( major, minor, build, 0 );
+    }
+
     public string GetConfig(string configName )
     {
       string configValue;

Classifier.Outlook/forms/OptionsForm.cs

@@ -3,6 +3,7 @@
 using myoddweb.classifier.core;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Diagnostics;
 
 namespace myoddweb.classifier.forms
 {
@@ -194,8 +195,24 @@ private void Magnets_Click(object sender, EventArgs e)
       }
     }
 
+    private Version GetFileVersion()
+    {
+      var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+      var fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
+      return new Version(fvi.FileMajorPart, fvi.FileMinorPart, fvi.FileBuildPart, fvi.FilePrivatePart);
+    }
+
     private void OnLoad(object sender, EventArgs e)
     {
+      //  get the file version
+      var version = GetFileVersion();
+
+      // get the engine version.
+      var engineVersion = _engine.GetEngineVersion();
+
+      //Version version = Assembly.GetEntryAssembly().GetName().Version;
+      Text = $"Options - [{version.Major}.{version.Minor}.{version.Build}.{version.Revision}] - (Engine [{engineVersion.Major}.{engineVersion.Minor}.{engineVersion.Build}])";
+
       // check if we want to re-check all categories.
       reCheckCategories.Checked = _options.ReCheckCategories;
 

common/myoddweb.classifierUnitTest/TestGeneral.cs

@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
 
 namespace myoddweb.classifierUnitTest
 {
@@ -25,8 +26,15 @@ public static void ClassCleanup()
     [TestMethod]
     public void TestGetVersionNumber()
     {
-      var versionNumber = TheEngine.GetEngineVersion();
+      var versionNumber = TheEngine.GetEngineVersionNumber();
       Assert.AreEqual(1005002, versionNumber );
     }
+
+    [TestMethod]
+    public void TestGetVersion()
+    {
+      var version = TheEngine.GetEngineVersion();
+      Assert.AreEqual( new Version(1, 5, 2, 0), version);
+    }
   }
 }

readme.md

@@ -48,6 +48,7 @@ But it does not take that long, really, invest a couple of day creating good Mag
 - Option to automatically train classified mail using magnet, (true by default)
 - Updated to 1.5.2 engine, ( has better/faster classification)
 	- Classifications are now threaded.
+- Options text now gives the version number + engine version number.	
 
 #### 0.4.0.1 - 0.4.0.2 (02/11/2016)
 - Fixed a few issues in the tokenizer.