w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-10 02:37:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Makefile for building m65.exe.

Browse Source 
Add code to set the signal meters.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@3825 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-03-03 17:39:31 +00:00
parent 0d842cac29
commit 2719bda29f
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libm65/Makefile.MinGW
View File

@ -17,7 +17,7 @@ CFLAGS = -I. -fbounds-check
%.o: %.F90 %.o: %.F90
${FC} ${FFLAGS} -c $< ${FC} ${FFLAGS} -c $<
all: libm65.a m65.exe JT65code.exe mapsim.exe all: libm65.a m65.exe JT65code.exe mapsim.exe libastro.a
OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \ OBJS1 = trimlist.o display.o getdphi.o pctile.o ccf65.o \
decode1a.o sort.o filbig.o fil6521.o afc65b.o \ decode1a.o sort.o filbig.o fil6521.o afc65b.o \
@ -39,7 +39,8 @@ libm65.a: $(OBJS1)
OBJS3 = m65.o m65a.o map65a.o symspec.o decode0.o ftninit.o ftnquit.o \ OBJS3 = m65.o m65a.o map65a.o symspec.o decode0.o ftninit.o ftnquit.o \
timer.o ipcomm.o sec_midn.o cutil.o timer.o ipcomm.o sec_midn.o cutil.o
LIBS3 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4
LIBS3 = -L'C:/wsjt-env/Qt5/5.2.1/mingw48_32/lib' -lQt5Core
m65.exe: $(OBJS3) libm65.a m65.exe: $(OBJS3) libm65.a
g++ -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \ g++ -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \
@ -50,14 +51,21 @@ OBJS2 = JT65code.o
JT65code.exe: $(OBJS2) libm65.a JT65code.exe: $(OBJS2) libm65.a
$(FC) -o JT65code.exe $(OBJS2) libm65.a $(FC) -o JT65code.exe $(OBJS2) libm65.a
OBJS7 = astrosub.o astro0.o astro.o tm2.o grid2deg.o sun.o moondop.o \
coord.o dot.o moon2.o tmoonsub.o toxyz.o geocentric.o \
dcoord.o
libastro.a: $(OBJS7)
ar cr libastro.a $(OBJS7)
ranlib libastro.a
OBJS6 = mapsim.o cgen65.o noisegen.o gran.o OBJS6 = mapsim.o cgen65.o noisegen.o gran.o
mapsim.exe: $(OBJS6) libm65.a mapsim.exe: $(OBJS6) libm65.a
$(FC) -o mapsim.exe $(OBJS6) libm65.a $(FC) -o mapsim.exe $(OBJS6) libm65.a
INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \ INCPATH = -I'C:/wsjt-env/Qt5/5.2.1/mingw48_32/include/QtCore' \
-I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \ -I'C:/wsjt-env/Qt5/5.2.1/mingw48_32/include'
-I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
-I'release' -I'.' -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/mkspecs/win32-g++'
ipcomm.o: ipcomm.cpp ipcomm.o: ipcomm.cpp
g++ -c $(INCPATH) ipcomm.cpp g++ -c $(INCPATH) ipcomm.cpp

14
mainwindow.cpp
View File

@ -157,8 +157,6 @@ MainWindow::MainWindow(QWidget *parent) :
iqAmp=0; iqAmp=0;
iqPhase=0; iqPhase=0;
// ui->xThermo->setFillBrush(Qt::green);
// ui->yThermo->setFillBrush(Qt::magenta);
xSignalMeter = new SignalMeter(ui->xMeterFrame); xSignalMeter = new SignalMeter(ui->xMeterFrame);
xSignalMeter->resize(50, 160); xSignalMeter->resize(50, 160);
ySignalMeter = new SignalMeter(ui->yMeterFrame); ySignalMeter = new SignalMeter(ui->yMeterFrame);
@ -534,8 +532,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 xSignalMeter->setValue(px); // Update the signal meters
// ui->yThermo->setValue((double)py); ySignalMeter->setValue(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);
} }
@ -1470,8 +1468,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 xSignalMeter->setValue(0);
// ui->yThermo->setValue(0.0); ySignalMeter->setValue(0);
m_monitoring=false; m_monitoring=false;
soundInThread.setMonitoring(false); soundInThread.setMonitoring(false);
btxok=true; btxok=true;
@ -1583,8 +1581,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 xSignalMeter->setValue(0);
// ui->yThermo->setValue(0.0); ySignalMeter->setValue(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;