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

Use usleep.c, not cutil.c. 

Temporarily disable some palettes.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@4062 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-04-23 01:54:55 +00:00
parent fe8d758a65
commit 1fc2408e3d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devsetup.cpp
View File

@ -109,8 +109,8 @@ void DevSetup::initDlg()
ui.mult570SpinBox->setValue(m_mult570);
ui.mult570TxSpinBox->setValue(m_mult570Tx);
ui.cal570SpinBox->setValue(m_cal570);
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);
// 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);
updateColorLabels();
ui.sbBackgroundRed->setValue(r);
ui.sbBackgroundGreen->setValue(g);

2
libm65/CMakeLists.txt
View File

@ -136,13 +136,13 @@ set (FSRCS
)
set (CSRCS
cutil.c
decode_rs.c
encode_rs.c
gran.c
igray.c
init_rs.c
tmoonsub.c
usleep.c
wrapkarn.c
)

4
plotter.cpp
View File

@ -694,7 +694,7 @@ void CPlotter::setPalette(QString palette) //setPalette()
int n,r,g,b;
float xr,xg,xb;
for(int i=0; i<256; i++) {
fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb);
// fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb);
r=255.0*xr + 0.5;
g=255.0*xg + 0.5;
b=255.0*xb + 0.5;
@ -707,7 +707,7 @@ void CPlotter::setPalette(QString palette) //setPalette()
int n,r,g,b;
float xr,xg,xb;
for(int i=0; i<256; i++) {
fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb);
// fscanf(fp,"%d%f%f%f",&n,&xr,&xg,&xb);
r=255.0*xr + 0.5;
g=255.0*xg + 0.5;
b=255.0*xb + 0.5;