w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-31 21:22:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Next stage of renaming q65w to qmap.

Browse Source
This commit is contained in:
Joe Taylor 2023-01-25 09:07:56 -05:00
parent 935ad492e6
commit a87c308823
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
q65w/CMakeLists.txt
View File

@ -1,4 +1,4 @@
set (q65w_CXXSRCS set (qmap_CXXSRCS
about.cpp about.cpp
astro.cpp astro.cpp
devsetup.cpp devsetup.cpp
@ -14,10 +14,10 @@ set (q65w_CXXSRCS
) )
if (WIN32) if (WIN32)
set (q65w_CXXSRCS ${q65w_CXXSRCS}) set (qmap_CXXSRCS ${qmap_CXXSRCS})
endif (WIN32) endif (WIN32)
set (q65w_UISRCS set (qmap_UISRCS
about.ui about.ui
astro.ui astro.ui
devsetup.ui devsetup.ui
@ -25,20 +25,20 @@ set (q65w_UISRCS
widegraph.ui widegraph.ui
) )
set (q65w_C_and_CXXSRCS set (qmap_C_and_CXXSRCS
${q65w_CSRCS} ${qmap_CSRCS}
${q65w_CXXSRCS} ${qmap_CXXSRCS}
) )
set_property (SOURCE ${q65w_C_and_CXXSRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -include wsjtx_config.h") set_property (SOURCE ${qmap_C_and_CXXSRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -include wsjtx_config.h")
set_property (SOURCE ${q65w_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/wsjtx_config.h) set_property (SOURCE ${qmap_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/wsjtx_config.h)
# build the subdirectories # build the subdirectories
add_subdirectory (libq65) add_subdirectory (libq65)
# UI generation # UI generation
qt5_wrap_ui (q65w_GENUISRCS ${q65w_UISRCS}) qt5_wrap_ui (qmap_GENUISRCS ${qmap_UISRCS})
add_executable (qmap ${q65w_CXXSRCS} ${q65w_CSRCS} ${q65w_GENUISRCS} q65w.rc) add_executable (qmap ${qmap_CXXSRCS} ${qmap_CSRCS} ${qmap_GENUISRCS} qmap.rc)
target_include_directories (qmap PRIVATE ${CMAKE_SOURCE_DIR} ${FFTW3_INCLUDE_DIRS}) target_include_directories (qmap PRIVATE ${CMAKE_SOURCE_DIR} ${FFTW3_INCLUDE_DIRS})
target_link_libraries (qmap wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Usb::Usb) target_link_libraries (qmap wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Usb::Usb)

4
q65w/about.cpp
View File

@ -7,10 +7,10 @@ CAboutDlg::CAboutDlg(QWidget *parent) :
ui(new Ui::CAboutDlg) ui(new Ui::CAboutDlg)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->labelTxt->setText("<html><h2>" + QString {"Q65W v" ui->labelTxt->setText("<html><h2>" + QString {"QMAP v"
+ QCoreApplication::applicationVersion () + QCoreApplication::applicationVersion ()
+ " " + revision ()}.simplified () + "</h2><br />" + " " + revision ()}.simplified () + "</h2><br />"
"Q65W is a wideband receiver for the Q65 protocol, <br />" "QMAP is a wideband receiver for the Q65 protocol, <br />"
"intended primarily for amateur radio EME communication. <br /><br />" "intended primarily for amateur radio EME communication. <br /><br />"
"Copyright 2001-2023 by Joe Taylor, K1JT. Additional <br />" "Copyright 2001-2023 by Joe Taylor, K1JT. Additional <br />"
"acknowledgments are contained in the source code."); "acknowledgments are contained in the source code.");

30
q65w/mainwindow.cpp
View File

@ -21,7 +21,7 @@
qint16 id[2*60*96000]; qint16 id[2*60*96000];
QSharedMemory mem_q65w("mem_q65w"); //Memory segment to be shared (optionally) with WSJT-X QSharedMemory mem_qmap("mem_qmap"); //Memory segment to be shared (optionally) with WSJT-X
int* ipc_wsjtx; int* ipc_wsjtx;
extern const int RxDataFrequency = 96000; extern const int RxDataFrequency = 96000;
@ -31,7 +31,7 @@ MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
m_appDir {QApplication::applicationDirPath ()}, m_appDir {QApplication::applicationDirPath ()},
m_settings_filename {m_appDir + "/q65w.ini"}, m_settings_filename {m_appDir + "/qmap.ini"},
m_astro_window {new Astro {m_settings_filename}}, m_astro_window {new Astro {m_settings_filename}},
m_wide_graph_window {new WideGraph {m_settings_filename}}, m_wide_graph_window {new WideGraph {m_settings_filename}},
m_gui_timer {new QTimer {this}} m_gui_timer {new QTimer {this}}
@ -100,17 +100,17 @@ MainWindow::MainWindow(QWidget *parent) :
//Attach or create a memory segment to be shared with WSJT-X. //Attach or create a memory segment to be shared with WSJT-X.
int memSize=4096; int memSize=4096;
if(!mem_q65w.attach()) { if(!mem_qmap.attach()) {
if(!mem_q65w.create(memSize)) { if(!mem_qmap.create(memSize)) {
msgBox("Unable to create shared memory segment mem_q65w."); msgBox("Unable to create shared memory segment mem_qmap.");
} }
} }
ipc_wsjtx = (int*)mem_q65w.data(); ipc_wsjtx = (int*)mem_qmap.data();
mem_q65w.lock(); mem_qmap.lock();
memset(ipc_wsjtx,0,memSize); //Zero all of shared memory memset(ipc_wsjtx,0,memSize); //Zero all of shared memory
mem_q65w.unlock(); mem_qmap.unlock();
fftwf_import_wisdom_from_filename (QDir {m_appDir}.absoluteFilePath ("q65w_wisdom.dat").toLocal8Bit ()); fftwf_import_wisdom_from_filename (QDir {m_appDir}.absoluteFilePath ("qmap_wisdom.dat").toLocal8Bit ());
readSettings(); //Restore user's setup params readSettings(); //Restore user's setup params
@ -201,7 +201,7 @@ MainWindow::~MainWindow()
soundInThread.quit(); soundInThread.quit();
soundInThread.wait(3000); soundInThread.wait(3000);
} }
fftwf_export_wisdom_to_filename (QDir {m_appDir}.absoluteFilePath ("q65w_wisdom.dat").toLocal8Bit ()); fftwf_export_wisdom_to_filename (QDir {m_appDir}.absoluteFilePath ("qmap_wisdom.dat").toLocal8Bit ());
delete ui; delete ui;
} }
@ -646,7 +646,7 @@ void MainWindow::on_actionOpen_triggered() //Open File
soundInThread.setMonitoring(m_monitoring); soundInThread.setMonitoring(m_monitoring);
QString fname; QString fname;
fname=QFileDialog::getOpenFileName(this, "Open File", m_path, fname=QFileDialog::getOpenFileName(this, "Open File", m_path,
"MAP65/Q65W Files (*.iq)"); "MAP65/QMAP Files (*.iq)");
if(fname != "") { if(fname != "") {
m_path=fname; m_path=fname;
int i; int i;
@ -726,9 +726,9 @@ void MainWindow::decoderFinished() //diskWriteFinished
decodeBusy(false); decodeBusy(false);
decodes_.nQDecoderDone=1; decodes_.nQDecoderDone=1;
if(m_diskData) decodes_.nQDecoderDone=2; if(m_diskData) decodes_.nQDecoderDone=2;
mem_q65w.lock(); mem_qmap.lock();
memcpy((char*)ipc_wsjtx, &decodes_, sizeof(decodes_)); memcpy((char*)ipc_wsjtx, &decodes_, sizeof(decodes_));
mem_q65w.unlock(); mem_qmap.unlock();
QString t1; QString t1;
// t1=t1.asprintf(" %3d/%d ",decodes_.ndecodes,decodes_.ncand); // t1=t1.asprintf(" %3d/%d ",decodes_.ndecodes,decodes_.ncand);
t1=t1.asprintf(" %d ",decodes_.ndecodes); t1=t1.asprintf(" %d ",decodes_.ndecodes);
@ -953,9 +953,9 @@ void MainWindow::guiUpdate()
static int n60z=99; static int n60z=99;
int n60=nsec%60; int n60=nsec%60;
int itest[5]; int itest[5];
mem_q65w.lock(); mem_qmap.lock();
memcpy(&itest, (char*)ipc_wsjtx, 20); memcpy(&itest, (char*)ipc_wsjtx, 20);
mem_q65w.unlock(); mem_qmap.unlock();
if(itest[4]==1) m_nTransmitted++; if(itest[4]==1) m_nTransmitted++;
// qDebug() << "AAA" << n60 << itest[0] << itest[1] << itest[2] << itest[3] << itest[4] // qDebug() << "AAA" << n60 << itest[0] << itest[1] << itest[2] << itest[3] << itest[4]
// << m_nTransmitted; // << m_nTransmitted;

2
q65w/mainwindow.ui
View File

@ -458,7 +458,7 @@ p, li { white-space: pre-wrap; }
</action> </action>
<action name="actionAbout"> <action name="actionAbout">
<property name="text"> <property name="text">
<string> About Q65W</string> <string> About QMAP</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+F1</string> <string>Ctrl+F1</string>

2
q65w/q65w.pro → q65w/qmap.pro
View File

@ -9,7 +9,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += thread CONFIG += thread
#CONFIG += console #CONFIG += console
TARGET = q65w TARGET = qmap
VERSION = 0.1 VERSION = 0.1
TEMPLATE = app TEMPLATE = app
DEFINES = QT5 DEFINES = QT5

0
q65w/q65w.rc → q65w/qmap.rc
View File