Some minor improvements.

merge-requests/1/head
Teuniz 2016-02-06 15:10:36 +01:00
rodzic 28c8ca9ec2
commit ccd346faf3
3 zmienionych plików z 58 dodań i 28 usunięć

Wyświetl plik

@ -35,7 +35,7 @@
#define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.32_1602061414"
#define PROGRAM_VERSION "0.32_1602061510"
#define MAX_PATHLEN 4096

Wyświetl plik

@ -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);

Wyświetl plik

@ -1745,39 +1745,52 @@ 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(devparms->screenupdates_on == 1)
if(fft_arrow_moving)
{
mainwindow->scrn_timer->start(devparms->screentimerival);
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);
mainwindow->set_cue_cmd(str);
}
if(devparms->math_fft_unit == 0)
{
strcpy(str, "FFT position: ");
convert_to_metric_suffix(str + strlen(str), devparms->fft_voffset, 1);
strcat(str, "V/Div");
}
else
{
sprintf(str, "FFT position: %+.0fdB", devparms->fft_voffset);
}
mainwindow->statusLabel->setText(str);
update();
}
if(devparms->modelserie != 6)
{
sprintf(str, ":MATH:OFFS %e", devparms->fft_voffset);
mainwindow->set_cue_cmd(str);
}
if(devparms->math_fft_unit == 0)
{
strcpy(str, "FFT position: ");
convert_to_metric_suffix(str + strlen(str), devparms->fft_voffset, 1);
strcat(str, "V/Div");
}
else
{
sprintf(str, "FFT position: %+.0fdB", devparms->fft_voffset);
}
mainwindow->statusLabel->setText(str);
update();
return;
}