More GUI tweaks.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2619 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

libm65/symspecx.f90

@@ -1,4 +1,4 @@
-subroutine symspecx(k,nsps,ndiskdat,nb,nbslider,pxdb,s,nkhz,ihsym,   &
+subroutine symspecx(k,nsps,ndiskdat,nb,nbslider,pxdb,s,ihsym,   &
      nzap,slimit,lstrong)
 
 !  k        pointer to the most recent new data
@@ -7,7 +7,6 @@ subroutine symspecx(k,nsps,ndiskdat,nb,nbslider,pxdb,s,nkhz,ihsym,   &
 !  nb       0/1 status of noise blanker (off/on)
 !  pxdb     power (0-60 dB)
 !  s        spectrum for waterfall display
-!  nkhz     integer kHz portion of center frequency, e.g., 125 for 144.125
 !  ihsym    index number of this half-symbol (1-322)
 !  nzap     number of samples zero'ed by noise blanker
 
@@ -80,7 +79,5 @@ subroutine symspecx(k,nsps,ndiskdat,nb,nbslider,pxdb,s,nkhz,ihsym,   &
   enddo
 !  flush(71)
 
-  nkhz=100
-
 999 return
 end subroutine symspecx

mainwindow.cpp

@@ -323,7 +323,7 @@ void MainWindow::dataSink(int k)
   nb=0;
   if(m_NB) nb=1;
   symspecx_(&k, & m_nsps, &ndiskdat, &nb, &m_NBslider, &px, s,
-            &nkhz, &ihsym, &nzap, &slimit, lstrong);
+            &ihsym, &nzap, &slimit, lstrong);
   if(ihsym <=0) return;
   QString t;
   m_pctZap=nzap/178.3;

mainwindow.h

@@ -218,7 +218,7 @@ extern void getDev(int* numDevices,char hostAPI_DeviceName[][50],
 extern "C" {
 //----------------------------------------------------- C and Fortran routines
 void symspecx_(int* k, int* nsps, int* ndiskdat, int* nb, int* m_NBslider,
-               float* px, float s[], int* nkhz, int* nhsym, int* nzap,
+               float* px, float s[], int* nhsym, int* nzap,
                float* slimit, uchar lstrong[]);
 void genjt8_(char* msg, char* msgsent, short itone[], int* nsym,
              int len1, int len2);

mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>602</width>
-    <height>516</height>
+    <height>515</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -16,6 +16,12 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>510</height>
+   </size>
+  </property>
   <property name="maximumSize">
    <size>
     <width>2048</width>
@@ -80,7 +86,7 @@
           <property name="maximumSize">
            <size>
             <width>610</width>
-            <height>400</height>
+            <height>300</height>
            </size>
           </property>
           <property name="font">

plotter.cpp

@@ -190,8 +190,6 @@ void CPlotter::DrawOverlay()                                 //DrawOverlay()
   if(m_binsPerPixel < 1) m_binsPerPixel=1;
   double df = m_binsPerPixel*m_fftBinWidth;
   m_fSpan = w*df;
-//  m_freqPerDiv=50*m_binsPerPixel;
-//  m_freqPerDiv=nHzDiv[m_binsPerPixel];
   int n=m_fSpan/10;
   m_freqPerDiv=10;
   if(n>25) m_freqPerDiv=50;
@@ -201,8 +199,7 @@ void CPlotter::DrawOverlay()                                 //DrawOverlay()
   m_ScalePixmap.fill(Qt::white);
   painter0.drawRect(0, 0, w, 30);
 
-  //draw tick marks on wideband (upper) scale
+//draw tick marks on upper scale
-//  pixperdiv = m_binsPerPixel*m_freqPerDiv/df;
   pixperdiv = m_freqPerDiv/df;
   for( int i=1; i<m_hdivs; i++) {     //major ticks
     x = (int)( (float)i*pixperdiv );

widegraph.ui

@@ -102,7 +102,7 @@
        <item>
         <widget class="QLabel" name="label_3">
          <property name="text">
-          <string>Nbpp</string>
+          <string>FFT Bins / Pixel</string>
          </property>
         </widget>
        </item>