[fixed] preselection of the wrong y-channels in the SpectroscopyTable…

…Viewer

.gitignore

@@ -6,6 +6,9 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.sfc
+*.sfcc
+*.sfx
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

sourcecode/Build/x86/Debug/SpectroscopyManager.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>TKy9jP72q3WyoZhNJAJR2EEBX1yEHLJdzoWZHikoQJ8=</dsig:DigestValue>
+        <dsig:DigestValue>9HTCTxggIVeHE/S41zd6pQ4ZxGEYiCx0JR8TOIz1TBE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

sourcecode/Build/x86/Debug/SpectroscopyManager.exe.manifest

@@ -4,7 +4,7 @@
   <description asmv2:iconFile="Resources\SpectraFoxLogo3.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="SpectroscopyManager" version="2017.4.10.1" language="neutral" processorArchitecture="x86" />
+    <assemblyIdentity name="SpectroscopyManager" version="2017.4.10.2" language="neutral" processorArchitecture="x86" />
     <commandLine file="SpectroscopyManager.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -56,13 +56,13 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ExpTreeLib.dll" size="132096">
-      <assemblyIdentity name="ExpTreeLib" version="3.0.2.26619" language="neutral" processorArchitecture="x86" />
+      <assemblyIdentity name="ExpTreeLib" version="3.0.2.15858" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>BIj04adIb8tfccPErPqofEGUqbFZ7uOMy88Oq/e0DCM=</dsig:DigestValue>
+        <dsig:DigestValue>nZkGaYFFiHauyOOQ7IaO2PHVS8C3bnwHs/hN/kcbGmc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -152,25 +152,25 @@
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SpectroscopyManager.exe" size="3905536">
-      <assemblyIdentity name="SpectroscopyManager" version="2017.4.10.1" language="neutral" processorArchitecture="x86" />
+      <assemblyIdentity name="SpectroscopyManager" version="2017.4.10.2" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>g2hAfJKlRn/SzaxkanAC5iLmg0PfFep7KozsB8hxvZo=</dsig:DigestValue>
+        <dsig:DigestValue>nzdz1LfL8dfnVTq7Ahvofty3lCdeGsK6CKBoYW/59ts=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
   <dependency>
     <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ZedGraph.dll" size="325632">
-      <assemblyIdentity name="ZedGraph" version="5.1.5.16293" publicKeyToken="02A83CBD123FCD60" language="neutral" processorArchitecture="x86" />
+      <assemblyIdentity name="ZedGraph" version="5.1.5.15858" publicKeyToken="02A83CBD123FCD60" language="neutral" processorArchitecture="x86" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>r0HwzagBLptBatUzG3bsLEmYrhRcKycT/3XDWwLCrtM=</dsig:DigestValue>
+        <dsig:DigestValue>C/Sp7ptWPId3/L66H/idpwenzKLlAxlrN+LHOpG3d/g=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -186,22 +186,22 @@
       </hash>
     </dependentAssembly>
   </dependency>
-  <file name="changelog_dev.html" size="3202">
+  <file name="changelog_dev.html" size="3331">
     <hash>
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>St0WXszvqPC0f6OYEq1ZxwA093LSP3cNOBONUSjF9kc=</dsig:DigestValue>
+      <dsig:DigestValue>oQoJpBOePSMYgYIm2Ojbhdw8gd/sGGkhh7f8U7bgVBk=</dsig:DigestValue>
     </hash>
   </file>
-  <file name="changelog_stable.html" size="41324">
+  <file name="changelog_stable.html" size="41453">
     <hash>
       <dsig:Transforms>
         <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
       </dsig:Transforms>
       <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-      <dsig:DigestValue>FP3paqucVOy7Y9fOsriiUkm3cZHP2NGDC0i/kSvtVFY=</dsig:DigestValue>
+      <dsig:DigestValue>5CKpSwL7cd5k8KaUuBkihjSOyjRC6AN8IzgFu1rs4JE=</dsig:DigestValue>
     </hash>
   </file>
   <file name="ColorSchemes\alpine colors.sfc" size="3162">

sourcecode/Build/x86/Debug/changelog_dev.html

