w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 09:01:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.5.0'

Browse Source
This commit is contained in:
Bill Somerville 2021-06-02 18:56:19 +01:00
commit 68a3d410da
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1401,8 +1401,10 @@ else (${OPENMP_FOUND} OR APPLE)
target_link_libraries (jt9 wsjt_fort wsjt_cxx fort_qt) target_link_libraries (jt9 wsjt_fort wsjt_cxx fort_qt)
endif (${OPENMP_FOUND} OR APPLE) endif (${OPENMP_FOUND} OR APPLE)
# build map65 if (WIN32)
add_subdirectory (map65) # build map65
add_subdirectory (map65)
endif ()
# build the main application # build the main application
generate_version_info (wsjtx_VERSION_RESOURCES generate_version_info (wsjtx_VERSION_RESOURCES

4
map65/libm65/extract.f90
View File

@ -98,7 +98,7 @@ subroutine extract(s3,nadd,ncount,nhist,decoded,ltext)
itmp(i)=correct(64-i) itmp(i)=correct(64-i)
enddo enddo
correct(1:63)=itmp(1:63) correct(1:63)=itmp(1:63)
call interleave63(correct,63,1) call interleave63(correct,1)
call graycode65(correct,63,1) call graycode65(correct,63,1)
call unpackmsg(dat4,decoded) !Unpack the user message call unpackmsg(dat4,decoded) !Unpack the user message
ncount=0 ncount=0
@ -120,7 +120,7 @@ subroutine getpp(workdat,p)
a(1:63)=workdat(63:1:-1) a(1:63)=workdat(63:1:-1)
call interleave63(a,1) call interleave63(a,1)
call graycode(a,63,1,a) call graycode(a,63,1)
psum=0. psum=0.
do j=1,63 do j=1,63

12
map65/plotter.h
View File

@ -24,8 +24,8 @@ public:
explicit CPlotter(QWidget *parent = 0); explicit CPlotter(QWidget *parent = 0);
~CPlotter(); ~CPlotter();
QSize minimumSizeHint() const; QSize minimumSizeHint() const override;
QSize sizeHint() const; QSize sizeHint() const override;
QColor m_ColorTbl[256]; QColor m_ColorTbl[256];
bool m_bDecodeFinished; bool m_bDecodeFinished;
int m_plotZero; int m_plotZero;
@ -81,8 +81,8 @@ signals:
protected: protected:
//re-implemented widget event handlers //re-implemented widget event handlers
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event) override;
void resizeEvent(QResizeEvent* event); void resizeEvent(QResizeEvent* event) override;
void mouseMoveEvent(QMouseEvent * event) override; void mouseMoveEvent(QMouseEvent * event) override;
private: private:
@ -132,8 +132,8 @@ private:
qint32 m_TxDF; qint32 m_TxDF;
private slots: private slots:
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event) override;
void mouseDoubleClickEvent(QMouseEvent *event); void mouseDoubleClickEvent(QMouseEvent *event) override;
}; };
#endif // PLOTTER_H #endif // PLOTTER_H