From 5670bc4709db9ec775b2d7741c01d797c8e49ea0 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Sat, 29 Sep 2012 13:02:19 +0000
Subject: [PATCH] Working on wide graph displays.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2609 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 commons.h           |   2 +-
 libm65/symspecx.f90 |  15 +++---
 mainwindow.cpp      |  10 ++--
 mainwindow.h        |   1 -
 plotter.cpp         | 113 +++++++++++---------------------------------
 soundin.cpp         |   2 +-
 widegraph.cpp       |   7 +--
 widegraph.ui        |  23 ---------
 8 files changed, 42 insertions(+), 131 deletions(-)

diff --git a/commons.h b/commons.h
index a3843004f..634625453 100644
--- a/commons.h
+++ b/commons.h
@@ -1,7 +1,7 @@
 #ifndef COMMONS_H
 #define COMMONS_H
 
-#define NSMAX 15750
+#define NSMAX 10000
 
 extern "C" {
 
diff --git a/libm65/symspecx.f90 b/libm65/symspecx.f90
index 77ff5708c..9c515ee99 100644
--- a/libm65/symspecx.f90
+++ b/libm65/symspecx.f90
@@ -12,7 +12,7 @@ subroutine symspecx(k,nsps,ndiskdat,nb,nbslider,pxdb,s,nkhz,ihsym,   &
 !  nzap     number of samples zero'ed by noise blanker
 
   parameter (NMAX=1800*12000)        !Total sample intervals per 30 minutes
-  parameter (NSMAX=15750)             !Max length of saved spectra
+  parameter (NSMAX=10000)             !Max length of saved spectra
   parameter (MAXFFT=262144)          !Max length of FFTs
   integer*2 id2
   real*8 ts,hsym
@@ -66,20 +66,19 @@ subroutine symspecx(k,nsps,ndiskdat,nb,nbslider,pxdb,s,nkhz,ihsym,   &
   ihsym=ihsym+1
   call four2a(x,nfft,1,-1,0)          !Forward FFT of symbol length
   df=12000.0/nfft
-  nzh=min(nint(500.0/df),2200)
-  nz=2*nzh
-  i0=nint(1500.0/df) - nzh
-  rewind 71
+  i0=nint(1000.0/df)
+  nz=min(NSMAX,nfft/2)
+!  rewind 71
   do i=1,nz
      sx=real(cx(i0+i))**2 + aimag(cx(i0+i))**2
      sx=1.e-8*sx
      s(i)=sx
      savg(i)=savg(i) + sx
      if(ihsym.le.184) ss(ihsym,i)=sx
-     write(71,3001) (i0+i-1)*df,savg(i),db(savg(i))
-3001 format(f12.6,2f12.3)
+!     write(71,3001) (i0+i-1)*df,savg(i),db(savg(i))
+!3001 format(f12.6,2f12.3)
   enddo
-  flush(71)
+!  flush(71)
 
   nkhz=100
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5d1975cb9..b43eeb55b 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -298,7 +298,7 @@ void MainWindow::readSettings()
 //-------------------------------------------------------------- dataSink()
 void MainWindow::dataSink(int k)
 {
-  static float s[NFFT],splot[NFFT];
+  static float s[NSMAX],splot[NSMAX];
   static int n=0;
   static int ihsym=0;
   static int nzap=0;
@@ -336,16 +336,16 @@ void MainWindow::dataSink(int k)
 
   //Average over specified number of spectra
   if (n==0) {
-    for (int i=0; i<NFFT; i++)
+    for (int i=0; i<NSMAX; i++)
       splot[i]=s[i];
   } else {
-    for (int i=0; i<NFFT; i++)
+    for (int i=0; i<NSMAX; i++)
       splot[i] += s[i];
   }
   n++;
 
   if (n>=m_waterfallAvg) {
-    for (int i=0; i<NFFT; i++) {
+    for (int i=0; i<NSMAX; i++) {
         splot[i] /= n;                           //Normalize the average
     }
 
@@ -353,7 +353,7 @@ void MainWindow::dataSink(int k)
     qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
     int ntr = (ms/1000) % m_TRperiod;
     if((m_diskData && ihsym <= m_waterfallAvg) || (!m_diskData && ntr<ntr0)) {
-      for (int i=0; i<NFFT; i++) {
+      for (int i=0; i<NSMAX; i++) {
         splot[i] = 1.e30;
       }
     }
diff --git a/mainwindow.h b/mainwindow.h
index fc2a400c2..3b69b73a6 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -11,7 +11,6 @@
 #include "sleep.h"
 
 #define NFFT 32768
-#define NSMAX 5760000
 
 //--------------------------------------------------------------- MainWindow
 namespace Ui {
diff --git a/plotter.cpp b/plotter.cpp
index 61f392431..a5caebfa8 100644
--- a/plotter.cpp
+++ b/plotter.cpp
@@ -83,62 +83,12 @@ void CPlotter::paintEvent(QPaintEvent *)                    // paintEvent()
   int h = (m_Size.height()-60)/2;
   painter.drawPixmap(0,0,m_ScalePixmap);
   painter.drawPixmap(0,30,m_WaterfallPixmap);
-  if(m_2Dspec) {
-    painter.drawPixmap(0,h+30,m_ScalePixmap);
-    painter.drawPixmap(0,h+60,m_2DPixmap);
-    m_paintEventBusy=false;
-    return;
-  }
-
-  painter.drawPixmap(0,h+30,m_ZoomScalePixmap);
-  painter.drawPixmap(0,h+60,m_ZoomWaterfallPixmap);
-
-  QRect target(0,h+30,w,30);           // (x,y,width,height)
-  QRect source(0,0,w,30);
-  painter.drawPixmap(target,m_ZoomScalePixmap,source);
-
-//  float df=m_fSample/32768.0;
-//  int x0=16384 + (0.001*(m_ZoomStartFreq+m_fCal)+m_fQSO-m_nkhz+1.27046) * \
-//      1000.0/df + 0.5;
-  float df=12000.0/m_nsps;
-  int x0=0;                         //### TEMP ###
-
-  QPainter painter2(&m_ZoomWaterfallPixmap);
-  for(int i=0; i<w; i++) {                      //Paint the top row
-    painter2.setPen(m_ColorTbl[m_zwf[x0+i]]);
-    painter2.drawPoint(i,0);
-  }
-  if(m_paintAllZoom or (x0 != x00 and x00 != -99)) {
-    // If new fQSO, paint all rows
-    int k=x0;
-    for(int j=1; j<h; j++) {
-      k += 32768;
-      if(x0 != x00 and x00 != -99) {
-        for(int i=0; i<w; i++) {
-          painter2.setPen(m_ColorTbl[m_zwf[i+k]]);
-          painter2.drawPoint(i,j);
-        }
-      }
-      if(j == 13 and x0 == x00) {
-        painter2.setPen(m_ColorTbl[255]);
-        painter2.drawText(5,10,m_sutc);
-      }
-    }
-  } else if(m_line == 13) {
-    painter2.setPen(m_ColorTbl[255]);
-    UTCstr();
-    painter2.drawText(5,10,m_sutc);
-  }
-  m_paintAllZoom=false;
-  x00=x0;
-
-  QRect target2(0,h+60,w,h);           // (x,y,width,height)
-  QRect source2(0,0,w,h);
-  painter.drawPixmap(target2,m_ZoomWaterfallPixmap,source2);
+  painter.drawPixmap(0,h+30,m_ScalePixmap);
+  painter.drawPixmap(0,h+60,m_2DPixmap);
   m_paintEventBusy=false;
 }
 
-void CPlotter::draw(float swide[], int i0, float splot[])                 //draw()
+void CPlotter::draw(float swide[], int i0, float splot[])             //draw()
 {
   int i,j,w,h;
   float y;
@@ -183,22 +133,20 @@ void CPlotter::draw(float swide[], int i0, float splot[])                 //draw
     m_hist1[y1]++;
     painter1.setPen(m_ColorTbl[y1]);
     painter1.drawPoint(i,0);
-    if(m_2Dspec) {
-      int y2 = gain*(y + 34 -m_plotZero);
-      if (y2<0) y2=0;
-      if (y2>254) y2=254;
-      if (swide[i]>1.e29) y2=255;
-      if(strong != strong0 or i==w-1) {
-        painter2D.drawPolyline(LineBuf,j);
-        j=0;
-        strong0=strong;
-        if(strong0) painter2D.setPen(Qt::red);
-        if(!strong0) painter2D.setPen(Qt::green);
-      }
-      LineBuf[j].setX(i);
-      LineBuf[j].setY(h-y2);
-      j++;
+    int y2 = gain*(y + 34 -m_plotZero);
+    if (y2<0) y2=0;
+    if (y2>254) y2=254;
+    if (swide[i]>1.e29) y2=255;
+    if(strong != strong0 or i==w-1) {
+      painter2D.drawPolyline(LineBuf,j);
+      j=0;
+      strong0=strong;
+      if(strong0) painter2D.setPen(Qt::red);
+      if(!strong0) painter2D.setPen(Qt::green);
     }
+    LineBuf[j].setX(i);
+    LineBuf[j].setY(h-y2);
+    j++;
   }
 
   for(i=0; i<NSMAX; i++) {
@@ -308,23 +256,16 @@ void CPlotter::DrawOverlay()                                 //DrawOverlay()
   }
 
 
-  if(m_2Dspec) {
-    QPen pen0(Qt::green, 3);                 //Mark Cal Freq with green tick
-    painter0.setPen(pen0);
-    x = m_xClick;
-    painter0.drawLine(x,15,x,30);
-    int x0=(16384-m_i0)/m_binsPerPixel;
-    m_fGreen=(x-x0)*df;
-    x0 += (x0-x);
-    QPen pen3(Qt::red, 3);
-    painter0.setPen(pen3);
-    if(x0>0 and x0<w) painter0.drawLine(x0,15,x0,30);
-  } else {
-    QPen pen0(Qt::green, 3);                 //Mark fQSO with green tick
-    painter0.setPen(pen0);
-    x = XfromFreq(float(fQSO()));
-    painter0.drawLine(x,15,x,30);
-  }
+  QPen pen0(Qt::green, 3);                 //Mark Cal Freq with green tick
+  painter0.setPen(pen0);
+  x = m_xClick;
+  painter0.drawLine(x,15,x,30);
+  int x0=(16384-m_i0)/m_binsPerPixel;
+  m_fGreen=(x-x0)*df;
+  x0 += (x0-x);
+  QPen pen3(Qt::red, 3);
+  painter0.setPen(pen3);
+  if(x0>0 and x0<w) painter0.drawLine(x0,15,x0,30);
 
   // Now make the zoomed scale, using m_ZoomScalePixmap and painter3
   QRect rect1;
@@ -669,7 +610,7 @@ void CPlotter::setMode65(int n)
 
 void CPlotter::set2Dspec(bool b)
 {
-  m_2Dspec=b;
+//  m_2Dspec=b;
   m_paintAllZoom=!b;
   DrawOverlay();                         //Redraw scales and ticks
   update();                              //trigger a new paintEvent}
diff --git a/soundin.cpp b/soundin.cpp
index ba217b336..dc6caf635 100644
--- a/soundin.cpp
+++ b/soundin.cpp
@@ -2,7 +2,7 @@
 #include <stdexcept>
 
 #define FRAMES_PER_BUFFER 1024
-#define NSMAX 15750
+#define NSMAX 10000
 
 extern "C" {
 #include <portaudio.h>
diff --git a/widegraph.cpp b/widegraph.cpp
index fceb7ccb3..018bab7c4 100644
--- a/widegraph.cpp
+++ b/widegraph.cpp
@@ -1,7 +1,7 @@
 #include "widegraph.h"
 #include "ui_widegraph.h"
 
-#define NSMAX 15750
+#define NSMAX 10000
 
 WideGraph::WideGraph(QWidget *parent) :
   QDialog(parent),
@@ -283,11 +283,6 @@ void WideGraph::initIQplus()
 {
 }
 
-void WideGraph::on_cbSpec2d_toggled(bool b)
-{
-  ui->widePlot->set2Dspec(b);
-}
-
 double WideGraph::fGreen()
 {
   return ui->widePlot->fGreen();
diff --git a/widegraph.ui b/widegraph.ui
index f26e7107e..1ec5c6ba1 100644
--- a/widegraph.ui
+++ b/widegraph.ui
@@ -324,29 +324,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="horizontalSpacer_8">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Preferred</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="cbSpec2d">
-         <property name="text">
-          <string>2D Spectrum</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <spacer name="horizontalSpacer_5">
          <property name="orientation">