diff --git a/libm65/Makefile.MinGW b/libm65/Makefile.MinGW index 04e68d8f0..b136d8ed3 100644 --- a/libm65/Makefile.MinGW +++ b/libm65/Makefile.MinGW @@ -17,7 +17,7 @@ CFLAGS = -I. -fbounds-check %.o: %.F90 ${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 \ 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 \ 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 g++ -o m65.exe $(OBJS3) $(LIBS3) libm65.a ../libfftw3f_win.a \ @@ -50,14 +51,21 @@ OBJS2 = JT65code.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 mapsim.exe: $(OBJS6) libm65.a $(FC) -o mapsim.exe $(OBJS6) libm65.a -INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \ - -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/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++' +INCPATH = -I'C:/wsjt-env/Qt5/5.2.1/mingw48_32/include/QtCore' \ + -I'C:/wsjt-env/Qt5/5.2.1/mingw48_32/include' + ipcomm.o: ipcomm.cpp g++ -c $(INCPATH) ipcomm.cpp diff --git a/mainwindow.cpp b/mainwindow.cpp index 02f2a5c59..f99c47892 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -157,8 +157,6 @@ MainWindow::MainWindow(QWidget *parent) : iqAmp=0; iqPhase=0; -// ui->xThermo->setFillBrush(Qt::green); -// ui->yThermo->setFillBrush(Qt::magenta); xSignalMeter = new SignalMeter(ui->xMeterFrame); xSignalMeter->resize(50, 160); 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 %% ",px,m_pctZap); lab4->setText(t); -// ui->xThermo->setValue((double)px); //Update the bargraphs -// ui->yThermo->setValue((double)py); + xSignalMeter->setValue(px); // Update the signal meters + ySignalMeter->setValue(py); if(m_monitoring || m_diskData) { 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(nc1 <= 0) nc1++; if(nc1 == 0) { -// ui->xThermo->setValue(0.0); //Set the Thermos to zero -// ui->yThermo->setValue(0.0); + xSignalMeter->setValue(0); + ySignalMeter->setValue(0); m_monitoring=false; soundInThread.setMonitoring(false); btxok=true; @@ -1583,8 +1581,8 @@ void MainWindow::guiUpdate() QString utc = " " + t.time().toString() + " "; ui->labUTC->setText(utc); if((!m_monitoring and !m_diskData) or (khsym==m_hsym0)) { -// ui->xThermo->setValue(0.0); // Set Rx levels to 0 -// ui->yThermo->setValue(0.0); + xSignalMeter->setValue(0); + ySignalMeter->setValue(0); lab4->setText(" Rx noise: 0.0 0.0 0.0% "); } m_hsym0=khsym;