Skip to content

Commit

Permalink
Agilent MH12 method export (#1344)
Browse files Browse the repository at this point in the history 
Add support for Agilent MassHunter 12 method export.
  • Loading branch information
@kaipot
kaipot authored Nov 29, 2023
1 parent 02c3689 commit f17d5a0
Show file tree
Hide file tree
Showing 52 changed files with 25,655 additions and 13,882 deletions.
2 changes: 1 addition & 1 deletion pwiz_tools/Skyline/Alerts/AboutDlg.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
<data name="textBox1.Text" xml:space="preserve">
<value>Agilent Technologies
Mass Hunter Data Access Component
Copyright © 2017 by Agilent Technologies
Copyright © 2023 by Agilent Technologies
https://www.agilent.com

BiblioSpec
Expand Down
8 changes: 7 additions & 1 deletion pwiz_tools/Skyline/CommandLine.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3694,7 +3694,7 @@ private bool ExportInstrumentFile(ExportFileType type, CommandArgs args)
_out.WriteLine(Resources.CommandLine_ExportInstrumentFile_Error__A_template_file_is_required_to_export_a_method_);
return false;
}
if (Equals(args.MethodInstrumentType, ExportInstrumentType.AGILENT6400)
if (Equals(args.MethodInstrumentType, ExportInstrumentType.AGILENT6400) || Equals(args.MethodInstrumentType, ExportInstrumentType.AGILENT_MASSHUNTER_12)
? !Directory.Exists(args.TemplateFile)
: !File.Exists(args.TemplateFile))
{
Expand All @@ -3707,6 +3707,12 @@ private bool ExportInstrumentFile(ExportFileType type, CommandArgs args)
_out.WriteLine(Resources.CommandLine_ExportInstrumentFile_Error__The_folder__0__does_not_appear_to_contain_an_Agilent_QQQ_method_template___The_folder_is_expected_to_have_a__m_extension__and_contain_the_file_qqqacqmethod_xsd_, args.TemplateFile);
return false;
}
if (Equals(args.MethodInstrumentType, ExportInstrumentType.AGILENT_MASSHUNTER_12) &&
!AgilentUltivoMethodExporter.IsMethodPath(args.TemplateFile))
{
_out.WriteLine(Resources.CommandLine_ExportInstrumentFile_The_folder__0__does_not_appear_to_contain_an_Agilent_MassHunter_12_method_template__The_folder_is_expected_to_have_a__m_extension_, args.TemplateFile);
return false;
}
}

if (!args.ExportStrategySet)
Expand Down
6 changes: 6 additions & 0 deletions pwiz_tools/Skyline/Executables/BuildMethod/BuildAgilentMH12Method/App.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
</configuration>
158 changes: 158 additions & 0 deletions ...ools/Skyline/Executables/BuildMethod/BuildAgilentMH12Method/BuildAgilentMH12Method.csproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{0A0180A8-6BCB-41B7-8636-D034B1E629BC}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>BuildAgilentMH12Method</RootNamespace>
<AssemblyName>BuildAgilentMH12Method</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\Method\Agilent\MH12\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\Method\Agilent\MH12\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.CommonUtilities, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.CommonUtilities.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.DataInterfaces, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.DataInterfaces.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.ESW, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.ESW.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.HWConfigResourceMgr, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.HWConfigResourceMgr.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.KeyValueInterfaces, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.KeyValueInterfaces.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MethodCreator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MethodCreator.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MethodLocaleServiceProvider, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MethodLocaleServiceProvider.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MethodResourceMgr, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MethodResourceMgr.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MethodValidationModule, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MethodValidationModule.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.ModelSpecificMethodResourceManager, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.ModelSpecificMethodResourceManager.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MRMObjectFactory, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MRMObjectFactory.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSActualProvider, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSActualProvider.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSDataStorage, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSDataStorage.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSDataStorageIF, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSDataStorageIF.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSIF, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSIF.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSMethodDO, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSMethodDO.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSParamProvider, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSParamProvider.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSTrace, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSTrace.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSTraceDataSystemIF, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSTraceDataSystemIF.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.MSTuneDO, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.MSTuneDO.dll</HintPath>
</Reference>
<Reference Include="Agilent.MSDrivers.LCQuadrupole.ValidationBase, Version=3.1.18.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MSDrivers.LCQuadrupole.ValidationBase.dll</HintPath>
</Reference>
<Reference Include="Agilent.MsdTcd.SuperTune, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\Agilent.MsdTcd.SuperTune.dll</HintPath>
</Reference>
<Reference Include="BaseCommon, Version=12.0.315.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\BaseCommon.dll</HintPath>
</Reference>
<Reference Include="BaseError, Version=12.0.315.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\BaseError.dll</HintPath>
</Reference>
<Reference Include="BaseMSUtils, Version=12.0.258.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\BaseMSUtils.dll</HintPath>
</Reference>
<Reference Include="BaseTof, Version=12.0.315.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\BaseTof.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Shared\Lib\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="RapidControlIF, Version=2.1.5.0, Culture=neutral, PublicKeyToken=43cb10ffc99be394, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Method\Agilent\MH12\RapidControlIF.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Loading

0 comments on commit f17d5a0

Please sign in to comment.