Support Hive Files (#344)

* Add support for importing Hive format in MS-DIAL4 and 5 * Update TargetFramework from 4.72 to 4.8 to use Hive API * Fix target framework version * Update target framework version --------- Co-authored-by: Ipputa Tada <[email protected]> Co-authored-by: Yuki Matsuzawa <[email protected]>
systemsomicslab · May 30, 2024 · 22d38e9 · 22d38e9
1 parent 5fcfb03
commit 22d38e9
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 13 deletions.
diff --git a/src/MSDIAL4/ChromatogramUI/Chromatogram.csproj b/src/MSDIAL4/ChromatogramUI/Chromatogram.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFrameworks>net48;net472</TargetFrameworks>
     <RootNamespace>Rfx.Riken.OsakaUniv</RootNamespace>
     <Configurations>Debug;Release;Debug vendor unsupported;Release vendor unsupported</Configurations>
     <UseWPF>true</UseWPF>
@@ -38,7 +38,7 @@
     <ProjectReference Include="..\..\Common\CommonMVVM\CommonMVVM.csproj" />
     <ProjectReference Include="..\..\Common\CommonStandard\CommonStandard.csproj" />
     <ProjectReference Include="..\DataProcessingStandard\DataProcessingStandard.csproj" />
-    <PackageReference Include="RawDataHandler" Version="1.0.8763.372" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="RawDataHandler" Version="1.0.*" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="RawDataHandler" Version="1.0.*" Condition="'$(Configuration)'=='Release'" />
     <PackageReference Include="RawDataHandler-Vendor-UnSupported" Version="1.0.*-*" Condition="'$(Configuration)'=='Debug vendor unsupported'" />
     <PackageReference Include="RawDataHandler-Vendor-UnSupported" Version="1.0.*" Condition="'$(Configuration)'=='Release vendor unsupported'" />

diff --git a/src/MSDIAL4/MsDial/MSDIAL.csproj b/src/MSDIAL4/MsDial/MSDIAL.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net481</TargetFrameworks>
+    <TargetFrameworks>net48;net481;net472</TargetFrameworks>
     <RootNamespace>Rfx.Riken.OsakaUniv</RootNamespace>
     <AssemblyName>MSDIAL</AssemblyName>
     <OutputType>WinExe</OutputType>

diff --git a/src/MSDIAL4/MsDial/Property/AnalysisFilePropertySetWin.xaml.cs b/src/MSDIAL4/MsDial/Property/AnalysisFilePropertySetWin.xaml.cs
@@ -46,7 +46,7 @@ private void Click_AnalysisFilePathsSelect(object sender, RoutedEventArgs e)
             }
             else {
                 //ofd.Filter = "ABF file(*.abf)|*.abf|mzML file(*.mzml)|*.mzml|netCDF file(*.cdf)|*.cdf|IBF file(*.ibf)|*.ibf|WIFF file(*.wiff)|*.wiff|WIFF2 file(*.wiff2)|*.wiff2";
-                ofd.Filter = "ABF file(*.abf)|*.abf|mzML file(*.mzml)|*.mzml|netCDF file(*.cdf)|*.cdf|IBF file(*.ibf)|*.ibf|WIFF file(*.wiff)|*.wiff|WIFF2 file(*.wiff2)|*.wiff2|Raw file(*.raw)|*.raw|LCD file(*.lcd)|*.lcd|QGD file(*.qgd)|*.qgd|LRP file(*.lrp)|*.lrp";
+                ofd.Filter = "ABF file(*.abf)|*.abf|Hive file(*.hmd, *.mzB)|*.hmd;*.mzB|mzML file(*.mzml)|*.mzml|netCDF file(*.cdf)|*.cdf|IBF file(*.ibf)|*.ibf|WIFF file(*.wiff)|*.wiff|WIFF2 file(*.wiff2)|*.wiff2|Raw file(*.raw)|*.raw|LCD file(*.lcd)|*.lcd|QGD file(*.qgd)|*.qgd|LRP file(*.lrp)|*.lrp";
             }
             ofd.Title = "Import analysis files";
             ofd.InitialDirectory = mainWindow.ProjectProperty.ProjectFolderPath;

