chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI Tweaks. Remove frequency restriction (causing problems). And keep track of the last message sent for later.

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-24 21:04:04 -04:00
parent c5a6f76b1e
commit c1c7d85195
3 changed files with 32 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mainwindow.cpp
View File

@ -5518,6 +5518,9 @@ void MainWindow::createMessageTransmitQueue(QString const& text){
int freq = currentFreq(); int freq = currentFreq();
logRxTxMessageText(QDateTime::currentDateTimeUtc(), lines.join(""), freq, true); logRxTxMessageText(QDateTime::currentDateTimeUtc(), lines.join(""), freq, true);
// keep track of the last message text sent
m_lastTxMessage = text;
} }
void MainWindow::resetMessageTransmitQueue(){ void MainWindow::resetMessageTransmitQueue(){
@ -7578,12 +7581,6 @@ void MainWindow::setFreq4(int rxFreq, int txFreq)
txFreq = rxFreq; txFreq = rxFreq;
} }
// Don't go below 500 Hz if not in split mode
if(!m_config.split_mode()){
rxFreq = qMax(500, rxFreq);
txFreq = qMax(500, txFreq);
}
m_previousFreq = currentFreq(); m_previousFreq = currentFreq();
if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq); if (ui->RxFreqSpinBox->isEnabled ()) ui->RxFreqSpinBox->setValue(rxFreq);

1
mainwindow.h
View File

@ -685,6 +685,7 @@ private:
bool m_rxDirty; bool m_rxDirty;
int m_txFrameCount; int m_txFrameCount;
QString m_lastTxMessage;
QDateTime m_lastTxTime; QDateTime m_lastTxTime;
QQueue<QString> m_txFrameQueue; QQueue<QString> m_txFrameQueue;
QQueue<RXDetail> m_rxFrameQueue; QQueue<RXDetail> m_rxFrameQueue;

89
mainwindow.ui
View File

@ -155,13 +155,13 @@
<number>18</number> <number>18</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>18</number> <number>6</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>18</number> <number>18</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>18</number> <number>6</number>
</property> </property>
<item> <item>
<spacer name="verticalSpacer_6"> <spacer name="verticalSpacer_6">
@ -177,65 +177,32 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QWidget" name="widget" native="true"> <widget class="QComboBox" name="bandComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>75</width>
<height>0</height> <height>30</height>
</size> </size>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_19"> <property name="visible">
<property name="spacing"> <bool>true</bool>
<number>4</number> </property>
</property> <property name="toolTip">
<property name="leftMargin"> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select operating band or enter frequency in MHz or enter kHz increment followed by k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<number>0</number> </property>
</property> <property name="styleSheet">
<property name="topMargin"> <string notr="true">background-color:white;
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QComboBox" name="bandComboBox">
<property name="minimumSize">
<size>
<width>75</width>
<height>30</height>
</size>
</property>
<property name="visible">
<bool>true</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select operating band or enter frequency in MHz or enter kHz increment followed by k.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="styleSheet">
<string notr="true">background-color:white;
color:black;</string> color:black;</string>
</property> </property>
<property name="editable"> <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="insertPolicy"> <property name="insertPolicy">
<enum>QComboBox::NoInsert</enum> <enum>QComboBox::NoInsert</enum>
</property> </property>
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum> <enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property> </property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
@ -332,13 +299,13 @@ o</string>
<number>18</number> <number>18</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>18</number> <number>6</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>18</number> <number>18</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>18</number> <number>6</number>
</property> </property>
<item> <item>
<spacer name="verticalSpacer_4"> <spacer name="verticalSpacer_4">
@ -453,16 +420,16 @@ color : white;
<number>18</number> <number>18</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>18</number> <number>6</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>18</number> <number>18</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>18</number> <number>6</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>12</number> <number>18</number>
</property> </property>
<item row="3" column="1"> <item row="3" column="1">
<spacer name="verticalSpacer_8"> <spacer name="verticalSpacer_8">