1.24b Multiple bigfixes and now control up to 8 receivers, and new co…

…mma seperator fix
m0dts · Jun 3, 2021 · 9fd942a · 9fd942a
1 parent 7dd0172
commit 9fd942a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 12 deletions.
diff --git a/QO-100 WB Quick Tune/Form1.Designer.cs b/QO-100 WB Quick Tune/Form1.Designer.cs
diff --git a/QO-100 WB Quick Tune/Form1.cs b/QO-100 WB Quick Tune/Form1.cs
@@ -61,6 +61,8 @@ public partial class Form1 : Form
         int num_rxs_to_scan = 1;
         string rydebandinfo = "";
 
+        bool comma_sep = false;
+
 
         public Form1()
         {
@@ -77,7 +79,14 @@ public Form1()
         private void Form1_Load(object sender, EventArgs e)
         {
 
-
+            try
+            {
+                Convert.ToSingle("0.5");
+            }
+            catch
+            {
+                comma_sep = true;
+            }
 
             //Restore things here
             Properties.Settings.Default.Reload();
@@ -181,6 +190,8 @@ private void Form1_Load(object sender, EventArgs e)
 
             sigs.set_num_rx_scan(num_rxs_to_scan);
             sigs.set_num_rx(RxList.Items.Count);
+
+
         }
 
 
@@ -250,17 +261,21 @@ private void drawspectrum_bandplan()
                 string xval = channel.Element("x-freq").Value;
 
                 float freq;
-                freq = Convert.ToSingle(xval);
-                if (!freq.ToString().Contains(".")){        //detect whether ',' or '.' thousand separator!
+                int sr;
+
+                if (comma_sep){        //detect whether ',' or '.' thousand separator!
                     freq = Convert.ToSingle(xval.Replace(".", ","));
+                    sr = Convert.ToInt32(channel.Element("sr").Value.Replace(".", ","));
+                }
+                else
+                {
+                    freq = Convert.ToSingle(xval);
+                    sr = Convert.ToInt32(channel.Element("sr").Value);
                 }
 
 
-                int sr = Convert.ToInt32(channel.Element("sr").Value);
-                if (!freq.ToString().Contains("."))         //detect whether ',' or '.' thousand separator!
-                {        
-                    sr = Convert.ToInt32(channel.Element("sr").Value.Replace(".", ","));
-                }
+
+
 
                 int pos = Convert.ToInt16((922.0 / span) * (freq - start_freq));
                 w = Convert.ToInt32(sr / (span * 1000.0) * 922 * rolloff);
@@ -690,7 +705,16 @@ private void timer1_Tick(object sender, EventArgs e)
         {
             for(int n = 0; n < num_rxs_to_scan; n++) //RxList.Items.Count
             {
-                Tuple<signal.Sig, int> ret = sigs.tune(combo_mode.SelectedIndex, Convert.ToInt16(Convert.ToSingle(combo_WaitTime.Text) * 60),n);
+                float time;
+                if (comma_sep){
+                    time = Convert.ToSingle(combo_WaitTime.Text.Replace(".",","));
+                }
+                else
+                {
+                    time = Convert.ToSingle(combo_WaitTime.Text);
+                }
+
+                Tuple<signal.Sig, int> ret = sigs.tune(combo_mode.SelectedIndex, Convert.ToInt16(time * 60),n);
               //  Console.WriteLine(ret.Item1.frequency);
                 if (ret.Item1.frequency > 0)      //above 0 is a change in signal
                 {

diff --git a/QO-100 WB Quick Tune/Form1.resx b/QO-100 WB Quick Tune/Form1.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="label4.Text" xml:space="preserve">
-    <value>QO-100 WB Quick Tune V1.23b (May 2021)
+    <value>QO-100 WB Quick Tune V1.24b (June 2021)
 
 Main Operation:
 Add up to 8 receivers to the Rx List, any combination of Minitioune/Ryde should work.
@@ -136,6 +136,9 @@ New Features 1.23b:
 Now upto 8 receivers
 Remember Tune Mode
 
+1.24b:
+Fix for comma seperation in numbers
+
 </value>
   </data>
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">