Started to work on "real" inverting

JensKrumsieck · Jun 20, 2023 · a726fd7 · a726fd7 · github-actions · Jun 20, 2023
1 parent 1891753
commit a726fd7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/PorphyStruct.Core/Analysis/MacrocycleAnalysis.cs b/PorphyStruct.Core/Analysis/MacrocycleAnalysis.cs
@@ -107,6 +107,12 @@ protected virtual IEnumerable<AtomDataPoint> CalculateDataPoints()
         }
     }
 
+    public void InvertDataPoints()
+    {
+        _dataPoints = _dataPoints!.Invert();
+        Properties!.Rebuild();
+    }
+
     /// <summary>
     /// checks whether it's an alpha atom or not
     /// </summary>

diff --git a/PorphyStruct.Core/Analysis/Properties/MacrocycleProperties.cs b/PorphyStruct.Core/Analysis/Properties/MacrocycleProperties.cs
@@ -80,7 +80,7 @@ public MacrocycleProperties(MacrocycleAnalysis analysis)
     /// <summary>
     /// Fills all Lists
     /// </summary>
-    private void Rebuild()
+    public void Rebuild()
     {
         Simulation ??= new Simulation(Analysis.GetAnalysisType());
         if (Analysis.DataPoints.Any())

diff --git a/PorphyStruct.Core/Extension/MathUtil.cs b/PorphyStruct.Core/Extension/MathUtil.cs
@@ -28,4 +28,6 @@ public static double Heron(Atom a1, Atom a2, Atom a3)
         var sqrt = (a + b + c) * (-a + b + c) * (a - b + c) * (a + b - c);
         return 1f / 4f * MathF.Sqrt(sqrt);
     }
+
+    public static IEnumerable<AtomDataPoint> Invert(this IEnumerable<AtomDataPoint> dataPoints) => dataPoints.Select(datapoint => new AtomDataPoint(datapoint.X, -datapoint.Y, datapoint.Atom, datapoint.Size, datapoint.Value, datapoint.Tag));
 }
diff --git a/PorphyStruct.ViewModel/AnalysisViewModel.cs b/PorphyStruct.ViewModel/AnalysisViewModel.cs
@@ -50,6 +50,8 @@ public bool Inverted
         {
             ExperimentalSeries.Inverted = value;
             SimulationSeries.Inverted = value;
+            Analysis.InvertDataPoints();
+            OnPropertyChanged(nameof(Analysis));
             Invalidate();
         });
     }

diff --git a/PorphyStruct.ViewModel/MacrocycleViewModel.cs b/PorphyStruct.ViewModel/MacrocycleViewModel.cs
@@ -1,4 +1,5 @@
-using PorphyStruct.Core;
+using System.ComponentModel;
+using PorphyStruct.Core;
 using PorphyStruct.Core.Analysis.Properties;
 using TinyMVVM;
 
@@ -41,11 +42,23 @@ public async Task Analyze()
         foreach (var part in Macrocycle.DetectedParts)
         {
             var analysis = new AnalysisViewModel(this, part);
+            analysis.PropertyChanged += Child_Changed;
             part.Properties ??= new MacrocycleProperties(part);
             Items.Add(analysis);
             SelectedIndex = Items.IndexOf(analysis);
         }
     }
 
+    private void Child_Changed(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName != nameof(SelectedItem.Analysis)) return;
+        var tmp = new List<AnalysisViewModel>(Items);
+        var tmpIndex = SelectedIndex;
+        Items.Clear();
+        for(var i = 0; i < tmp.Count; i++) Items.Add(tmp[i]);
+        SelectedIndex = -1;
+        SelectedIndex = tmpIndex;
+    }
+
     protected virtual void Validate() { }
 }
diff --git a/PorphyStruct.WPF/MainWindow.xaml b/PorphyStruct.WPF/MainWindow.xaml
@@ -216,7 +216,7 @@
             </h:HelixViewport3D>
             <TabControl Grid.Row="1" Grid.Column="1" Background="Transparent" TabStripPlacement="Left" ItemContainerStyle="{DynamicResource SideTabHeaderStyle}" 
                         Padding="0" BorderThickness="0" ContentTemplateSelector="{DynamicResource TemplateByTypeSelector}">
-                <TabItem Header="Analysis" extension:ControlExtension.AttachedIcon="Flask" DataContext="{Binding SelectedItem.Analysis}" Content="{Binding}"/>
+                <TabItem Header="Analysis" extension:ControlExtension.AttachedIcon="Flask" DataContext="{Binding SelectedItem.Analysis}" Content="{Binding .}"/>
                 <TabItem Header="Coordinates" extension:ControlExtension.AttachedIcon="Navigation" DataContext="{Binding}" Content="{Binding}"/>
                 <TabItem DataContext="{Binding SelectedItem}" Content="{Binding}" Header="Quick Settings" extension:ControlExtension.AttachedIcon="Cog" VerticalAlignment="Top"/>
             </TabControl>