merge-requests/1/head
Teuniz 2016-01-09 15:17:55 +01:00
rodzic 0e7183daf9
commit e14e991f9a
3 zmienionych plików z 6 dodań i 6 usunięć

Wyświetl plik

@ -35,7 +35,7 @@
#define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.32_1601091426"
#define PROGRAM_VERSION "0.32_1601091517"
#define MAX_PATHLEN 4096

Wyświetl plik

@ -3365,7 +3365,7 @@ void UI_Mainwindow::select_fft_ch1()
{
if(devparms.modelserie != 6)
{
set_cue_cmd(":MATH:SOUR1 CHAN1");
set_cue_cmd(":MATH:FFT:SOUR CHAN1");
}
devparms.math_fft_src = 0;
@ -3378,7 +3378,7 @@ void UI_Mainwindow::select_fft_ch2()
{
if(devparms.modelserie != 6)
{
set_cue_cmd(":MATH:SOUR1 CHAN2");
set_cue_cmd(":MATH:FFT:SOUR CHAN2");
}
devparms.math_fft_src = 1;
@ -3391,7 +3391,7 @@ void UI_Mainwindow::select_fft_ch3()
{
if(devparms.modelserie != 6)
{
set_cue_cmd(":MATH:SOUR1 CHAN3");
set_cue_cmd(":MATH:FFT:SOUR CHAN3");
}
devparms.math_fft_src = 2;
@ -3404,7 +3404,7 @@ void UI_Mainwindow::select_fft_ch4()
{
if(devparms.modelserie != 6)
{
set_cue_cmd(":MATH:SOUR1 CHAN4");
set_cue_cmd(":MATH:FFT:SOUR CHAN4");
}
devparms.math_fft_src = 3;

Wyświetl plik

@ -734,7 +734,7 @@ void SignalCurve::drawFFT(QPainter *painter, int curve_h_b, int curve_w_b)
/////////////////////////////////// FFT: draw the curve ///////////////////////////////////////////
if((devparms->fftbufsz > 32) && devparms->chandisplay[devparms->math_fft_src])
if((devparms->fftbufsz > 32) && devparms->chandisplay[devparms->math_fft_src] && (bufsize > 32))
{
painter->setClipping(true);
painter->setClipRegion(QRegion(0, 0, curve_w, curve_h), Qt::ReplaceClip);