diff --git a/src/MSDIAL4/MsDial/Property/AnalysisFilePropertySettingVM.cs b/src/MSDIAL4/MsDial/Property/AnalysisFilePropertySettingVM.cs
@@ -190,12 +190,12 @@ public void ReadImportedFiles(string[] filepathes) {
                     break;
                 }
 #else
-                if (fileExtension != ".abf" && fileExtension != ".cdf" && 
-                    fileExtension != ".mzml" && fileExtension != ".raw" &&
+                if (fileExtension != ".abf" && fileExtension != ".hmd" && fileExtension != ".mzb" &&
+                    fileExtension != ".cdf" && fileExtension != ".mzml" && fileExtension != ".raw" &&
                     fileExtension != ".d" && fileExtension != ".iabf" && fileExtension != ".ibf"
                      && fileExtension != ".wiff" && fileExtension != ".wiff2" && fileExtension != ".qgd" && fileExtension != ".lcd"
                      && fileExtension != ".lrp") {
-                    errorMessage += "This program can just accept .abf, .mzml, .cdf, .d, .ibf, .wiff, .wiff2, .lcd, .qgd, .lrp or .raw files.";
+                    errorMessage += "This program can just accept .abf, .hmd, .mzb, .mzml, .cdf, .d, .ibf, .wiff, .wiff2, .lcd, .qgd, .lrp or .raw files.";
                     break;
                 }
 #endif

diff --git a/src/MSDIAL5/MsdialCore/MsdialCore.csproj b/src/MSDIAL5/MsdialCore/MsdialCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
     <RootNamespace>CompMs.MsdialCore</RootNamespace>
     <Configurations>Debug;Release;Debug vendor unsupported;Release vendor unsupported</Configurations>
     <LangVersion>12</LangVersion>

diff --git a/src/MSDIAL5/MsdialGuiApp/MsdialGuiApp.csproj b/src/MSDIAL5/MsdialGuiApp/MsdialGuiApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFrameworks>net472;net48;net481</TargetFrameworks>
+		<TargetFrameworks>net48;net481</TargetFrameworks>
 		<UseWPF>true</UseWPF>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<AssemblyName>MSDIAL</AssemblyName>

diff --git a/src/MSDIAL5/MsdialGuiApp/View/Setting/DatasetFileSettingView.xaml.cs b/src/MSDIAL5/MsdialGuiApp/View/Setting/DatasetFileSettingView.xaml.cs
@@ -16,6 +16,8 @@ namespace CompMs.App.Msdial.View.Setting
     public partial class DatasetFileSettingView : UserControl {
         private static readonly IFileSelectionItem[] FILE_SELECTION_ITEMS = new[] {
             new FileSelectionItem("ABF file", ".abf"),
+            new FileSelectionItem("Hive HMD file", ".hmd"),
+            new FileSelectionItem("Hive mzB file", ".mzb"),
             new FileSelectionItem("mzML file", ".mzml"),
             new FileSelectionItem("netCDF file", ".cdf"),
             new FileSelectionItem("IBF file", ".ibf"),

diff --git a/src/MSDIAL5/SpectrumViewer/SpectrumViewer.csproj b/src/MSDIAL5/SpectrumViewer/SpectrumViewer.csproj
@@ -8,7 +8,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <RootNamespace>CompMs.App.SpectrumViewer</RootNamespace>
     <AssemblyName>SpectrumViewer</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

diff --git a/src/RawDataApp/RawDataViewer/RawDataViewer.csproj b/src/RawDataApp/RawDataViewer/RawDataViewer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
-    <TargetFrameworks>net472;net48;net481</TargetFrameworks>
+    <TargetFrameworks>net48;net481</TargetFrameworks>
     <RootNamespace>CompMs.App.RawDataViewer</RootNamespace>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ApplicationIcon>msdial_icon.ico</ApplicationIcon>

diff --git a/tests/Common/ChartDrawingUiTest/ChartDrawingUiTest.csproj b/tests/Common/ChartDrawingUiTest/ChartDrawingUiTest.csproj
@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <RootNamespace>ChartDrawingUiTest</RootNamespace>
     <AssemblyName>ChartDrawingUiTest</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

diff --git a/tests/MSDIAL5/MsdialGuiAppTests/MsdialGuiAppTests.csproj b/tests/MSDIAL5/MsdialGuiAppTests/MsdialGuiAppTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <LangVersion>12</LangVersion>