Bug fixes.

Corresponds to published release 0.9.6.
aarpon · Nov 29, 2012 · 365a9fd · 365a9fd
1 parent 6f837d4
commit 365a9fd
Show file tree

Hide file tree

Showing 48 changed files with 106 additions and 109 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -32,7 +32,7 @@ PROJECT_NAME           = ImarisSelector
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = "0.9.5 (preview release)"
+PROJECT_NUMBER         = "0.9.6 (preview release)"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 

diff --git a/ImarisSelector/MainWindow.cs b/ImarisSelector/MainWindow.cs
@@ -19,10 +19,8 @@ public partial class MainWindow : Form
         private Settings m_Settings;
 
         /// <summary>
-        /// Protected RegistryManager instance.
+        /// Protected ModuleManager instance.
         /// </summary>
-        ///protected RegistryManager m_Manager;
-
         protected ModuleManager m_ModuleManager;
 
         /// <summary>
@@ -50,7 +48,6 @@ public MainWindow()
             }
 
             // Instantiate the registry manager
-            ///this.m_Manager = new RegistryManager(this.m_Settings.ImarisVersion);
             this.m_ModuleManager = new ModuleManager(this.m_Settings);
 
             // Initialize the window components

diff --git a/ImarisSelector/Properties/AssemblyInfo.cs b/ImarisSelector/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.5")]
-[assembly: AssemblyFileVersion("0.9.5")]
+[assembly: AssemblyVersion("0.9.6")]
+[assembly: AssemblyFileVersion("0.9.6")]
diff --git a/ImarisSelectorAdmin/MainWindow.cs b/ImarisSelectorAdmin/MainWindow.cs
@@ -257,6 +257,9 @@ private void FillProductList()
             List<String> installedProducts =
                 new ModuleManager(this.m_Settings).GetInstalledProductList();
 
+            // We do not display Imaris
+            installedProducts.Remove("Imaris");
+
             // Clear existing lists
             checkedListBoxProducts.Items.Clear();
             this.m_Settings.ProductsWithEnabledState.Clear();

diff --git a/ImarisSelectorAdmin/Properties/AssemblyInfo.cs b/ImarisSelectorAdmin/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.5")]
-[assembly: AssemblyFileVersion("0.9.5")]
+[assembly: AssemblyVersion("0.9.6")]
+[assembly: AssemblyFileVersion("0.9.6")]
diff --git a/ImarisSelectorLib/ModuleManager.cs b/ImarisSelectorLib/ModuleManager.cs
@@ -59,6 +59,8 @@ public ModuleManager(Settings settings)
             // Initialize the Registry Manager
             this.m_RegistryManager = new RegistryManager(this.m_Settings.ImarisVersion);
 
+            // Make sure the Imaris product is enabled
+            EnableProducts(new List<String> { "Imaris" });
         }
 
         /// <summary>
@@ -105,7 +107,7 @@ public List<String> GetInstalledAndFilteredProductList()
                 from productName in installedProducts.AsEnumerable()
                 join productWithState in this.m_Settings.ProductsWithEnabledState
                 on productName equals productWithState.Key
-                where productWithState.Value == true
+                where productWithState.Value == true && !productName.Equals("Imaris")
                 orderby productName ascending
                 select new { productName };
 
