kopia lustrzana https://gitlab.com/Teuniz/DSRemote
Some minor improvements.
rodzic
28c8ca9ec2
commit
ccd346faf3
2
global.h
2
global.h
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
|
||||
#define PROGRAM_NAME "DSRemote"
|
||||
#define PROGRAM_VERSION "0.32_1602061414"
|
||||
#define PROGRAM_VERSION "0.32_1602061510"
|
||||
|
||||
#define MAX_PATHLEN 4096
|
||||
|
||||
|
|
|
|||
|
|
@ -3470,6 +3470,11 @@ void UI_Mainwindow::shift_trace_up()
|
|||
devparms.fft_voffset = (devparms.fft_vscale * 4.0);
|
||||
}
|
||||
|
||||
if(devparms.math_fft_unit && (devparms.fft_vscale > 9.9))
|
||||
{
|
||||
devparms.fft_voffset = nearbyint(devparms.fft_voffset);
|
||||
}
|
||||
|
||||
if(devparms.modelserie == 6)
|
||||
{
|
||||
sprintf(str, ":CALC:FFT:VOFF %e", devparms.fft_voffset);
|
||||
|
|
@ -3566,6 +3571,18 @@ void UI_Mainwindow::shift_trace_down()
|
|||
devparms.fft_voffset = (devparms.fft_vscale * -4.0);
|
||||
}
|
||||
|
||||
if(devparms.math_fft_unit)
|
||||
{
|
||||
if(devparms.fft_vscale > 9.0)
|
||||
{
|
||||
devparms.fft_voffset = nearbyint(devparms.fft_voffset);
|
||||
}
|
||||
else
|
||||
{
|
||||
devparms.fft_voffset = nearbyint(devparms.fft_voffset * 10.0) / 10.0;
|
||||
}
|
||||
}
|
||||
|
||||
if(devparms.modelserie == 6)
|
||||
{
|
||||
sprintf(str, ":CALC:FFT:VOFF %e", devparms.fft_voffset);
|
||||
|
|
|
|||
|
|
@ -1745,15 +1745,27 @@ void SignalCurve::mouseReleaseEvent(QMouseEvent *release_event)
|
|||
|
||||
if(devparms->math_fft && devparms->math_fft_split)
|
||||
{
|
||||
fft_arrow_moving = 0;
|
||||
use_move_events = 0;
|
||||
setMouseTracking(false);
|
||||
|
||||
if(fft_arrow_moving)
|
||||
{
|
||||
fft_arrow_moving = 0;
|
||||
|
||||
if(devparms->screenupdates_on == 1)
|
||||
{
|
||||
mainwindow->scrn_timer->start(devparms->screentimerival);
|
||||
}
|
||||
|
||||
if(devparms->fft_vscale > 9.0)
|
||||
{
|
||||
devparms->fft_voffset = nearbyint(devparms->fft_voffset);
|
||||
}
|
||||
else
|
||||
{
|
||||
devparms->fft_voffset = nearbyint(devparms->fft_voffset * 10.0) / 10.0;
|
||||
}
|
||||
|
||||
if(devparms->modelserie != 6)
|
||||
{
|
||||
sprintf(str, ":MATH:OFFS %e", devparms->fft_voffset);
|
||||
|
|
@ -1777,6 +1789,7 @@ void SignalCurve::mouseReleaseEvent(QMouseEvent *release_event)
|
|||
mainwindow->statusLabel->setText(str);
|
||||
|
||||
update();
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue