From ea5939a11114d1f2497d98762713c58cd6cba6d0 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Tue, 12 Jun 2012 14:10:21 +0000
Subject: [PATCH] Improve an error message regarding suspect data. Don't zero
 dd() when data come from disk. Some code cleanup.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 devsetup.ui        | 2 +-
 libm65/map65a.f90  | 4 ++--
 libm65/symspec.f90 | 2 +-
 mainwindow.cpp     | 2 +-
 map65.iss          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/devsetup.ui b/devsetup.ui
index e4b48e14b..5a28f8655 100644
--- a/devsetup.ui
+++ b/devsetup.ui
@@ -922,7 +922,7 @@
       <attribute name="title">
        <string>Si570</string>
       </attribute>
-      <widget class="QWidget" name="layoutWidget">
+      <widget class="QWidget" name="layoutWidget_6">
        <property name="geometry">
         <rect>
          <x>70</x>
diff --git a/libm65/map65a.f90 b/libm65/map65a.f90
index 1de290ca1..282b65836 100644
--- a/libm65/map65a.f90
+++ b/libm65/map65a.f90
@@ -194,8 +194,8 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb,        &
                  if((nqd.eq.1 .and. ntry.ge.40) .or.                  &
                           (nqd.eq.0 .and. ntry.ge.400)) then
 ! Too many calls to decode1a!
-                    write(*,*) '! Signal too strong?  Decoding aborted.'
-                    write(13,*) 'Signal too strong?  Decoding aborted.'
+                    write(*,*) '! Signal too strong, or suspect data?  Decoding aborted.'
+                    write(13,*) 'Signal too strong, or suspect data?  Decoding aborted.'
                     call flush(13)
                     go to 999
                  endif
diff --git a/libm65/symspec.f90 b/libm65/symspec.f90
index 1f6b2cdee..a317d99fe 100644
--- a/libm65/symspec.f90
+++ b/libm65/symspec.f90
@@ -49,7 +49,7 @@ subroutine symspec(k,nxpol,ndiskdat,nb,nbslider,idphi,nfsample,fgreen,   &
      savg=0.
      ihsym=0
      k1=0
-     dd(1:4,k+1:5760000)=0.             !### Should not be needed ??? ###
+     if(ndiskdat.eq.0) dd(1:4,k+1:5760000)=0.  !### Should not be needed ??? ###
   endif
   k0=k
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index d81741043..db8904d49 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//-------------------------------------------------------------- MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
diff --git a/map65.iss b/map65.iss
index c09445c7d..6dd48da3d 100644
--- a/map65.iss
+++ b/map65.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=MAP65
-AppVerName=MAP65 Version 2.3.0 r2465
+AppVerName=MAP65 Version 2.3.0 r2470
 AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT
 DefaultDirName=c:\MAP65
 DefaultGroupName=MAP65