w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MAP65 now compiles in QT5. Need to replace Qwt Thermo widgets. 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@3823 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-03-03 16:27:25 +00:00
parent 7e3db081a5
commit 4bda372088
13 changed files with 63 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
astro.cpp
View File

@ -45,8 +45,8 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString hisgrid,
if(!astroBusy) { if(!astroBusy) {
astroBusy=true; astroBusy=true;
astrosub_(&nyear, &month, &nday, &uth, &nfreq, mygrid.toAscii(), astrosub_(&nyear, &month, &nday, &uth, &nfreq, mygrid.toLatin1(),
hisgrid.toAscii(), &azsun, &elsun, &azmoon, &elmoon, hisgrid.toLatin1(), &azsun, &elsun, &azmoon, &elmoon,
&azmoondx, &elmoondx, &ntsky, &ndop, &ndop00,&ramoon, &decmoon, &azmoondx, &elmoondx, &ntsky, &ndop, &ndop00,&ramoon, &decmoon,
&dgrd, &poloffset, &xnr, 6, 6); &dgrd, &poloffset, &xnr, 6, 6);
astroBusy=false; astroBusy=false;

2
devsetup.cpp
View File

@ -109,7 +109,7 @@ void DevSetup::initDlg()
ui.mult570SpinBox->setValue(m_mult570); ui.mult570SpinBox->setValue(m_mult570);
ui.mult570TxSpinBox->setValue(m_mult570Tx); ui.mult570TxSpinBox->setValue(m_mult570Tx);
ui.cal570SpinBox->setValue(m_cal570); ui.cal570SpinBox->setValue(m_cal570);
sscanf(m_colors.toAscii(),"%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x", sscanf(m_colors.toLatin1(),"%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x",
&r,&g,&b,&r0,&g0,&b0,&r1,&g1,&b1,&r2,&g2,&b2,&r3,&g3,&b3); &r,&g,&b,&r0,&g0,&b0,&r1,&g1,&b1,&r2,&g2,&b2,&r3,&g3,&b3);
updateColorLabels(); updateColorLabels();
ui.sbBackgroundRed->setValue(r); ui.sbBackgroundRed->setValue(r);

4
getfile.cpp
View File

@ -18,7 +18,7 @@ void getfile(QString fname, bool xpol, int dbDgrd, int nfast)
memset(id,0,2*npts); memset(id,0,2*npts);
char name[80]; char name[80];
strcpy(name,fname.toAscii()); strcpy(name,fname.toLatin1());
FILE* fp=fopen(name,"rb"); FILE* fp=fopen(name,"rb");
if(fp != NULL) { if(fp != NULL) {
@ -66,7 +66,7 @@ void savetf2(QString fname, bool xpol, int nfast)
qint16* buf=(qint16*)malloc(2*npts); qint16* buf=(qint16*)malloc(2*npts);
char name[80]; char name[80];
strcpy(name,fname.toAscii()); strcpy(name,fname.toLatin1());
FILE* fp=fopen(name,"wb"); FILE* fp=fopen(name,"wb");
if(fp != NULL) { if(fp != NULL) {

6
libm65/four2a.f90
View File

@ -34,7 +34,8 @@ subroutine four2a(a,nfft,ndim,isign,iform)
if(nfft.eq.nn(i) .and. isign.eq.ns(i) .and. & if(nfft.eq.nn(i) .and. isign.eq.ns(i) .and. &
iform.eq.nf(i) .and. nloc.eq.nl(i)) go to 10 iform.eq.nf(i) .and. nloc.eq.nl(i)) go to 10
enddo enddo
if(nplan.ge.NPMAX) stop 'Too many FFTW plans requested.' ! if(nplan.ge.NPMAX) stop 'Too many FFTW plans requested.'
if(nplan.ge.NPMAX) call exit(1)
nplan=nplan+1 nplan=nplan+1
i=nplan i=nplan
nn(i)=nfft nn(i)=nfft
@ -76,7 +77,8 @@ subroutine four2a(a,nfft,ndim,isign,iform)
else if(isign.eq.1 .and. iform.eq.-1) then else if(isign.eq.1 .and. iform.eq.-1) then
call sfftw_plan_dft_c2r_1d(plan(i),nfft,a,a,nflags) call sfftw_plan_dft_c2r_1d(plan(i),nfft,a,a,nflags)
else else
stop 'Unsupported request in four2a' ! stop 'Unsupported request in four2a'
call exit(1)
endif endif
i=nplan i=nplan
if(nfft.le.NSMALL) then if(nfft.le.NSMALL) then

2
libm65/nchar.f
View File

@ -15,7 +15,7 @@ C Convert ascii number, letter, or space to 0-36 for callsign packing.
n=36 n=36
else else
Print*,'Invalid character in callsign ',c,' ',ichar(c) Print*,'Invalid character in callsign ',c,' ',ichar(c)
stop call exit(1)
endif endif
nchar=n nchar=n

7
main.cpp
View File

@ -1,5 +1,10 @@
#ifdef QT5
#include <QtWidgets>
#else
#include <QtGui> #include <QtGui>
#include <QtGui/QApplication> #endif
#include <QApplication>
#include "mainwindow.h" #include "mainwindow.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])

32
mainwindow.cpp
View File

@ -10,7 +10,7 @@
#include "bandmap.h" #include "bandmap.h"
#include "txtune.h" #include "txtune.h"
#include "sleep.h" #include "sleep.h"
#include <portaudio.h> #include "portaudio.h"
#define NFFT 32768 #define NFFT 32768
@ -157,8 +157,8 @@ MainWindow::MainWindow(QWidget *parent) :
iqAmp=0; iqAmp=0;
iqPhase=0; iqPhase=0;
ui->xThermo->setFillBrush(Qt::green); // ui->xThermo->setFillBrush(Qt::green);
ui->yThermo->setFillBrush(Qt::magenta); // ui->yThermo->setFillBrush(Qt::magenta);
#ifdef WIN32 #ifdef WIN32
while(true) { while(true) {
@ -530,8 +530,8 @@ void MainWindow::dataSink(int k)
if(m_xpol) t.sprintf(" Rx noise: %5.1f %5.1f %5.1f %% ",px,py,m_pctZap); if(m_xpol) t.sprintf(" Rx noise: %5.1f %5.1f %5.1f %% ",px,py,m_pctZap);
if(!m_xpol) t.sprintf(" Rx noise: %5.1f %5.1f %% ",px,m_pctZap); if(!m_xpol) t.sprintf(" Rx noise: %5.1f %5.1f %% ",px,m_pctZap);
lab4->setText(t); lab4->setText(t);
ui->xThermo->setValue((double)px); //Update the bargraphs // ui->xThermo->setValue((double)px); //Update the bargraphs
ui->yThermo->setValue((double)py); // ui->yThermo->setValue((double)py);
if(m_monitoring || m_diskData) { if(m_monitoring || m_diskData) {
g_pWideGraph->dataSink2(s,nkhz,ihsym,m_diskData,lstrong); g_pWideGraph->dataSink2(s,nkhz,ihsym,m_diskData,lstrong);
} }
@ -1258,11 +1258,11 @@ void MainWindow::decode() //decode()
QString hcall=(ui->dxCallEntry->text()+" ").mid(0,12); QString hcall=(ui->dxCallEntry->text()+" ").mid(0,12);
QString hgrid=(ui->dxGridEntry->text()+" ").mid(0,6); QString hgrid=(ui->dxGridEntry->text()+" ").mid(0,6);
strncpy(datcom_.mycall, mcall.toAscii(), 12); strncpy(datcom_.mycall, mcall.toLatin1(), 12);
strncpy(datcom_.mygrid, mgrid.toAscii(), 6); strncpy(datcom_.mygrid, mgrid.toLatin1(), 6);
strncpy(datcom_.hiscall, hcall.toAscii(), 12); strncpy(datcom_.hiscall, hcall.toLatin1(), 12);
strncpy(datcom_.hisgrid, hgrid.toAscii(), 6); strncpy(datcom_.hisgrid, hgrid.toLatin1(), 6);
strncpy(datcom_.datetime, m_dateTime.toAscii(), 20); strncpy(datcom_.datetime, m_dateTime.toLatin1(), 20);
//newdat=1 ==> this is new data, must do the big FFT //newdat=1 ==> this is new data, must do the big FFT
//nagain=1 ==> decode only at fQSO +/- Tol //nagain=1 ==> decode only at fQSO +/- Tol
@ -1455,7 +1455,7 @@ void MainWindow::guiUpdate()
f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append);
QTextStream out(&f); QTextStream out(&f);
out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm")
<< " Tx message: " << QString::fromAscii(msgsent) << endl; << " Tx message: " << QString::fromLatin1(msgsent) << endl;
f.close(); f.close();
} }
@ -1466,8 +1466,8 @@ void MainWindow::guiUpdate()
if(iptt==1 && iptt0==0) nc1=-9; // TxDelay = 0.8 s if(iptt==1 && iptt0==0) nc1=-9; // TxDelay = 0.8 s
if(nc1 <= 0) nc1++; if(nc1 <= 0) nc1++;
if(nc1 == 0) { if(nc1 == 0) {
ui->xThermo->setValue(0.0); //Set the Thermos to zero // ui->xThermo->setValue(0.0); //Set the Thermos to zero
ui->yThermo->setValue(0.0); // ui->yThermo->setValue(0.0);
m_monitoring=false; m_monitoring=false;
soundInThread.setMonitoring(false); soundInThread.setMonitoring(false);
btxok=true; btxok=true;
@ -1478,7 +1478,7 @@ void MainWindow::guiUpdate()
f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append);
QTextStream out(&f); QTextStream out(&f);
out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm")
<< " Tx message: " << QString::fromAscii(msgsent) << endl; << " Tx message: " << QString::fromLatin1(msgsent) << endl;
f.close(); f.close();
} }
@ -1579,8 +1579,8 @@ void MainWindow::guiUpdate()
QString utc = " " + t.time().toString() + " "; QString utc = " " + t.time().toString() + " ";
ui->labUTC->setText(utc); ui->labUTC->setText(utc);
if((!m_monitoring and !m_diskData) or (khsym==m_hsym0)) { if((!m_monitoring and !m_diskData) or (khsym==m_hsym0)) {
ui->xThermo->setValue(0.0); // Set Rx levels to 0 // ui->xThermo->setValue(0.0); // Set Rx levels to 0
ui->yThermo->setValue(0.0); // ui->yThermo->setValue(0.0);
lab4->setText(" Rx noise: 0.0 0.0 0.0% "); lab4->setText(" Rx noise: 0.0 0.0 0.0% ");
} }
m_hsym0=khsym; m_hsym0=khsym;

2
mainwindow.h
View File

@ -1,6 +1,7 @@
#ifndef MAINWINDOW_H #ifndef MAINWINDOW_H
#define MAINWINDOW_H #define MAINWINDOW_H
#include <QtGui> #include <QtGui>
#include <QtWidgets>
#include <QLabel> #include <QLabel>
#include <QTimer> #include <QTimer>
#include <QDateTime> #include <QDateTime>
@ -10,6 +11,7 @@
#include "soundout.h" #include "soundout.h"
#include "commons.h" #include "commons.h"
#include "sleep.h" #include "sleep.h"
#include <QtConcurrent/QtConcurrent>
#define NFFT 32768 #define NFFT 32768
#define NSMAX 5760000 #define NSMAX 5760000

81
mainwindow.ui
View File

@ -93,7 +93,7 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="acceptRichText"> <property name="acceptRichText">
<bool>false</bool> <bool>false</bool>
@ -243,68 +243,6 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QwtThermo" name="xThermo" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>43</width>
<height>180</height>
</size>
</property>
<property name="borderWidth" stdset="0">
<number>1</number>
</property>
<property name="maxValue" stdset="0">
<double>60.000000000000000</double>
</property>
<property name="minValue" stdset="0">
<double>0.000000000000000</double>
</property>
<property name="pipeWidth" stdset="0">
<number>8</number>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QwtThermo" name="yThermo" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>12</width>
<height>177</height>
</size>
</property>
<property name="borderWidth" stdset="0">
<number>1</number>
</property>
<property name="maxValue" stdset="0">
<double>60.000000000000000</double>
</property>
<property name="minValue" stdset="0">
<double>0.000000000000000</double>
</property>
<property name="pipeWidth" stdset="0">
<number>8</number>
</property>
<property name="value" stdset="0">
<double>0.000000000000000</double>
</property>
</widget>
</item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
@ -854,7 +792,7 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -882,7 +820,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -910,7 +848,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -938,7 +876,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -966,7 +904,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -994,7 +932,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string>buttonGroup</string> <string notr="true">buttonGroup</string>
</attribute> </attribute>
</widget> </widget>
</item> </item>
@ -1613,11 +1551,6 @@ p, li { white-space: pre-wrap; }
<extends>QTextBrowser</extends> <extends>QTextBrowser</extends>
<header>displaytext.h</header> <header>displaytext.h</header>
</customwidget> </customwidget>
<customwidget>
<class>QwtThermo</class>
<extends>QWidget</extends>
<header>qwt_thermo.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>
<connections> <connections>

5
map65.iss
View File

@ -1,7 +1,7 @@
[Setup] [Setup]
AppName=MAP65 AppName=MAP65
AppVerName=MAP65 Version 2.5 r3603 AppVerName=MAP65 Version 2.5 r3653
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT AppCopyright=Copyright (C) 2001-2014 by Joe Taylor, K1JT
DefaultDirName=c:\MAP65 DefaultDirName=c:\MAP65
DefaultGroupName=MAP65 DefaultGroupName=MAP65
@ -17,7 +17,6 @@ Source: "c:\Users\joe\wsjt\map65_install\wisdom2.bat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\afmhot.dat"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\map65_install\afmhot.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\blue.dat"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\map65_install\blue.dat"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\map65_install\qthid.exe"; DestDir: "{app}"; Source: "c:\Users\joe\wsjt\map65_install\qthid.exe"; DestDir: "{app}";
Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist Source: "c:\Users\joe\wsjt\QtSupport\*.dll"; DestDir: "{sys}"; Flags: onlyifdoesntexist
Source: "c:\Users\joe\wsjt\map65_install\save\dummy"; DestDir: "{app}\save"; Source: "c:\Users\joe\wsjt\map65_install\save\dummy"; DestDir: "{app}\save";

20
map65.pro
View File

@ -5,12 +5,15 @@
#------------------------------------------------- #-------------------------------------------------
QT += core gui network QT += core gui network
CONFIG += qwt thread greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
#CONFIG += qwt thread
CONFIG += thread
#CONFIG += console #CONFIG += console
TARGET = map65 TARGET = map65
VERSION = 2.3.0 VERSION = 2.3.0
TEMPLATE = app TEMPLATE = app
DEFINES = QT5
win32 { win32 {
DEFINES = WIN32 DEFINES = WIN32
@ -47,8 +50,6 @@ HEADERS += mainwindow.h plotter.h soundin.h soundout.h \
bandmap.h commons.h sleep.h astro.h displaytext.h \ bandmap.h commons.h sleep.h astro.h displaytext.h \
txtune.h txtune.h
DEFINES += __cplusplus
FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui \ FORMS += mainwindow.ui about.ui devsetup.ui widegraph.ui \
messages.ui bandmap.ui astro.ui \ messages.ui bandmap.ui astro.ui \
txtune.ui txtune.ui
@ -63,16 +64,19 @@ LIBS += -lfftw3f -lportaudio -lgfortran
} }
win32 { win32 {
INCLUDEPATH += c:/qwt-6.0.1/include #INCLUDEPATH += c:/qwt-6.1.0/src
LIBS += ../map65/libm65/libm65.a LIBS += ../map65/libm65/libm65.a
LIBS += ../map65/libfftw3f_win.a LIBS += ../map65/libfftw3f_win.a
LIBS += ../QtSupport/palir-02.dll LIBS += /users/joe/wsjt/QtSupport/palir-02.dll
LIBS += libwsock32 LIBS += libwsock32
LIBS += C:/MinGW/lib/libf95.a LIBS += C:/MinGW/lib/libf95.a
CONFIG(release) { CONFIG(release) {
LIBS += C:/qwt-6.0.1/lib/qwt.dll # LIBS += C:/qwt-6.1.0/lib/qwt.dll
} else { } else {
LIBS += C:/qwt-6.0.1/lib/qwtd.dll # LIBS += C:/qwt-6.1.0/lib/qwtd.dll
} }
LIBS += -lusb #LIBS += -lusb
LIBS += /users/joe/linrad/3.37/libusb.a
LIBS += -lQt5Concurrent
#LIBS += c:\wsjt-env\Qt5\Tools\mingw48_32\i686-w64-mingw32\lib\libmingwex.a
} }

8
set570.cpp
View File

@ -17,7 +17,13 @@
#include <string.h> /* String function definitions */ #include <string.h> /* String function definitions */
#include <unistd.h> /* UNIX standard function definitions */ #include <unistd.h> /* UNIX standard function definitions */
#include <sys/time.h> #include <sys/time.h>
#include <usb.h>
#ifdef WIN32
#include <windows.h>
#endif
//#include <usb.h>
#include "/users/joe/linrad/3.37/usb.h"
#include <QDebug> #include <QDebug>
#define USB_SUCCESS 0 #define USB_SUCCESS 0

1
widegraph.h
View File

@ -1,5 +1,6 @@
#ifndef WIDEGRAPH_H #ifndef WIDEGRAPH_H
#define WIDEGRAPH_H #define WIDEGRAPH_H
#include <QtWidgets>
#include <QDialog> #include <QDialog>
namespace Ui { namespace Ui {