Permalink
Browse files

[new]

* SpectraFox file format (.sfd)
* export possibility of grid spectra to SFD files
* separate data explorer for grid files
  • Loading branch information...
chemicha committed Mar 31, 2017
1 parent 77cee08 commit f961e058ade30e6177bb9c52196e45661cc893a4
Showing with 2,031 additions and 243 deletions.
  1. BIN artwork/icons/MyOwnIcons.pptx
  2. BIN artwork/icons/movie.png
  3. BIN artwork/icons/movie_16.png
  4. BIN artwork/icons/movie_25.png
  5. +1 −1 sourcecode/Build/x86/Debug/SpectroscopyManager.application
  6. BIN sourcecode/Build/x86/Debug/SpectroscopyManager.exe
  7. +4 −4 sourcecode/Build/x86/Debug/SpectroscopyManager.exe.manifest
  8. BIN sourcecode/Build/x86/Debug/SpectroscopyManager.pdb
  9. +1 −1 sourcecode/Build/x86/Debug/SpectroscopyManager.vshost.application
  10. +4 −4 sourcecode/Build/x86/Debug/SpectroscopyManager.vshost.exe.manifest
  11. BIN sourcecode/Build/x86/Debug/app.publish/SpectroscopyManager.exe
  12. +11 −0 sourcecode/Build/x86/Debug/changelog_dev.html
  13. BIN sourcecode/SpectroscopyManager/.vs/SpectroscopyManager/v14/.suo
  14. +123 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/GridFiles/cGridFileFetcher.vb
  15. +2 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/ImportMethods/Nanonis/cFileImportNanonisGrid.vb
  16. +305 −0 .../SpectroscopyManager/SpectroscopyManager/ImportMethods/SpectraFox-SFD/cFileImportSpectraFoxSFD.vb
  17. +37 −43 .../SpectroscopyManager/SpectroscopyManager/ImportMethods/SpectraFox-SFX/cFileImportSpectraFoxSFX.vb
  18. +69 −72 sourcecode/SpectroscopyManager/SpectroscopyManager/ImportMethods/cFileImport.vb
  19. +84 −87 sourcecode/SpectroscopyManager/SpectroscopyManager/ImportMethods/cFileObject.vb
  20. +30 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/My Project/Resources.Designer.vb
  21. +9 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/My Project/Resources.resx
  22. +11 −2 ...ctroscopyManager/SpectroscopyManager/MyControls/ManagerControls/ucFilteredListComboBoxSelector.vb
  23. BIN sourcecode/SpectroscopyManager/SpectroscopyManager/Resources/movie.png
  24. BIN sourcecode/SpectroscopyManager/SpectroscopyManager/Resources/movie_16.png
  25. BIN sourcecode/SpectroscopyManager/SpectroscopyManager/Resources/movie_25.png
  26. +35 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/SpectroscopyManager.vbproj
  27. +49 −21 ...de/SpectroscopyManager/SpectroscopyManager/WindowModules/DataBrowser/mDataBrowserList.Designer.vb
  28. +25 −2 sourcecode/SpectroscopyManager/SpectroscopyManager/WindowModules/DataBrowser/mDataBrowserList.vb
  29. +5 −0 ...cecode/SpectroscopyManager/SpectroscopyManager/WindowModules/DataBrowser/mDataBrowserListEntry.vb
  30. +114 −0 ...e/SpectroscopyManager/SpectroscopyManager/Windows/DataExplorer/wDataExplorer_GridFile.Designer.vb
  31. +138 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/Windows/DataExplorer/wDataExplorer_GridFile.resx
  32. +91 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/Windows/DataExplorer/wDataExplorer_GridFile.vb
  33. +211 −0 .../SpectroscopyManager/SpectroscopyManager/Windows/FormBase-Class/wFormBaseExpectsGridFileOnLoad.vb
  34. +132 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/Windows/GridExporter/wGridExporter.Designer.vb
  35. +138 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/Windows/GridExporter/wGridExporter.resx
  36. +166 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/Windows/GridExporter/wGridExporter.vb
  37. +1 −1 ...anager/SpectroscopyManager/Windows/ScanImage Data Treatment/ImageSummation/wScanImageSummation.vb
  38. +37 −0 ...scopyManager/Windows/ScanImage Data Treatment/MovieGenerator/wScanImageMovieGenerator.Designer.vb
  39. +120 −0 ...SpectroscopyManager/Windows/ScanImage Data Treatment/MovieGenerator/wScanImageMovieGenerator.resx
  40. +67 −0 ...r/SpectroscopyManager/Windows/ScanImage Data Treatment/MovieGenerator/wScanImageMovieGenerator.vb
  41. +3 −0 sourcecode/SpectroscopyManager/SpectroscopyManager/changelog_dev.html
  42. BIN ...e/SpectroscopyManager/SpectroscopyManager/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
  43. BIN ...ctroscopyManager/SpectroscopyManager/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  44. BIN ...ode/SpectroscopyManager/SpectroscopyManager/obj/x86/Debug/SpectroscopyManager.Resources.resources
  45. +1 −1 sourcecode/SpectroscopyManager/SpectroscopyManager/obj/x86/Debug/SpectroscopyManager.application
  46. BIN sourcecode/SpectroscopyManager/SpectroscopyManager/obj/x86/Debug/SpectroscopyManager.exe
  47. +4 −4 sourcecode/SpectroscopyManager/SpectroscopyManager/obj/x86/Debug/SpectroscopyManager.exe.manifest
  48. BIN sourcecode/SpectroscopyManager/SpectroscopyManager/obj/x86/Debug/SpectroscopyManager.pdb
  49. +3 −0 ...troscopyManager/SpectroscopyManager/obj/x86/Debug/SpectroscopyManager.vbproj.FileListAbsolute.txt
  50. BIN ...oscopyManager/SpectroscopyManager/obj/x86/Debug/SpectroscopyManager.vbproj.GenerateResource.Cache
  51. BIN ...SpectroscopyManager/SpectroscopyManager/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll
