diff --git a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsCompoundSearchView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsCompoundSearchView.xaml
index 734686a1a..ce0cf56bb 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsCompoundSearchView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Dims/DimsCompoundSearchView.xaml
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:infoview="clr-namespace:CompMs.App.Msdial.View.Information"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:CompMs.App.Msdial.View.Dims"
xmlns:ui="clr-namespace:CompMs.Graphics.UI;assembly=ChartDrawing"
@@ -26,23 +27,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentCompoundSearchView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentCompoundSearchView.xaml
index b82419505..cbc1a0b50 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentCompoundSearchView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAlignmentCompoundSearchView.xaml
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:infoview="clr-namespace:CompMs.App.Msdial.View.Information"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:CompMs.App.Msdial.View.Gcms"
xmlns:ui="clr-namespace:CompMs.Graphics.UI;assembly=ChartDrawing"
@@ -29,23 +30,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisCompoundSearchView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisCompoundSearchView.xaml
index 02335e856..42153ae8b 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisCompoundSearchView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsAnalysisCompoundSearchView.xaml
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:infoview="clr-namespace:CompMs.App.Msdial.View.Information"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:CompMs.App.Msdial.View.Gcms"
xmlns:ui="clr-namespace:CompMs.Graphics.UI;assembly=ChartDrawing"
@@ -29,23 +30,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsCompoundSearchView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsCompoundSearchView.xaml
index 754b49b07..4c5a8368b 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsCompoundSearchView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Imms/ImmsCompoundSearchView.xaml
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:infoview="clr-namespace:CompMs.App.Msdial.View.Information"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:CompMs.App.Msdial.View.Imms"
xmlns:ui="clr-namespace:CompMs.Graphics.UI;assembly=ChartDrawing"
@@ -26,23 +27,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsCompoundSearchView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsCompoundSearchView.xaml
index a64479fe0..4a13219d8 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsCompoundSearchView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcimms/LcimmsCompoundSearchView.xaml
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:infoview="clr-namespace:CompMs.App.Msdial.View.Information"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:CompMs.App.Msdial.View.Lcimms"
xmlns:ui="clr-namespace:CompMs.Graphics.UI;assembly=ChartDrawing"
@@ -22,23 +23,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsCompoundSearchView.xaml b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsCompoundSearchView.xaml
index b4965755c..a31824689 100644
--- a/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsCompoundSearchView.xaml
+++ b/src/MSDIAL5/MsdialGuiApp/View/Lcms/LcmsCompoundSearchView.xaml
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:infoview="clr-namespace:CompMs.App.Msdial.View.Information"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:CompMs.App.Msdial.View.Lcms"
xmlns:ui="clr-namespace:CompMs.Graphics.UI;assembly=ChartDrawing"
@@ -26,23 +27,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
diff --git a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/CompoundSearchVM.cs b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/CompoundSearchVM.cs
index aa152646a..c0e6d5797 100644
--- a/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/CompoundSearchVM.cs
+++ b/src/MSDIAL5/MsdialGuiApp/ViewModel/Search/CompoundSearchVM.cs
@@ -1,6 +1,8 @@
-using CompMs.App.Msdial.Model.Search;
+using CompMs.App.Msdial.Model.Information;
+using CompMs.App.Msdial.Model.Search;
using CompMs.App.Msdial.ViewModel.Chart;
using CompMs.App.Msdial.ViewModel.DataObj;
+using CompMs.App.Msdial.ViewModel.Information;
using CompMs.CommonMVVM;
using CompMs.MsdialCore.DataObj;
using Reactive.Bindings;
@@ -29,6 +31,7 @@ internal abstract class CompoundSearchVM : ViewModelBase, ICompoundSearchViewMod
{
protected static readonly double MassEPS = 1e-10;
private readonly ICompoundSearchModel _model;
+ private readonly MoleculeStructureModel _structureModel;
public CompoundSearchVM(ICompoundSearchModel model) {
if (model is null) {
@@ -53,6 +56,12 @@ public CompoundSearchVM(ICompoundSearchModel model) {
SelectedCompound = model.ToReactivePropertySlimAsSynchronized(m => m.SelectedCompoundResult).AddTo(Disposables);
+ _structureModel = new MoleculeStructureModel().AddTo(Disposables);
+ SelectedCompound
+ .Subscribe(c => _structureModel.UpdateMolecule(c?.MsReference))
+ .AddTo(Disposables);
+ StructureViewModel = new MoleculeStructureViewModel(_structureModel).AddTo(Disposables);
+
var canSet = SelectedCompound.Select(c => c != null);
SetConfidenceCommand = canSet.ToReactiveCommand().AddTo(Disposables);
SetConfidenceCommand.Subscribe(model.SetConfidence);
@@ -76,6 +85,8 @@ public CompoundSearchVM(ICompoundSearchModel model) {
public ReactivePropertySlim SelectedCompound { get; }
+ public MoleculeStructureViewModel StructureViewModel { get; }
+
public ReactiveCommand SetConfidenceCommand { get; }
public ReactiveCommand SetUnsettledCommand { get; }