Merge remote-tracking branch 'origin/sequence' into rtaudio

rigcommander.cpp

@@ -170,9 +170,6 @@ void rigCommander::setup()
     // common elements between the two constructors go here:
     setCIVAddr(civAddr);
     spectSeqMax = 0; // this is now set after rig ID determined
-    payloadPrefix = QByteArray("\xFE\xFE");
-    payloadPrefix.append(civAddr);
-    payloadPrefix.append((char)compCivAddr);
 
     payloadSuffix = QByteArray("\xFD");
 
@@ -183,6 +180,8 @@ void rigCommander::setup()
     pttAllowed = true; // This is for developing, set to false for "safe" debugging. Set to true for deployment.
 }
 
+
+
 void rigCommander::process()
 {
     // new thread enters here. Do nothing but do check for errors.
@@ -963,10 +962,13 @@ void rigCommander::setPTT(bool pttOn)
 
 void rigCommander::setCIVAddr(unsigned char civAddr)
 {
-    // Note: This is the radio's CIV address
+    // Note: This sets the radio's CIV address
     // the computer's CIV address is defined in the header file.
-    // TODO: this function *could* be written to re-write the CIV preamble.
+
     this->civAddr = civAddr;
+    payloadPrefix = QByteArray("\xFE\xFE");
+    payloadPrefix.append(civAddr);
+    payloadPrefix.append((char)compCivAddr);
 }
 
 void rigCommander::handleNewData(const QByteArray& data)

wfmain.h

@@ -44,6 +44,9 @@ public:
     ~wfmain();
 
 signals:
+    // Basic to rig:
+    void setCIVAddr(unsigned char newRigCIVAddr);
+
     // Power
     void sendPowerOn();
     void sendPowerOff();
@@ -443,6 +446,8 @@ private slots:
 
     void on_baudRateCombo_activated(int);
 
+    void on_wfLengthSlider_valueChanged(int value);
+
 private:
     Ui::wfmain *ui;
     void closeEvent(QCloseEvent *event);
@@ -456,6 +461,7 @@ private:
     void setAppTheme(bool isCustom);
     void setPlotTheme(QCustomPlot *plot, bool isDark);
     void prepareWf();
+    void prepareWf(unsigned int wfLength);
     void getInitialRigState();
     void setBandButtons();
     void showButton(QPushButton *btn);
@@ -513,6 +519,20 @@ private:
     QTimer * periodicPollingTimer;
     QTimer * pttTimer;
 
+    void setupPlots();
+    void makeRig();
+    void rigConnections();
+    void removeRig();
+    void findSerialPort();
+
+    void setupKeyShortcuts();
+    void setupMainUI();
+    void setUIToPrefs();
+    void setSerialDevicesUI();
+    void setAudioDevicesUI();
+    void setServerToPrefs();
+    void setInitialTiming();
+    void getSettingsFilePath(QString settingsFile);
 
     QStringList modes;
     int currentModeIndex;
@@ -526,8 +546,7 @@ private:
 
     quint16 spectWidth;
     quint16 wfLength;
-
-    quint16 spectRowCurrent;
+    bool spectrumDrawLock;
 
     QByteArray spectrumPeaks;
 

wfmain.ui

@@ -18,7 +18,7 @@
     <item>
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>3</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="mainTab">
        <attribute name="title">
@@ -767,6 +767,60 @@
             </item>
            </layout>
           </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_20">
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QSlider" name="wfLengthSlider">
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>70</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>80</height>
+               </size>
+              </property>
+              <property name="toolTip">
+               <string>Waterfall Length</string>
+              </property>
+              <property name="accessibleName">
+               <string>Waterfall Length</string>
+              </property>
+              <property name="minimum">
+               <number>100</number>
+              </property>
+              <property name="maximum">
+               <number>1024</number>
+              </property>
+              <property name="value">
+               <number>160</number>
+              </property>
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_35">
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>15</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Len</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_16">
             <property name="leftMargin">