@@ -14,14 +14,15 @@
     </span>
 
     <p>
-        Version 2017.04.10.0<br />
+        Version 2017.04.10.2<br />
         <ol>
             <li>[new] SpectraFox file format (.sfd)</li>
             <li>[new] export possibility of grid spectra to SFD files</li>
             <li>[new] separate data explorer for grid files</li>
             <li>[new] gif animation generator for multiple scan images</li>
             <li>[improved] the scan image file viewer has now a new tab showing all header properties</li>
             <li>[improved] the scan image viewer can now display an arbitrary property embed in the image</li>
+            <li>[improved] fixed that values above the max/min intensity value in the image plots were plotted transparent</li>
             <li>[bugfix] scan for compatible files now continues, if a broken file was found</li>
             <li>[bugfix] Nanonis files with more complex units in the headers are recognized correctly</li>
         </ol>

sourcecode/Build/x86/Debug/changelog_stable.html

@@ -9,14 +9,15 @@
     <span style="font-size:15px; font-weight:bold;">Stable Update Channel:</span><br />
 
     <p>
-        Version 2017.04.10.0<br />
+        Version 2017.04.10.2<br />
         <ol>
             <li>[new] SpectraFox file format (.sfd)</li>
             <li>[new] export possibility of grid spectra to SFD files</li>
             <li>[new] separate data explorer for grid files</li>
             <li>[new] gif animation generator for multiple scan images</li>
             <li>[improved] the scan image file viewer has now a new tab showing all header properties</li>
             <li>[improved] the scan image viewer can now display an arbitrary property embed in the image</li>
+            <li>[improved] fixed that values above the max/min intensity value in the image plots were plotted transparent</li>
             <li>[bugfix] scan for compatible files now continues, if a broken file was found</li>
             <li>[bugfix] Nanonis files with more complex units in the headers are recognized correctly</li>
         </ol>

sourcecode/ExternalProjects/ExpTreeLib/obj/x86/Debug/ExpTreeLib.vbproj.FileListAbsolute.txt

@@ -18,3 +18,10 @@ D:\SpectraFoxGIT\spectrafox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug
 D:\SpectraFoxGIT\spectrafox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug\ExpTreeLib.vbproj.GenerateResource.Cache
 D:\SpectraFoxGIT\spectrafox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug\ExpTreeLib.dll
 D:\SpectraFoxGIT\spectrafox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug\ExpTreeLib.pdb
+D:\SpectraFox\sourcecode\ExternalProjects\ExpTreeLib\bin\x86\Debug\ExpTreeLib.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ExpTreeLib\bin\x86\Debug\ExpTreeLib.pdb
+D:\SpectraFox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug\ExpTreeLib.vbprojResolveAssemblyReference.cache
+D:\SpectraFox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug\ExpTreeLib.ExpTree.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug\ExpTreeLib.vbproj.GenerateResource.Cache
+D:\SpectraFox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug\ExpTreeLib.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ExpTreeLib\obj\x86\Debug\ExpTreeLib.pdb

sourcecode/ExternalProjects/ZedGraph/obj/x86/Debug/ZedGraph.csproj.FileListAbsolute.txt

@@ -142,3 +142,51 @@ D:\SpectraFoxGIT\spectrafox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\z
 D:\SpectraFoxGIT\spectrafox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\zh-tw\ZedGraph.resources.dll
 D:\SpectraFoxGIT\spectrafox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.dll
 D:\SpectraFoxGIT\spectrafox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.pdb
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\ZedGraph.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\ZedGraph.pdb
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\de\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\es\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\fr\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\hu\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\it\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\ja\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\pt\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\ru\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\sk\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\sv\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\tr\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\zh-cn\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\bin\x86\Debug\zh-tw\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.csprojResolveAssemblyReference.cache
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphControl.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.tw.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.de.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.es.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.fr.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.hu.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.it.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.ja.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.pt.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.ru.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.sk.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.sv.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.tr.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.zh-cn.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.ZedGraph.ZedGraphLocale.zh-tw.resources
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.csproj.GenerateResource.Cache
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\de\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\es\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\fr\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\hu\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\it\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ja\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\pt\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ru\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\sk\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\sv\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\tr\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\zh-cn\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\zh-tw\ZedGraph.resources.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.dll
+D:\SpectraFox\sourcecode\ExternalProjects\ZedGraph\obj\x86\Debug\ZedGraph.pdb

