mirror
/
dl-fldigi
kopia lustrzana https://github.com/jamescoxon/dl-fldigi
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

reinserted slider to control RTTY rx bandwidth - in progress have removed ability to pre-set bandwidth as baud * 2. Will also remember previous bandwidth

pull/1/head
James Coxon 2013-12-08 09:55:06 +00:00
rodzic a2002acfd8
commit da0426d7ea
4 zmienionych plików z 58 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
src/cw_rtty/rtty.cxx
Wyświetl plik

@ -236,7 +236,10 @@ void rtty::restart()
symbollen = (int) (samplerate / rtty_baud + 0.5);
set_bandwidth(shift);
rtty_BW = progdefaults.RTTY_BW = rtty_baud * 2;
rtty_BW = progdefaults.RTTY_BW;
//rtty_BW = progdefaults.RTTY_BW = rtty_baud * 2;
wf->redraw_marker();

37
src/dialogs/confdialog.cxx
Wyświetl plik

@ -2933,6 +2933,14 @@ if (o->value()) {
};
}
Fl_Value_Slider2 *sldrRTTYbandwidth=(Fl_Value_Slider2 *)0;
static void cb_sldrRTTYbandwidth(Fl_Value_Slider2* o, void*) {
progdefaults.RTTY_BW = o->value();
resetRTTY();
progdefaults.changed = true;
}
Fl_Check_Button *btnSynopAdifDecoding=(Fl_Check_Button *)0;
static void cb_btnSynopAdifDecoding(Fl_Check_Button* o, void*) {
@ -5229,7 +5237,7 @@ Fl_Double_Window* ConfigureDialog() {
o->selection_color((Fl_Color)51);
o->labelsize(18);
o->align(Fl_Align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE));
{ tabsConfigure = new Fl_Tabs(-5, 0, 600, 374);
{ tabsConfigure = new Fl_Tabs(-5, 0, 600, 375);
tabsConfigure->color(FL_LIGHT1);
tabsConfigure->selection_color(FL_LIGHT1);
{ tabOperator = new Fl_Group(0, 25, 540, 345, _("Operator"));
@ -6733,7 +6741,6 @@ ab and newline are automatically included."));
tabWaterfall->end();
} // Fl_Group* tabWaterfall
{ tabModems = new Fl_Group(0, 25, 595, 347, _("Modems"));
tabModems->hide();
{ tabsModems = new Fl_Tabs(0, 25, 540, 347);
tabsModems->selection_color(FL_LIGHT1);
tabsModems->align(Fl_Align(FL_ALIGN_TOP_RIGHT));
@ -7713,6 +7720,7 @@ ab and newline are automatically included."));
tabsRTTY->selection_color(FL_LIGHT1);
{ Fl_Group* o = new Fl_Group(0, 75, 540, 295, _("Rx"));
o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
o->hide();
{ Fl_Group* o = new Fl_Group(2, 82, 535, 70, _("Receive"));
o->box(FL_ENGRAVED_FRAME);
o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
@ -7804,7 +7812,6 @@ ency"));
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 75, 540, 295, _("Tx"));
o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
o->hide();
{ Fl_Choice* o = selShift = new Fl_Choice(35, 104, 100, 20, _("Carrier shift"));
selShift->tooltip(_("Select carrier shift"));
selShift->down_box(FL_BORDER_BOX);
@ -7908,6 +7915,27 @@ ency"));
chkPseudoFSK->callback((Fl_Callback*)cb_chkPseudoFSK);
o->value(progdefaults.PseudoFSK);
} // Fl_Check_Button* chkPseudoFSK
{ Fl_Value_Slider2* o = sldrRTTYbandwidth = new Fl_Value_Slider2(35, 320, 335, 20, _("Filter bandwidth"));
sldrRTTYbandwidth->tooltip(_("RTTY filter bandwidth"));
sldrRTTYbandwidth->type(1);
sldrRTTYbandwidth->box(FL_DOWN_BOX);
sldrRTTYbandwidth->color(FL_BACKGROUND_COLOR);
sldrRTTYbandwidth->selection_color(FL_BACKGROUND_COLOR);
sldrRTTYbandwidth->labeltype(FL_NORMAL_LABEL);
sldrRTTYbandwidth->labelfont(0);
sldrRTTYbandwidth->labelsize(14);
sldrRTTYbandwidth->labelcolor(FL_FOREGROUND_COLOR);
sldrRTTYbandwidth->minimum(10);
sldrRTTYbandwidth->maximum(1000);
sldrRTTYbandwidth->step(1);
sldrRTTYbandwidth->value(100);
sldrRTTYbandwidth->textsize(14);
sldrRTTYbandwidth->callback((Fl_Callback*)cb_sldrRTTYbandwidth);
sldrRTTYbandwidth->align(Fl_Align(FL_ALIGN_TOP_LEFT));
sldrRTTYbandwidth->when(FL_WHEN_CHANGED);
o->value(progdefaults.RTTY_BW);
o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE);
} // Fl_Value_Slider2* sldrRTTYbandwidth
o->end();
} // Fl_Group* o
{ Fl_Group* o = new Fl_Group(0, 75, 540, 295, _("Synop"));
@ -9948,7 +9976,6 @@ and restarted if needed."));
tabDL->hide();
{ tabsDL = new Fl_Tabs(0, 25, 540, 348);
{ tabDLEnable = new Fl_Group(0, 50, 540, 320, _("Enable"));
tabDLEnable->hide();
{ Fl_Group* o = new Fl_Group(5, 59, 530, 76, _("habitat"));
o->box(FL_ENGRAVED_FRAME);
o->align(Fl_Align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE));
@ -10174,6 +10201,7 @@ and restarted if needed."));
tabDLFlights->end();
} // Fl_Group* tabDLFlights
{ tabDLPayloads = new Fl_Group(0, 50, 540, 323, _("All payloads (testing)"));
tabDLPayloads->hide();
{ Fl_Browser* o = payload_browser = new Fl_Browser(5, 60, 530, 225);
payload_browser->type(2);
payload_browser->callback((Fl_Callback*)cb_payload_browser);
@ -10210,6 +10238,7 @@ and restarted if needed."));
tabAutoStart->tooltip(_("Operator information"));
tabAutoStart->callback((Fl_Callback*)cb_tabAutoStart);
tabAutoStart->when(FL_WHEN_CHANGED);
tabAutoStart->hide();
{ Fl_Group* o = new Fl_Group(2, 32, 536, 336, _("Auto start programs with fldigi"));
o->box(FL_ENGRAVED_BOX);
o->align(Fl_Align(FL_ALIGN_TOP|FL_ALIGN_INSIDE));

30
src/dialogs/confdialog.fl
Wyświetl plik

@ -307,7 +307,7 @@ static const char szProsigns[] = "~|%|&|+|=|{|}|<|>|[|]| ";} {}
xywh {627 44 553 402} type Double color 45 selection_color 51 labelsize 18 align 80 non_modal visible
} {
Fl_Tabs tabsConfigure {open
xywh {-5 0 600 374} color 50 selection_color 50
xywh {-5 0 600 375} color 50 selection_color 50
} {
Fl_Group tabOperator {
label Operator
@ -2550,7 +2550,7 @@ behaves inside the waterfall} xywh {34 207 150 22} down_box BORDER_BOX align 8
}
Fl_Group tabModems {
label Modems open
xywh {0 25 595 347} hide
xywh {0 25 595 347}
} {
Fl_Tabs tabsModems {open
xywh {0 25 540 347} selection_color 50 align 9
@ -3407,7 +3407,7 @@ progdefaults.changed = true;}
}
}
Fl_Group tabRTTY {
label RTTY
label RTTY open
xywh {0 50 540 320}
} {
Fl_Tabs tabsRTTY {open
@ -3415,7 +3415,7 @@ progdefaults.changed = true;}
} {
Fl_Group {} {
label Rx open
xywh {0 75 540 295} align 5
xywh {0 75 540 295} align 5 hide
} {
Fl_Group {} {
label Receive open
@ -3532,8 +3532,8 @@ progdefaults.changed = true;
}
}
Fl_Group {} {
label Tx
xywh {0 75 540 295} align 5 hide
label Tx open
xywh {0 75 540 295} align 5
} {
Fl_Choice selShift {
label {Carrier shift}
@ -3641,6 +3641,16 @@ if (o->value()) {
tooltip {Create keyed square wave on right audio channel} xywh {286 202 212 22} down_box DOWN_BOX
code0 {o->value(progdefaults.PseudoFSK);}
}
Fl_Value_Slider sldrRTTYbandwidth {
label {Filter bandwidth}
callback {progdefaults.RTTY_BW = o->value();
resetRTTY();
progdefaults.changed = true;} selected
tooltip {RTTY filter bandwidth} xywh {35 320 335 20} type Horizontal align 5 minimum 10 maximum 1000 step 1 value 100 textsize 14
code0 {o->value(progdefaults.RTTY_BW);}
code1 {o->labelsize(FL_NORMAL_SIZE); o->textsize(FL_NORMAL_SIZE);}
class Fl_Value_Slider2
}
}
Fl_Group {} {
label Synop open
@ -5833,7 +5843,7 @@ progdefaults.changed = true;}
} {
Fl_Group tabDLEnable {
label Enable open
xywh {0 50 540 320} hide
xywh {0 50 540 320}
} {
Fl_Group {} {
label habitat open
@ -6140,7 +6150,7 @@ dl_fldigi::hbtint::uthr->payloads();}
}
Fl_Group tabDLPayloads {
label {All payloads (testing)} open
xywh {0 50 540 323}
xywh {0 50 540 323} hide
} {
Fl_Browser payload_browser {
callback {flight_browser->deselect();
@ -6191,8 +6201,8 @@ dl_fldigi::hbtint::uthr->payloads();}
}
Fl_Group tabAutoStart {
label Autostart
callback {progdefaults.changed = true;} open selected
tooltip {Operator information} xywh {0 25 540 345} when 1
callback {progdefaults.changed = true;} open
tooltip {Operator information} xywh {0 25 540 345} when 1 hide
} {
Fl_Group {} {
label {Auto start programs with fldigi} open

1
src/dialogs/confdialog.h
Wyświetl plik

@ -340,6 +340,7 @@ extern Fl_Counter2 *cntrAUTOCRLF;
extern Fl_Check_Button *btnCRCRLF;
extern Fl_Check_Button *chkUOStx;
extern Fl_Check_Button *chkPseudoFSK;
extern Fl_Value_Slider2 *sldrRTTYbandwidth;
extern Fl_Check_Button *btnSynopAdifDecoding;
extern Fl_Check_Button *btnSynopKmlDecoding;
extern Fl_Check_Button *btnSynopInterleaved;