Fixed bug in Search not checking if AP is running.

Xio1996 · Jan 29, 2025 · fcdde45 · fcdde45
1 parent ba2f31b
commit fcdde45
Show file tree

Hide file tree

Showing 7 changed files with 405 additions and 10 deletions.
diff --git a/EAACP.csproj b/EAACP.csproj
@@ -131,6 +131,12 @@
     </Compile>
     <Compile Include="Settings.cs" />
     <Compile Include="Stellarium.cs" />
+    <Compile Include="StellariumControl.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="StellariumControl.Designer.cs">
+      <DependentUpon>StellariumControl.cs</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="Config.resx">
       <DependentUpon>Config.cs</DependentUpon>
     </EmbeddedResource>
@@ -161,6 +167,9 @@
     <EmbeddedResource Include="SearchResults1.resx">
       <DependentUpon>SearchResults1.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="StellariumControl.resx">
+      <DependentUpon>StellariumControl.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

diff --git a/Form1.cs b/Form1.cs
@@ -792,6 +792,12 @@ private void btnSearch_Click(object sender, EventArgs e)
                 // Store the search results for DSA and Search List display
                 List<string[]> listOfSearchResults;
 
+                if (!IsAPRunning())
+                {
+                    Speak(AstroPlannerSpeak + " is not running");
+                    return;
+                }
+
                 Speak("Searching");
 
                 APGetCmdResult apOut = APGetObjects(5, 2, "", CreateSearchParams(SearchRA, SearchDec));

diff --git a/SearchResults1.cs b/SearchResults1.cs
@@ -22,6 +22,7 @@ public partial class SearchResults : Form
         DataTable dtUniqueCatalogues = new DataTable();
         int totalResults = 0;
         string stellariumDSOFilter;
+        string displayMode = "All";
 
         public frmCP EAACP;
 
@@ -143,8 +144,10 @@ private void UpdateSearchInfo(int viewCount)
             this.Text = $"Search Results: {totalResults} objects, Current View: {viewCount} objects";
         }
 
-        private void btnDrawSelection_Click(object sender, EventArgs e)
+        private void DrawSelectedObjects()
         {
+            displayMode = "Selected";
+
             DataTable Selected = new DataTable();
 
             Selected.Columns.Add("ID");
@@ -193,19 +196,30 @@ private void btnDrawSelection_Click(object sender, EventArgs e)
 
                 Selected.Rows.Add(SelectedRow);
             }
-            
+
             Stellarium.DrawObjects(Selected);
 
             UpdateSearchInfo(dgvSearchResults.SelectedRows.Count);
         }
 
-        private void btnPlotAll_Click(object sender, EventArgs e)
+        private void btnDrawSelection_Click(object sender, EventArgs e)
         {
+            DrawSelectedObjects();
+        }
 
-            // Stop the catalogues filter from firing
+        private void ResetCatalogueFilter()
+        {
             cbCataloguesFilter.SelectedIndexChanged -= cbCataloguesFilter_SelectedIndexChanged;
             cbCataloguesFilter.SelectedIndex = 0;
             cbCataloguesFilter.SelectedIndexChanged += cbCataloguesFilter_SelectedIndexChanged;
+        }   
+
+        private void btnPlotAll_Click(object sender, EventArgs e)
+        {
+            displayMode = "All";
+
+            // Stop the catalogues filter from firing
+            ResetCatalogueFilter();
 
             // Remove any filtering
             dt.DefaultView.RowFilter = "";
@@ -273,7 +287,19 @@ private void btnOptions_Click(object sender, EventArgs e)
                 frmOpt.TopMost = true;
                 if (frmOpt.ShowDialog() == DialogResult.OK)
                 {
-
+                    // If the user hs changed the display attributes then update the current plot selection on ext.
+                    switch (displayMode)
+                    {
+                        case "All":
+                            Stellarium.DrawObjects(dt);
+                            break;
+                        case "Filtered":
+                            DrawCatalogueFiltered();
+                            break;
+                        case "Selected":
+                            DrawSelectedObjects();
+                            break;
+                    }
                 }
             }
         }
@@ -293,8 +319,10 @@ private void btnCentreSelected_Click(object sender, EventArgs e)
             }
         }
 
-        private void cbCataloguesFilter_SelectedIndexChanged(object sender, EventArgs e)
+        private void DrawCatalogueFiltered()
         {
+            displayMode = "Filtered";
+
             string apCatalogue = cbCataloguesFilter.Text;
             if (apCatalogue == "All Catalogues")
             {
@@ -311,7 +339,11 @@ private void cbCataloguesFilter_SelectedIndexChanged(object sender, EventArgs e)
 
                 UpdateSearchInfo(dv.ToTable().Rows.Count);
             }
+        }
 
+        private void cbCataloguesFilter_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            DrawCatalogueFiltered();
         }
 
         private void btnAllCats_Click(object sender, EventArgs e)
@@ -331,7 +363,12 @@ private void btnDSOAll_Click(object sender, EventArgs e)
 
         private void btnClearPlot_Click(object sender, EventArgs e)
         {
+            displayMode = "All";
             Stellarium.ClearObjects();
+
+            // Stop the catalogues filter from firing
+            ResetCatalogueFilter();
+
             UpdateSearchInfo(0);
         }
 

diff --git a/Stellarium.cs b/Stellarium.cs
@@ -140,14 +140,34 @@ public string SetStelAction(string sName)
             return result;
         }
 
-        public string GetStelProperty(string sName)
+        private JsonDocument jsonStellariumProperties=null;
+
+        private bool GetStellariumProperties()
         {
             string sWebServiceURL = $"http://{IPAddress}:{Port}/api/stelproperty/list";
             string result = GetRequest(sWebServiceURL);
 
-            if (result != "exception")
+            if (!string.IsNullOrEmpty(result))
+            {
+                if (result != "exception")
+                {
+                    jsonStellariumProperties = JsonDocument.Parse(result);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public string GetStelProperty(string sName, bool usePersisted=false)
+        {
+            if (!usePersisted || jsonStellariumProperties==null)
+            {
+                GetStellariumProperties();  
+            }
+
+            if (jsonStellariumProperties != null)
             {
-                JsonDocument jsonStellariumProperties = JsonDocument.Parse(result);
                 if (jsonStellariumProperties.RootElement.TryGetProperty(sName, out JsonElement property))
                 {
                     property.TryGetProperty("value", out JsonElement value);
@@ -164,7 +184,7 @@ public string GetStelProperty(string sName)
             }
 
             sMsg = $"StelProp {sName}, {sMsg}";
-            return result;
+            return "";
         }
 
         public string SetStelProperty(string sName, string sValue)

diff --git a/StellariumControl.Designer.cs b/StellariumControl.Designer.cs
diff --git a/StellariumControl.cs b/StellariumControl.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace EAACP
+{
+    public partial class StellariumControl : Form
+    {
+        private Stellarium Stellarium = new Stellarium();
+
+        public StellariumControl()
+        {
+            InitializeComponent();
+        }
+
+        private void StellariumControl_Load(object sender, EventArgs e)
+        {
+            bool bMP;
+            bool.TryParse(Stellarium.GetStelProperty("actionShow_Planets_ShowMinorBodyMarkers"), out bMP);
+        }
+    }
+}