changes to the code

Vitalis95 · Jan 30, 2024 · adf7e24 · adf7e24
1 parent 610660a
commit adf7e24
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 33 deletions.
diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb
@@ -1110,16 +1110,13 @@ Public Class dlgBarAndPieChart
     End Sub
 
     Private Sub AutoFacetStation()
-        Dim ucrCurrentReceiver As ucrReceiver = Nothing
+        Dim currentReceiver As ucrReceiver = ucrBarChartSelector.CurrentReceiver
 
-        If ucrBarChartSelector.CurrentReceiver IsNot Nothing Then
-            ucrCurrentReceiver = ucrBarChartSelector.CurrentReceiver
+        If currentReceiver IsNot Nothing Then
+            ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
+            currentReceiver.SetMeAsReceiver()
+            AddRemoveGroupBy()
         End If
-        ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrBarChartSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
-        If ucrCurrentReceiver IsNot Nothing Then
-            ucrCurrentReceiver.SetMeAsReceiver()
-        End If
-        AddRemoveGroupBy()
     End Sub
 
     Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged

diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb
@@ -568,16 +568,13 @@ Public Class dlgHistogram
     End Sub
 
     Private Sub AutoFacetStation()
-        Dim ucrCurrentReceiver As ucrReceiver = Nothing
+        Dim currentReceiver As ucrReceiver = ucrHistogramSelector.CurrentReceiver
 
-        If ucrHistogramSelector.CurrentReceiver IsNot Nothing Then
-            ucrCurrentReceiver = ucrHistogramSelector.CurrentReceiver
+        If currentReceiver IsNot Nothing Then
+            ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
+            currentReceiver.SetMeAsReceiver()
+            AddRemoveGroupBy()
         End If
-        ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrHistogramSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
-        If ucrCurrentReceiver IsNot Nothing Then
-            ucrCurrentReceiver.SetMeAsReceiver()
-        End If
-        AddRemoveGroupBy()
     End Sub
 
     Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged

diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb
@@ -959,18 +959,14 @@ Public Class dlgLinePlot
     End Sub
 
     Private Sub AutoFacetStation()
-        Dim ucrCurrentReceiver As ucrReceiver = Nothing
+        Dim currentReceiver As ucrReceiver = ucrLinePlotSelector.CurrentReceiver
 
-        If ucrLinePlotSelector.CurrentReceiver IsNot Nothing Then
-            ucrCurrentReceiver = ucrLinePlotSelector.CurrentReceiver
+        If currentReceiver IsNot Nothing Then
+            ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
+            currentReceiver.SetMeAsReceiver()
+            AddRemoveGroupBy()
         End If
-        ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrLinePlotSelector.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
-        If ucrCurrentReceiver IsNot Nothing Then
-            ucrCurrentReceiver.SetMeAsReceiver()
-        End If
-        AddRemoveGroupBy()
     End Sub
-
     Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged
         If Not bUpdateComboOptions Then
             Exit Sub

diff --git a/instat/dlgScatterPlot.vb b/instat/dlgScatterPlot.vb
@@ -582,16 +582,13 @@ Public Class dlgScatterPlot
     End Sub
 
     Private Sub AutoFacetStation()
-        Dim ucrCurrentReceiver As ucrReceiver = Nothing
+        Dim currentReceiver As ucrReceiver = ucrSelectorForScatter.CurrentReceiver
 
-        If ucrSelectorForScatter.CurrentReceiver IsNot Nothing Then
-            ucrCurrentReceiver = ucrSelectorForScatter.CurrentReceiver
+        If currentReceiver IsNot Nothing Then
+            ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
+            currentReceiver.SetMeAsReceiver()
+            AddRemoveGroupBy()
         End If
-        ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorForScatter.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"})
-        If ucrCurrentReceiver IsNot Nothing Then
-            ucrCurrentReceiver.SetMeAsReceiver()
-        End If
-        AddRemoveGroupBy()
     End Sub
 
     Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged