Updated log window look. Fixed bug in n3fjp logging

This commit is contained in:
Jordan Sherer 2019-05-31 21:55:08 -04:00
parent f304d3c6e1
commit ad748865a6
2 changed files with 310 additions and 303 deletions

606
logqso.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>600</width> <width>600</width>
<height>285</height> <height>535</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -24,59 +24,97 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_11"> <layout class="QVBoxLayout" name="verticalLayout_11">
<item> <item>
<widget class="QLabel" name="label"> <layout class="QFormLayout" name="formLayout">
<property name="font"> <property name="fieldGrowthPolicy">
<font> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
<pointsize>10</pointsize>
</font>
</property> </property>
<property name="text"> <property name="topMargin">
<string>Click OK to confirm the following QSO:</string> <number>6</number>
</property> </property>
</widget> <property name="bottomMargin">
</item> <number>6</number>
<item> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <item row="0" column="0">
<item> <widget class="QLabel" name="operatorLabel">
<layout class="QVBoxLayout" name="verticalLayout"> <property name="font">
<item> <font>
<widget class="QLabel" name="lab1"> <pointsize>10</pointsize>
<property name="font"> </font>
<font> </property>
<pointsize>10</pointsize> <property name="text">
</font> <string>Operator Callsign:</string>
</property> </property>
<property name="text"> </widget>
<string>Call</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="call"/>
</item>
</layout>
</item> </item>
<item> <item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout_2"> <widget class="QLineEdit" name="loggedOperator">
<item> <property name="maximumSize">
<widget class="QLabel" name="lab2"> <size>
<property name="font"> <width>300</width>
<font> <height>16777215</height>
<pointsize>10</pointsize> </size>
</font> </property>
</property> </widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lab4">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Mode:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="mode">
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lab2">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Start:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QGridLayout" name="gridLayout">
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton">
<property name="text"> <property name="text">
<string>Start</string> <string>Now</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="0">
<widget class="QDateTimeEdit" name="start_date_time"> <widget class="QDateTimeEdit" name="start_date_time">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@ -85,30 +123,53 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="displayFormat"> <property name="displayFormat">
<string>dd/MM/yyyy HH:mm:ss</string> <string>yyyy-MM-dd HH:mm:ss</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item row="4" column="0">
<layout class="QVBoxLayout" name="verticalLayout_3"> <widget class="QLabel" name="lab2_3">
<item> <property name="font">
<widget class="QLabel" name="lab2_3"> <font>
<property name="font"> <pointsize>10</pointsize>
<font> </font>
<pointsize>10</pointsize> </property>
</font> <property name="text">
</property> <string>End:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="4" column="1">
<layout class="QGridLayout" name="gridLayout_2">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_2">
<property name="text"> <property name="text">
<string>End</string> <string>Now</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="0">
<widget class="QDateTimeEdit" name="end_date_time"> <widget class="QDateTimeEdit" name="end_date_time">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@ -117,224 +178,188 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="displayFormat"> <property name="displayFormat">
<string>dd/MM/yyyy HH:mm:ss</string> <string>yyyy-MM-dd HH:mm:ss</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="0" column="2">
</item> <spacer name="horizontalSpacer_2">
</layout> <property name="orientation">
</item> <enum>Qt::Horizontal</enum>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="lab4">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property> </property>
<property name="text"> <property name="sizeHint" stdset="0">
<string>Mode</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mode">
<property name="maximumSize">
<size> <size>
<width>70</width> <width>40</width>
<height>16777215</height> <height>20</height>
</size> </size>
</property> </property>
<property name="readOnly"> </spacer>
<bool>true</bool>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="5" column="0">
<layout class="QVBoxLayout" name="verticalLayout_6"> <widget class="QLabel" name="lab1">
<item> <property name="font">
<widget class="QLabel" name="lab5"> <font>
<property name="font"> <pointsize>10</pointsize>
<font> </font>
<pointsize>10</pointsize> </property>
</font> <property name="text">
</property> <string>Callsign:</string>
<property name="text"> </property>
<string>Band</string> <property name="alignment">
</property> <set>Qt::AlignCenter</set>
<property name="alignment"> </property>
<set>Qt::AlignCenter</set> </widget>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="band">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="5" column="1">
<layout class="QVBoxLayout" name="verticalLayout_7"> <widget class="QLineEdit" name="call">
<item> <property name="sizePolicy">
<widget class="QLabel" name="lab6"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<property name="font"> <horstretch>0</horstretch>
<font> <verstretch>0</verstretch>
<pointsize>10</pointsize> </sizepolicy>
</font> </property>
</property> <property name="maximumSize">
<property name="text"> <size>
<string>Rpt Sent</string> <width>300</width>
</property> <height>16777215</height>
<property name="alignment"> </size>
<set>Qt::AlignCenter</set> </property>
</property> </widget>
</widget>
</item>
<item>
<widget class="QLineEdit" name="sent">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="6" column="0">
<layout class="QVBoxLayout" name="verticalLayout_8"> <widget class="QLabel" name="lab5">
<item> <property name="font">
<widget class="QLabel" name="lab7"> <font>
<property name="font"> <pointsize>10</pointsize>
<font> </font>
<pointsize>10</pointsize> </property>
</font> <property name="text">
</property> <string>Band:</string>
<property name="text"> </property>
<string>Rpt Rcvd</string> <property name="alignment">
</property> <set>Qt::AlignCenter</set>
<property name="alignment"> </property>
<set>Qt::AlignCenter</set> </widget>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="rcvd">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="6" column="1">
<layout class="QVBoxLayout" name="verticalLayout_9"> <widget class="QLineEdit" name="band">
<item> <property name="maximumSize">
<widget class="QLabel" name="lab8"> <size>
<property name="font"> <width>50</width>
<font> <height>16777215</height>
<pointsize>10</pointsize> </size>
</font> </property>
</property> </widget>
<property name="text">
<string>Grid</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="grid">
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="7" column="0">
<layout class="QVBoxLayout" name="verticalLayout_10"> <widget class="QLabel" name="lab6">
<item> <property name="font">
<widget class="QLabel" name="lab9"> <font>
<property name="enabled"> <pointsize>10</pointsize>
<bool>true</bool> </font>
</property> </property>
<property name="font"> <property name="text">
<font> <string>Signal Report Sent:</string>
<pointsize>10</pointsize> </property>
</font> <property name="alignment">
</property> <set>Qt::AlignCenter</set>
<property name="text"> </property>
<string>Name</string> </widget>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="name">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> <item row="7" column="1">
</item> <widget class="QLineEdit" name="sent">
<item> <property name="maximumSize">
<spacer name="verticalSpacer_2"> <size>
<property name="orientation"> <width>50</width>
<enum>Qt::Vertical</enum> <height>16777215</height>
</property> </size>
<property name="sizeHint" stdset="0"> </property>
<size> </widget>
<width>20</width> </item>
<height>40</height> <item row="8" column="0">
</size> <widget class="QLabel" name="lab7">
</property> <property name="font">
</spacer> <font>
</item> <pointsize>10</pointsize>
<item> </font>
<layout class="QHBoxLayout" name="horizontalLayout"> </property>
<item> <property name="text">
<string>Signal Report Rcvd:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLineEdit" name="rcvd">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="lab8">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Grid:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QLineEdit" name="grid">
<property name="maximumSize">
<size>
<width>70</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="lab9">
<property name="enabled">
<bool>true</bool>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Name:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLineEdit" name="name">
<property name="enabled">
<bool>true</bool>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="lab10"> <widget class="QLabel" name="lab10">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -345,58 +370,32 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Comments</string> <string>Comments:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="11" column="1">
<widget class="QLineEdit" name="comments"> <widget class="QLineEdit" name="comments">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="12" column="1">
<widget class="QCheckBox" name="cbComments"> <widget class="QCheckBox" name="cbComments">
<property name="text"> <property name="text">
<string>Retain</string> <string>Retain Comments</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="1" column="0">
</item> <spacer name="verticalSpacer_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="operatorLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Operator</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="loggedOperator">
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>20</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@ -430,10 +429,13 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>call</tabstop> <tabstop>loggedOperator</tabstop>
<tabstop>start_date_time</tabstop>
<tabstop>end_date_time</tabstop>
<tabstop>mode</tabstop> <tabstop>mode</tabstop>
<tabstop>start_date_time</tabstop>
<tabstop>pushButton</tabstop>
<tabstop>end_date_time</tabstop>
<tabstop>pushButton_2</tabstop>
<tabstop>call</tabstop>
<tabstop>band</tabstop> <tabstop>band</tabstop>
<tabstop>sent</tabstop> <tabstop>sent</tabstop>
<tabstop>rcvd</tabstop> <tabstop>rcvd</tabstop>