BIN +232 Bytes (100%) artwork/icons/MyOwnIcons.pptx
Binary file not shown.
BIN +863 Bytes artwork/icons/movie.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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>Zcb+HZs8TwWKEWs9HdsYauF2t4AAA9V/E0RJW91o6bo=</dsig:DigestValue>
<dsig:DigestValue>jFbShhRUbtLMYqpnXrZdVt7sC/32W7yUeVhJ/VvsfBE=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
Binary file not shown.
@@ -151,14 +151,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SpectroscopyManager.exe" size="3864064">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SpectroscopyManager.exe" size="3888128">
<assemblyIdentity name="SpectroscopyManager" version="2017.3.9.0" 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>g9O53EoPj/QLu5Mkkz5YuWyQyONmxK496J/LHsvlFEw=</dsig:DigestValue>
<dsig:DigestValue>pH2tU41e8cNSbq/grzlCvbKiUAk1r1rsVUux7rEFjlA=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@@ -186,13 +186,13 @@
</hash>
</dependentAssembly>
</dependency>
<file name="changelog_dev.html" size="2411">
<file name="changelog_dev.html" size="2917">
<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>sOw7wg1/MQLx7/5o3LpZS6F7BK4/J0IhwsYdDZF8a5g=</dsig:DigestValue>
<dsig:DigestValue>29cP9OVRdv7UJ7FY3kijOz7mVcvS325drzaBAl7pcXo=</dsig:DigestValue>
</hash>
</file>
<file name="changelog_stable.html" size="40535">
Binary file not shown.
@@ -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>Zcb+HZs8TwWKEWs9HdsYauF2t4AAA9V/E0RJW91o6bo=</dsig:DigestValue>
<dsig:DigestValue>jFbShhRUbtLMYqpnXrZdVt7sC/32W7yUeVhJ/VvsfBE=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@@ -151,14 +151,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SpectroscopyManager.exe" size="3864064">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="SpectroscopyManager.exe" size="3888128">
<assemblyIdentity name="SpectroscopyManager" version="2017.3.9.0" 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>g9O53EoPj/QLu5Mkkz5YuWyQyONmxK496J/LHsvlFEw=</dsig:DigestValue>
<dsig:DigestValue>pH2tU41e8cNSbq/grzlCvbKiUAk1r1rsVUux7rEFjlA=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@@ -186,13 +186,13 @@
</hash>
</dependentAssembly>
</dependency>
<file name="changelog_dev.html" size="2411">
<file name="changelog_dev.html" size="2917">
<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>sOw7wg1/MQLx7/5o3LpZS6F7BK4/J0IhwsYdDZF8a5g=</dsig:DigestValue>
<dsig:DigestValue>29cP9OVRdv7UJ7FY3kijOz7mVcvS325drzaBAl7pcXo=</dsig:DigestValue>
</hash>
</file>
<file name="changelog_stable.html" size="40535">
Binary file not shown.
@@ -13,6 +13,17 @@
Change your update-channel in the "Help"-menu of the main window.
</span>
<p>
Version 2017.03.29.0<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>[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>
</ol>
</p>
<p>
Version 2017.03.09.0<br />
<ol>
Binary file not shown.
@@ -0,0 +1,123 @@
Imports Amib.Threading
''' <summary>
''' Base class for fetching a desired grid file in a background-thread
''' </summary>
Public Class cGridFileFetcher
#Region "Properties"
''' <summary>
''' GridFile Object
''' </summary>
Protected oGridFile As cGridFile
''' <summary>
''' Returns the currently loaded GridFile,
''' </summary>
Public Property CurrentGridFile As cGridFile
Get
Return Me.oGridFile
End Get
Set(value As cGridFile)
Me.oGridFile = value
End Set
End Property
''' <summary>
''' File-Object of the Grid-File
''' </summary>
Protected CurrentFileObject As cFileObject
''' <summary>
''' Priority of the background thread used.
''' </summary>
Private FetchThreadPriority As WorkItemPriority
''' <summary>
''' Currently used Threadpool to load data.
''' </summary>
Private _ThreadPool As SmartThreadPool
''' <summary>
''' Just fetch the header of the file?
''' Speeds things up, if data not needed!
''' </summary>
Private _FetchOnlyFileHeader As Boolean
#End Region
#Region "Constructor"
''' <summary>
''' Constructor takes the selected GridFile-FileObject.
''' Allows to hand over a Thread-Pool that is used to manage the
''' fetch-thread. If not set, or set to nothing, a separate,
''' non-managed thread will be used.
''' </summary>
Public Sub New(ByRef GridFile As cFileObject,
Optional ByRef ThreadPoolToUse As SmartThreadPool = Nothing,
Optional ByVal FetchPriority As WorkItemPriority = WorkItemPriority.Normal,
Optional ByVal FetchOnlyFileHeader As Boolean = False)
' Add file to local Object
Me.CurrentFileObject = GridFile
Me._ThreadPool = ThreadPoolToUse
Me.FetchThreadPriority = FetchPriority
Me._FetchOnlyFileHeader = FetchOnlyFileHeader
End Sub
#End Region
#Region "Events"
''' <summary>
''' Event that gets fired, when the GridFile was successfully loaded.
''' </summary>
Public Event FileFetchedComplete(ByRef GridFile As cGridFile)
#End Region
#Region "File Fetch Function"
''' <summary>
''' Starts the fetching procedure for the selected File. (ASYNC)
''' </summary>
Public Sub FetchAsync()
' If no thread-pool is definied, use a non-managed thread to load the data.
If Me._ThreadPool Is Nothing Then
Dim NonMangedThread As New Threading.Thread(AddressOf Me.FileFetcherSub)
NonMangedThread.Start(Me.CurrentFileObject)
Else
' Send FileObject to ThreadPoolQueue
Me._ThreadPool.QueueWorkItem(AddressOf Me.FileFetcher,
Me.CurrentFileObject,
Me.FetchThreadPriority)
End If
End Sub
''' <summary>
''' Starts the fetching procedure for the selected file (DIRECT)
''' </summary>
Public Sub FetchDirect()
Me.FileFetcherSub(Me.CurrentFileObject)
End Sub
''' <summary>
''' Spectroscopy File Fetcher to load the Gridfile.
''' </summary>
Private Function FileFetcher(FileObjectToLoad As Object) As Object
Dim oFileObjectToLoad As cFileObject = CType(FileObjectToLoad, cFileObject)
' Load the file from disk
Me.oGridFile = Nothing
If cFileImport.GetGridFile(oFileObjectToLoad, oGridFile, Me._FetchOnlyFileHeader) Then
RaiseEvent FileFetchedComplete(Me.oGridFile)
End If
Return Nothing
End Function
''' <summary>
''' Sub-Delegate version
''' </summary>
Private Sub FileFetcherSub(FileObjectToLoad As Object)
Me.FileFetcher(FileObjectToLoad)
End Sub
#End Region
End Class
@@ -374,6 +374,7 @@ Public Class cFileImportNanonisGrid
Else
.Name = oGridFile.SweepSignalColumn
End If
SweepSignalColumn.IsSpectraFoxGenerated = False
End With
' Add the SpectroscopyTable to the GridFile
DuplicatedSpectroscopyTable.AddNonPersistentColumn(SweepSignalColumn)
@@ -394,6 +395,7 @@ Public Class cFileImportNanonisGrid
.Name = oGridFile.ChannelsRecorded(i)
End If
DataColumn.IsSpectraFoxGenerated = False
End With
DuplicatedSpectroscopyTable.AddNonPersistentColumn(DataColumn)
Next
Oops, something went wrong.

0 comments on commit f961e05

Please sign in to comment.