@@ -459,12 +461,13 @@ private void Build()
             // This is a catalogue of all known Imaris modules
             this.m_ModuleCatalog = new List<Module> 
             {
-                /* The Imaris modules are not listed
+                /* ImarisAnalyzer is obsolete
                 new Module {
                     ID = "ImarisAnalyzer",
                     Name = "Imaris Analyzer",
                     Product = "Obsolete", 
                     Description = "Unknown module" },
+                */
                 new Module {
                     ID = "ImarisBase",
                     Name = "Imaris Base",
@@ -490,7 +493,6 @@ private void Build()
                     Name = "ImarisTopography",
                     Product = "Imaris",
                     Description = ""},
-                */
                 new Module {
                     ID = "ImarisCellsViewer",
                     Name = "Imaris Cell",
@@ -635,11 +637,9 @@ private void Build()
 
             // This is a catalog of the know Imaris products (stored in a Dictionary)
             this.m_ProductCatalog = new Dictionary<String, String>();
-            /*
             this.m_ProductCatalog.Add(
                 "Imaris",
                 "3D and 4D Real-Time Interactive Image Visualization."); 
-             */
             this.m_ProductCatalog.Add(
                 "Imaris Measurement Pro",
                 "The Analysis and Quantification Engine.");

diff --git a/ImarisSelectorLib/Properties/AssemblyInfo.cs b/ImarisSelectorLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.5")]
-[assembly: AssemblyFileVersion("0.9.5")]
+[assembly: AssemblyVersion("0.9.6")]
+[assembly: AssemblyFileVersion("0.9.6")]
diff --git a/ImarisSelectorLib/RegistryManager.cs b/ImarisSelectorLib/RegistryManager.cs
@@ -110,17 +110,11 @@ private void ScanForInstalledModules()
                 return;
             }
 
-            // Iterate over the modules and store them with their state
+            // Iterate over the modules and store them
             String[] moduleNames = licensesKey.GetValueNames();
             foreach (String module in moduleNames)
             {
-                // Get the license state
-                // We hide ImarisAnalyzer, which appears to be an old (inactive) module
-                // TODO: Decide what to do with ImarisBase
-                if (!module.Equals("ImarisAnalyzer"))
-                {
-                    this.m_InstalledModuleList.Add(module);
-                }
+                this.m_InstalledModuleList.Add(module);
             }
 
         }