View File

@ -6588,13 +6588,17 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
if(m_callActivity.contains(call)){ if(m_callActivity.contains(call)){
grid = m_callActivity[call].grid; grid = m_callActivity[call].grid;
} }
QString opCall=m_opCall;
if(opCall.isEmpty()){
opCall = m_config.my_callsign();
}
QString comments = ui->textEditRX->textCursor().selectedText(); QString comments = ui->textEditRX->textCursor().selectedText();
m_logDlg->initLogQSO (call.trimmed(), grid.trimmed(), m_modeTx == "FT8" ? "JS8" : m_modeTx, m_rptSent, m_rptRcvd, m_logDlg->initLogQSO (call.trimmed(), grid.trimmed(), m_modeTx == "FT8" ? "JS8" : m_modeTx, m_rptSent, m_rptRcvd,
m_dateTimeQSOOn, dateTimeQSOOff, m_freqNominal + ui->TxFreqSpinBox->value(), m_dateTimeQSOOn, dateTimeQSOOff, m_freqNominal + ui->TxFreqSpinBox->value(),
m_config.my_callsign(), m_config.my_grid(), m_config.my_callsign(), m_config.my_grid(),
m_config.log_as_DATA(), m_config.report_in_comments(), m_config.log_as_DATA(), m_config.report_in_comments(),
m_config.bFox(), m_opCall, comments); m_config.bFox(), opCall, comments);
} }
void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid
@ -6661,6 +6665,7 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
QTimer::singleShot(1000, this, [this, host, port](){ QTimer::singleShot(1000, this, [this, host, port](){
m_n3fjpClient->sendNetworkMessage(host, port, "<CMD><CHECKLOG></CMD>"); m_n3fjpClient->sendNetworkMessage(host, port, "<CMD><CHECKLOG></CMD>");
m_n3fjpClient->sendNetworkMessage(host, port, "\r\n");
}); });
} }