sourcecode/SpectroscopyManager/SpectroscopyManager/MyControls/ManagerControls/ucSpectroscopyColumnSelector.vb

@@ -50,6 +50,7 @@ Public Class ucSpectroscopyColumnSelector
             If V = String.Empty Then
                 Debug.WriteLine("ucColumnSelector: SetLastSelection->EmptyString")
             End If
+            Debug.WriteLine("ucColumnSelector: storing last selection: " & V)
         Next
         My.Settings.LastSpectroscopyPlot_SelectedColumnNames = Value
         'cGlobal.SaveSettings() '##### NEEDS To MUCH TIME!!

sourcecode/SpectroscopyManager/SpectroscopyManager/SpectroscopyManager.vbproj

@@ -2205,8 +2205,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>"$(DevEnvDir)..\Tools\vsvars32.bat"
-"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\signtool.exe" sign /sha1 0B190EE1FF7510AAD9B3FC81B89CCEAD4EFA1283 /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(ProjectDir)obj\x86\$(ConfigurationName)\$(TargetFileName)"</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

sourcecode/SpectroscopyManager/SpectroscopyManager/WindowModules/SpectroscopyTable/mSpectroscopyTableViewer.vb

@@ -236,8 +236,12 @@ Public Class mSpectroscopyTableViewer
         UpdateStyleSpectroscopyTableList()
 
         ' Update ColumnList
+        Me.cbX.TurnOnLastSelectionSaving = False
+        Me.cbY.TurnOnLastSelectionSaving = False
         Me.cbX.InitializeColumns(SpectroscopyTable.GetColumnNameList, My.Settings.LastSpectroscopyPlot_SelectedColumnNameX, False)
         Me.cbY.InitializeColumns(SpectroscopyTable.GetColumnNameList, My.Settings.LastSpectroscopyPlot_SelectedColumnNames, Me.TurnOnLastFilterSaving_Y)
+        Me.cbX.TurnOnLastSelectionSaving = True
+        Me.cbY.TurnOnLastSelectionSaving = True
 
         Me.bReady = True
     End Sub
@@ -564,23 +568,22 @@ Public Class mSpectroscopyTableViewer
         ' Fill the Column-Selectors.
         Me.bReady = False
 
-        Me.cbX.InitializeColumns(SpectroscopyTable.GetColumnList)
+        Me.cbX.InitializeColumns(SpectroscopyTable.GetColumnList,, False)
         Me.cbY.InitializeColumns(SpectroscopyTable.GetColumnList,, Me.TurnOnLastFilterSaving_Y)
 
-        Dim YColumnsToSelect As List(Of String)
+        Dim YColumnsToSelect As New List(Of String)
         If (PreferLastSelectedColumnNames) AndAlso
            (My.Settings.LastSpectroscopyPlot_SelectedColumnNames IsNot Nothing AndAlso My.Settings.LastSpectroscopyPlot_SelectedColumnNames.Count > 0) Then
 
             ' Add the list from the settings.
-            YColumnsToSelect = New List(Of String)(My.Settings.LastSpectroscopyPlot_SelectedColumnNames.Count)
             For Each C As String In My.Settings.LastSpectroscopyPlot_SelectedColumnNames
                 YColumnsToSelect.Add(C)
             Next
 
         Else
 
             ' add the given list
-            YColumnsToSelect = SelectedColumnNamesY
+            YColumnsToSelect.AddRange(SelectedColumnNamesY)
         End If
 
         ' Select the given entries:

sourcecode/SpectroscopyManager/SpectroscopyManager/obj/x86/Debug/SpectroscopyManager.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>TKy9jP72q3WyoZhNJAJR2EEBX1yEHLJdzoWZHikoQJ8=</dsig:DigestValue>
+        <dsig:DigestValue>9HTCTxggIVeHE/S41zd6pQ4ZxGEYiCx0JR8TOIz1TBE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>