Skip to content

Commit

Permalink
bit of tidying and removal of 96k setting for 10500burst
Browse files Browse the repository at this point in the history
  • Loading branch information
jontio committed Jul 22, 2021
1 parent f23c900 commit a1f0470
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 120 deletions.
2 changes: 1 addition & 1 deletion JAERO/gui_classes/settingsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void SettingsDialog::populatesettings()
ui->lineEditZMQBind->setText(settings.value("remoteAudioOutBindAddress", "tcp://*:5551").toString());
ui->lineEditZMQBindTopic->setText(settings.value("remoteAudioOutBindTopic", "JAERO").toString());

ui->checkBoxZMQ->setChecked(settings.value("zmqAudioInputEnabled", true).toBool());
ui->checkBoxZMQ->setChecked(settings.value("zmqAudioInputEnabled", false).toBool());
ui->lineEditZmqConnectAddress->setText(settings.value("zmqAudioInputReceiveAddress", "tcp://127.0.0.1:6003").toString());


Expand Down
36 changes: 21 additions & 15 deletions JAERO/gui_classes/settingsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>453</width>
<height>753</height>
<width>451</width>
<height>720</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -203,7 +203,7 @@ eg &quot;localhost:12345 localhost:12346&quot;</string>
<property name="geometry">
<rect>
<x>10</x>
<y>520</y>
<y>470</y>
<width>401</width>
<height>151</height>
</rect>
Expand Down Expand Up @@ -239,7 +239,7 @@ eg &quot;localhost:12345 localhost:12346&quot;</string>
<rect>
<x>10</x>
<y>50</y>
<width>70</width>
<width>101</width>
<height>41</height>
</rect>
</property>
Expand All @@ -262,7 +262,7 @@ eg &quot;localhost:12345 localhost:12346&quot;</string>
<rect>
<x>120</x>
<y>60</y>
<width>51</width>
<width>61</width>
<height>25</height>
</rect>
</property>
Expand Down Expand Up @@ -290,7 +290,7 @@ eg &quot;localhost:12345 localhost:12346&quot;</string>
<rect>
<x>130</x>
<y>90</y>
<width>31</width>
<width>51</width>
<height>25</height>
</rect>
</property>
Expand Down Expand Up @@ -394,7 +394,7 @@ eg &quot;localhost:12345 localhost:12346&quot;</string>
<x>10</x>
<y>390</y>
<width>401</width>
<height>121</height>
<height>71</height>
</rect>
</property>
<property name="title">
Expand Down Expand Up @@ -556,13 +556,16 @@ eg &quot;localhost:12345 localhost:12346&quot;</string>
<rect>
<x>20</x>
<y>110</y>
<width>101</width>
<width>121</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Socket bind address</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLineEdit" name="lineEditZMQBind">
<property name="enabled">
Expand All @@ -587,17 +590,17 @@ eg &quot;localhost:12345 localhost:12346&quot;</string>
</property>
</widget>
<widget class="QCheckBox" name="ambeEnabled">
<property name="geometry">
<rect>
<property name="geometry">
<rect>
<x>20</x>
<y>30</y>
<width>171</width>
<height>17</height>
</rect>
</property>
</rect>
</property>
<property name="text">
<string>JAERO voice decoding</string>
</property>
</property>
</widget>
<widget class="QCheckBox" name="remoteAmbeEnabled">
<property name="geometry">
Expand All @@ -617,13 +620,16 @@ eg &quot;localhost:12345 localhost:12346&quot;</string>
<rect>
<x>20</x>
<y>150</y>
<width>47</width>
<height>13</height>
<width>121</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Topic</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLineEdit" name="lineEditZMQBindTopic">
<property name="enabled">
Expand Down
Loading

0 comments on commit a1f0470

Please sign in to comment.