From 3c7d0045cd7e8d31a268fa25264ab1d25518bfe3 Mon Sep 17 00:00:00 2001
From: David Freese <w1hkj@w1hkj.com>
Date: Thu, 26 Mar 2009 16:37:08 -0500
Subject: [PATCH] Miscellaneous fixes

    * RTTY DSP filter bandwidth tracks baud / shift
    * Log frequency changed to left justified
---
 src/cw_rtty/rtty.cxx       | 2 ++
 src/dialogs/confdialog.cxx | 4 ++--
 src/dialogs/confdialog.fl  | 6 +++---
 src/logbook/logsupport.cxx | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/cw_rtty/rtty.cxx b/src/cw_rtty/rtty.cxx
index eda29bdf..8440f1a4 100644
--- a/src/cw_rtty/rtty.cxx
+++ b/src/cw_rtty/rtty.cxx
@@ -163,6 +163,8 @@ void rtty::restart()
 	
     rtty_BW = shift + 3*rtty_baud;
 	progdefaults.RTTY_BW = rtty_BW;
+	sldrRTTYbandwidth->value(rtty_BW);
+	
 	wf->redraw_marker();
 
 	if (bpfilt) 
diff --git a/src/dialogs/confdialog.cxx b/src/dialogs/confdialog.cxx
index 02b8f754..fd2ba0a1 100644
--- a/src/dialogs/confdialog.cxx
+++ b/src/dialogs/confdialog.cxx
@@ -2660,6 +2660,7 @@ an merging"));
           tabsModems->selection_color(FL_LIGHT1);
           tabsModems->align(FL_ALIGN_TOP_RIGHT);
           { tabCW = new Fl_Group(0, 50, 500, 320, _("CW"));
+            tabCW->hide();
             { tabsCW = new Fl_Tabs(0, 50, 500, 320);
               tabsCW->selection_color(FL_LIGHT1);
               { Fl_Group* o = new Fl_Group(0, 75, 500, 295, _("General"));
@@ -3226,7 +3227,6 @@ an merging"));
             tabPSK->end();
           } // Fl_Group* tabPSK
           { tabRTTY = new Fl_Group(0, 50, 500, 320, _("RTTY"));
-            tabRTTY->hide();
             { Fl_Group* o = new Fl_Group(5, 60, 490, 270);
               o->box(FL_ENGRAVED_FRAME);
               { Fl_Choice* o = selShift = new Fl_Choice(15, 70, 100, 20, _("Carrier shift"));
@@ -3346,7 +3346,7 @@ an merging"));
                 sldrRTTYbandwidth->tooltip(_("Adjust the DSP bandwidth"));
                 sldrRTTYbandwidth->type(1);
                 sldrRTTYbandwidth->minimum(50);
-                sldrRTTYbandwidth->maximum(1000);
+                sldrRTTYbandwidth->maximum(1200);
                 sldrRTTYbandwidth->step(5);
                 sldrRTTYbandwidth->value(400);
                 sldrRTTYbandwidth->textsize(14);
diff --git a/src/dialogs/confdialog.fl b/src/dialogs/confdialog.fl
index d63402ea..993e21ac 100644
--- a/src/dialogs/confdialog.fl
+++ b/src/dialogs/confdialog.fl
@@ -692,7 +692,7 @@ behaves inside the waterfall} xywh {15 196 150 22} down_box BORDER_BOX align 8
         } {
           Fl_Group tabCW {
             label CW open
-            xywh {0 50 500 320}
+            xywh {0 50 500 320} hide
           } {
             Fl_Tabs tabsCW {open
               xywh {0 50 500 320} selection_color 50
@@ -1210,7 +1210,7 @@ progdefaults.changed = true;} open
           }
           Fl_Group tabRTTY {
             label RTTY open
-            xywh {0 50 500 320} hide
+            xywh {0 50 500 320}
           } {
             Fl_Group {} {open
               xywh {5 60 490 270} box ENGRAVED_FRAME
@@ -1337,7 +1337,7 @@ progdefaults.changed = true;}
               Fl_Value_Slider sldrRTTYbandwidth {
                 label {Receive filter bandwidth}
                 callback {progdefaults.RTTY_BW = o->value();}
-                tooltip {Adjust the DSP bandwidth} xywh {100 295 300 20} type Horizontal align 5 minimum 50 maximum 1000 step 5 value 400 textsize 14
+                tooltip {Adjust the DSP bandwidth} xywh {100 295 300 20} type Horizontal align 5 minimum 50 maximum 1200 step 5 value 400 textsize 14
                 code0 {o->value(progdefaults.RTTY_BW);}
               }
             }
diff --git a/src/logbook/logsupport.cxx b/src/logbook/logsupport.cxx
index bea1b44f..1f33ad81 100644
--- a/src/logbook/logsupport.cxx
+++ b/src/logbook/logsupport.cxx
@@ -580,7 +580,7 @@ void AddRecord ()
 	inpRstS_log->value (inpRstOut->value());
 	{
 		char Mhz[30];
-		snprintf(Mhz, sizeof(Mhz), "%10f", atof(inpFreq->value()) / 1000.0);
+		snprintf(Mhz, sizeof(Mhz), "%-10f", atof(inpFreq->value()) / 1000.0);
 		inpFreq_log->value(Mhz);
 	}		
 	inpMode_log->value (logmode);