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

Working on a QSO window

Browse Source
This commit is contained in:
Jordan Sherer 2018-02-25 23:56:49 -05:00
parent a4fa5b9988
commit 6bd71f4d28
9 changed files with 251 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -297,6 +297,7 @@ set (wsjtx_CXXSRCS
widegraph.cpp widegraph.cpp
echograph.cpp echograph.cpp
echoplot.cpp echoplot.cpp
extendedqso.cpp
fastgraph.cpp fastgraph.cpp
fastplot.cpp fastplot.cpp
about.cpp about.cpp
@ -649,6 +650,7 @@ set (wsjtx_UISRCS
about.ui about.ui
astro.ui astro.ui
echograph.ui echograph.ui
extendedqso.ui
fastgraph.ui fastgraph.ui
messageaveraging.ui messageaveraging.ui
widegraph.ui widegraph.ui

14
extendedqso.cpp Normal file
View File

@ -0,0 +1,14 @@
#include "extendedqso.h"
#include "ui_extendedqso.h"
ExtendedQSO::ExtendedQSO(QWidget *parent) :
QWidget(parent),
ui(new Ui::ExtendedQSO)
{
ui->setupUi(this);
}
ExtendedQSO::~ExtendedQSO()
{
delete ui;
}

22
extendedqso.h Normal file
View File

@ -0,0 +1,22 @@
#ifndef EXTENDEDQSO_H
#define EXTENDEDQSO_H
#include <QWidget>
namespace Ui {
class ExtendedQSO;
}
class ExtendedQSO : public QWidget
{
Q_OBJECT
public:
explicit ExtendedQSO(QWidget *parent = 0);
~ExtendedQSO();
private:
Ui::ExtendedQSO *ui;
};
#endif // EXTENDEDQSO_H

189
extendedqso.ui Normal file
View File

@ -0,0 +1,189 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ExtendedQSO</class>
<widget class="QWidget" name="ExtendedQSO">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>877</width>
<height>462</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QWidget" name="verticalLayoutWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>851</width>
<height>441</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11" stretch="0,0,0">
<item>
<widget class="QSplitter" name="splitter_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QTextEdit" name="extFreeTextMsg_6">
<property name="acceptRichText">
<bool>false</bool>
</property>
<property name="placeholderText">
<string>Your message, if longer than 13 characters, will be split into separate free text transmissions. At the start of each tx cycle, the next chunk of the message will be removed from this textbox for transmission.</string>
</property>
</widget>
<widget class="QTextEdit" name="textEditRX_6">
<property name="font">
<font>
<italic>true</italic>
</font>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="styleSheet">
<string notr="true">QTextEdit { background:rgb(255, 250, 205); }</string>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>Messages from your receive frequency will appear here.</string>
</property>
</widget>
</widget>
<widget class="QListView" name="listView"/>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_22">
<item>
<widget class="QPushButton" name="pushButton_41">
<property name="text">
<string>CQ</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_42">
<property name="text">
<string>Your Call</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_43">
<property name="text">
<string>Their Call</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_44">
<property name="text">
<string>Macro 1</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_45">
<property name="text">
<string>Macro 2</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_46">
<property name="text">
<string>Macro 3</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_47">
<property name="text">
<string>Macro 4</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pbNextFreeTextMsg_6">
<property name="text">
<string>Send Next</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_48">
<property name="text">
<string>Halt</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="lblTxNum_6">
<property name="text">
<string>Remaining Tx Sequences: 0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
<zorder>listWidget</zorder>
<zorder>layoutWidget</zorder>
<zorder>verticalLayoutWidget</zorder>
</widget>
<resources/>
<connections/>
</ui>

7
mainwindow.cpp
View File

@ -35,6 +35,7 @@
#include "plotter.h" #include "plotter.h"
#include "echoplot.h" #include "echoplot.h"
#include "echograph.h" #include "echograph.h"
#include "extendedqso.h"
#include "fastplot.h" #include "fastplot.h"
#include "fastgraph.h" #include "fastgraph.h"
#include "about.h" #include "about.h"
@ -201,6 +202,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
, MessageBox::Cancel | MessageBox::Ok | MessageBox::Retry}, , MessageBox::Cancel | MessageBox::Ok | MessageBox::Retry},
m_wideGraph (new WideGraph(m_settings)), m_wideGraph (new WideGraph(m_settings)),
m_echoGraph (new EchoGraph(m_settings)), m_echoGraph (new EchoGraph(m_settings)),
m_extendedQSO (new ExtendedQSO()),
m_fastGraph (new FastGraph(m_settings)), m_fastGraph (new FastGraph(m_settings)),
m_logDlg (new LogQSO (program_title (), m_settings, &m_config, this)), m_logDlg (new LogQSO (program_title (), m_settings, &m_config, this)),
m_lastDialFreq {0}, m_lastDialFreq {0},
@ -2104,6 +2106,11 @@ void MainWindow::on_actionEcho_Graph_triggered()
m_echoGraph->show(); m_echoGraph->show();
} }
void MainWindow::on_actionExtended_QSO_triggered()
{
m_extendedQSO->show();
}
void MainWindow::on_actionFast_Graph_triggered() void MainWindow::on_actionFast_Graph_triggered()
{ {
m_fastGraph->show(); m_fastGraph->show();

3
mainwindow.h
View File

@ -64,6 +64,7 @@ class QLineEdit;
class QFont; class QFont;
class QHostInfo; class QHostInfo;
class EchoGraph; class EchoGraph;
class ExtendedQSO;
class FastGraph; class FastGraph;
class WideGraph; class WideGraph;
class LogQSO; class LogQSO;
@ -272,6 +273,7 @@ private slots:
void on_WSPRfreqSpinBox_valueChanged(int n); void on_WSPRfreqSpinBox_valueChanged(int n);
void on_pbTxNext_clicked(bool b); void on_pbTxNext_clicked(bool b);
void on_actionEcho_Graph_triggered(); void on_actionEcho_Graph_triggered();
void on_actionExtended_QSO_triggered();
void on_actionEcho_triggered(); void on_actionEcho_triggered();
void on_actionISCAT_triggered(); void on_actionISCAT_triggered();
void on_actionFast_Graph_triggered(); void on_actionFast_Graph_triggered();
@ -340,6 +342,7 @@ private:
QScopedPointer<WideGraph> m_wideGraph; QScopedPointer<WideGraph> m_wideGraph;
QScopedPointer<EchoGraph> m_echoGraph; QScopedPointer<EchoGraph> m_echoGraph;
QScopedPointer<ExtendedQSO> m_extendedQSO;
QScopedPointer<FastGraph> m_fastGraph; QScopedPointer<FastGraph> m_fastGraph;
QScopedPointer<LogQSO> m_logDlg; QScopedPointer<LogQSO> m_logDlg;
QScopedPointer<Astro> m_astroWidget; QScopedPointer<Astro> m_astroWidget;

8
mainwindow.ui
View File

@ -27,7 +27,7 @@
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="mainTabOne"> <widget class="QWidget" name="mainTabOne">
<attribute name="title"> <attribute name="title">
@ -2571,6 +2571,7 @@ QPushButton[state=&quot;ok&quot;] {
<addaction name="actionWide_Waterfall"/> <addaction name="actionWide_Waterfall"/>
<addaction name="actionAstronomical_data"/> <addaction name="actionAstronomical_data"/>
<addaction name="actionMessage_averaging"/> <addaction name="actionMessage_averaging"/>
<addaction name="actionExtended_QSO"/>
<addaction name="actionEcho_Graph"/> <addaction name="actionEcho_Graph"/>
<addaction name="actionFast_Graph"/> <addaction name="actionFast_Graph"/>
<addaction name="separator"/> <addaction name="separator"/>
@ -3209,6 +3210,11 @@ QPushButton[state=&quot;ok&quot;] {
<string>Shift+F1</string> <string>Shift+F1</string>
</property> </property>
</action> </action>
<action name="actionExtended_QSO">
<property name="text">
<string>Extended QSO</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>

9
wsjtx.pro
View File

@ -67,7 +67,8 @@ SOURCES += \
echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \ echoplot.cpp echograph.cpp fastgraph.cpp fastplot.cpp Modes.cpp \
WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\ WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \ MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \
EqualizationToolsDialog.cpp EqualizationToolsDialog.cpp \
extendedqso.cpp
HEADERS += qt_helpers.hpp \ HEADERS += qt_helpers.hpp \
pimpl_h.hpp pimpl_impl.hpp \ pimpl_h.hpp pimpl_impl.hpp \
@ -83,7 +84,8 @@ HEADERS += qt_helpers.hpp \
logbook/logbook.h logbook/countrydat.h logbook/countriesworked.h logbook/adif.h \ logbook/logbook.h logbook/countrydat.h logbook/countriesworked.h logbook/adif.h \
messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \ messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \ WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \
IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp \
extendedqso.h
INCLUDEPATH += qmake_only INCLUDEPATH += qmake_only
@ -95,7 +97,8 @@ HEADERS += OmniRigTransceiver.hpp
FORMS += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \ FORMS += mainwindow.ui about.ui Configuration.ui widegraph.ui astro.ui \
logqso.ui wf_palette_design_dialog.ui messageaveraging.ui echograph.ui \ logqso.ui wf_palette_design_dialog.ui messageaveraging.ui echograph.ui \
fastgraph.ui fastgraph.ui \
extendedqso.ui
RC_FILE = wsjtx.rc RC_FILE = wsjtx.rc
RESOURCES = wsjtx.qrc RESOURCES = wsjtx.qrc

2
wsjtx.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.5.1, 2018-02-02T18:34:55. --> <!-- Written by QtCreator 3.5.1, 2018-02-25T18:27:10. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>