diff --git a/ImarisSelectorLib/SettingsManager.cs b/ImarisSelectorLib/SettingsManager.cs
@@ -77,7 +77,7 @@ public static Settings read()
 
                         if (parts[0].Equals("FileVersion"))
                         {
-                            if (!parts[1].Equals("ImarisSelector Settings File version 1.0"))
+                            if (!parts[1].Equals("ImarisSelector Settings File version 1.0.0"))
                             {
                                 // Invalid settings file version - ignore the file
                                 return new Settings();
@@ -133,7 +133,7 @@ public static bool write(Settings settings)
                 StreamWriter file = new StreamWriter(settingsFullFileName());
                 if (file != null)
                 {
-                    file.WriteLine("FileVersion=ImarisSelector Settings File version 1.0");
+                    file.WriteLine("FileVersion=ImarisSelector Settings File version 1.0.0");
                     file.WriteLine("ImarisVersion=" + settings.ImarisVersion);
                     file.WriteLine("ImarisPath=" + settings.ImarisPath);
                     foreach (KeyValuePair<String, bool> entry in settings.ProductsWithEnabledState)

diff --git a/SetupImarisSelector/SetupImarisSelector.vdproj b/SetupImarisSelector/SetupImarisSelector.vdproj
@@ -185,6 +185,11 @@
             "AssemblyAsmDisplayName" = "8:ImarisSelectorLib, Version=0.9.5.0, Culture=neutral, processorArchitecture=AMD64"
                 "ScatterAssemblies"
                 {
+                    "_666C06C517C1DD7E0BB734058644EA5E"
+                    {
+                    "Name" = "8:ImarisSelectorLib.dll"
+                    "Attributes" = "3:512"
+                    }
                 }
             "SourcePath" = "8:ImarisSelectorLib.dll"
             "TargetName" = "8:"
@@ -342,15 +347,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:ImarisSelector"
-        "ProductCode" = "8:{28F464E3-C3BC-40A8-BBA8-ADC231DFAF7F}"
-        "PackageCode" = "8:{5FBFBC66-D1AA-4505-9A9E-294B379A8F26}"
+        "ProductCode" = "8:{88A6D222-8E27-4758-B2A8-9317F3FDCC83}"
+        "PackageCode" = "8:{B54B78B9-045C-4CFD-B887-914C4433DB6B}"
         "UpgradeCode" = "8:{31EFE1ED-5124-4CDA-992F-469E6D3DE479}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:0.9.5"
+        "ProductVersion" = "8:0.9.6"
         "Manufacturer" = "8:ETH Zurich"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/doc/html/annotated.html b/doc/html/annotated.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -107,7 +107,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_1_1_imaris_selector-members.html b/doc/html/class_imaris_selector_1_1_imaris_selector-members.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -97,7 +97,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_1_1_imaris_selector.html b/doc/html/class_imaris_selector_1_1_imaris_selector.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -104,7 +104,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_1_1_main_window-members.html b/doc/html/class_imaris_selector_1_1_main_window-members.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -101,7 +101,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_1_1_main_window.html b/doc/html/class_imaris_selector_1_1_main_window.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -123,7 +123,7 @@
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pro-attribs"></a>
 Protected Attributes</h2></td></tr>
 <tr class="memitem:ae59867a5f4a0430862d68a96140ef9b4"><td class="memItemLeft" align="right" valign="top"><a class="el" href="class_imaris_selector_lib_1_1_module_manager.html">ModuleManager</a>&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_imaris_selector_1_1_main_window.html#ae59867a5f4a0430862d68a96140ef9b4">m_ModuleManager</a></td></tr>
-<tr class="memdesc:ae59867a5f4a0430862d68a96140ef9b4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Protected RegistryManager instance.  <a href="#ae59867a5f4a0430862d68a96140ef9b4"></a><br/></td></tr>
+<tr class="memdesc:ae59867a5f4a0430862d68a96140ef9b4"><td class="mdescLeft">&#160;</td><td class="mdescRight">Protected ModuleManager instance.  <a href="#ae59867a5f4a0430862d68a96140ef9b4"></a><br/></td></tr>
 <tr class="separator:ae59867a5f4a0430862d68a96140ef9b4"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a675877299c435a71366901c091852c21"><td class="memItemLeft" align="right" valign="top">Dictionary&lt; String, bool &gt;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="class_imaris_selector_1_1_main_window.html#a675877299c435a71366901c091852c21">m_ImarisProducts</a></td></tr>
 <tr class="memdesc:a675877299c435a71366901c091852c21"><td class="mdescLeft">&#160;</td><td class="mdescRight">Dictionary of Imaris product names and state.  <a href="#a675877299c435a71366901c091852c21"></a><br/></td></tr>
@@ -146,7 +146,6 @@
 </div><div class="memdoc">
 
 <p>Constructor. </p>
-<p>this.m_Manager = new RegistryManager(this.m_Settings.ImarisVersion); </p>
 
 </div>
 </div>
@@ -224,8 +223,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </table>
 </div><div class="memdoc">
 
-<p>Protected RegistryManager instance. </p>
-<p>protected RegistryManager m_Manager; </p>
+<p>Protected ModuleManager instance. </p>
 
 </div>
 </div>
@@ -236,7 +234,7 @@ <h2 class="groupheader">Member Data Documentation</h2>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_admin_1_1_imaris_selector_admin-members.html b/doc/html/class_imaris_selector_admin_1_1_imaris_selector_admin-members.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -97,7 +97,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_admin_1_1_imaris_selector_admin.html b/doc/html/class_imaris_selector_admin_1_1_imaris_selector_admin.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -104,7 +104,7 @@
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_admin_1_1_main_window-members.html b/doc/html/class_imaris_selector_admin_1_1_main_window-members.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -99,7 +99,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_admin_1_1_main_window.html b/doc/html/class_imaris_selector_admin_1_1_main_window.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -179,7 +179,7 @@ <h2 class="groupheader">Member Function Documentation</h2>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>

diff --git a/doc/html/class_imaris_selector_lib_1_1_module-members.html b/doc/html/class_imaris_selector_lib_1_1_module-members.html
@@ -22,7 +22,7 @@
  <tr style="height: 56px;">
   <td style="padding-left: 0.5em;">
    <div id="projectname">ImarisSelector
-   &#160;<span id="projectnumber">0.9.5 (preview release)</span>
+   &#160;<span id="projectnumber">0.9.6 (preview release)</span>
    </div>
    <div id="projectbrief">ImarisSelector allows picking the module licenses to check out when Imaris starts.</div>
   </td>
@@ -101,7 +101,7 @@
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated on Wed Nov 28 2012 16:46:26 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
+Generated on Thu Nov 29 2012 12:44:45 for ImarisSelector by &#160;<a href="http://www.doxygen.org/index.html">
 <img class="footer" src="doxygen.png" alt="doxygen"/>
 </a> 1.8.2
 </small></address>