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

RTTY MARK coloring 

* Added configurable item to modify color of RTTY mark
    waterfall track line
pull/2/head
David Freese 2011-07-24 15:34:09 -05:00
rodzic 836c082106
commit 5e5059778a
5 zmienionych plików z 54 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1644,6 +1644,20 @@ static void cb_chk_useMARKfreq(Fl_Check_Button* o, void*) {
progdefaults.changed = true;
}
Fl_Button *btnRTTY_mark_color=(Fl_Button *)0;
static void cb_btnRTTY_mark_color(Fl_Button* o, void*) {
if (fl_color_chooser("MARK freq track",
progdefaults.rttymarkRGBI.R,
progdefaults.rttymarkRGBI.G,
progdefaults.rttymarkRGBI.B) ) {
o->color(fl_rgb_color(progdefaults.rttymarkRGBI.R,progdefaults.rttymarkRGBI.G,progdefaults.rttymarkRGBI.B));
o->redraw();
wf->redraw_marker();
progdefaults.changed = true;
};
}
Fl_Check_Button *btnPreferXhairScope=(Fl_Check_Button *)0;
static void cb_btnPreferXhairScope(Fl_Check_Button* o, void*) {
@ -4961,12 +4975,19 @@ an merging"));
{ Fl_Group* o = new Fl_Group(259, 187, 231, 52, _("Log RTTY frequency"));
o->box(FL_ENGRAVED_FRAME);
o->align(FL_ALIGN_TOP_LEFT|FL_ALIGN_INSIDE);
{ Fl_Check_Button* o = chk_useMARKfreq = new Fl_Check_Button(308, 205, 63, 26, _("Use MARK freq\'"));
{ Fl_Check_Button* o = chk_useMARKfreq = new Fl_Check_Button(269, 205, 63, 26, _("Use MARK freq\'"));
chk_useMARKfreq->tooltip(_("Revert to Unsifted char\'s on a space"));
chk_useMARKfreq->down_box(FL_DOWN_BOX);
chk_useMARKfreq->callback((Fl_Callback*)cb_chk_useMARKfreq);
o->value(progdefaults.useMARKfreq);
} // Fl_Check_Button* chk_useMARKfreq
{ Fl_Button* o = btnRTTY_mark_color = new Fl_Button(403, 208, 18, 18, _("track clr"));
btnRTTY_mark_color->tooltip(_("Change color"));
btnRTTY_mark_color->color((Fl_Color)2);
btnRTTY_mark_color->callback((Fl_Callback*)cb_btnRTTY_mark_color);
btnRTTY_mark_color->align(FL_ALIGN_RIGHT);
o->color(fl_rgb_color(progdefaults.rttymarkRGBI.R,progdefaults.rttymarkRGBI.G,progdefaults.rttymarkRGBI.B));
} // Fl_Button* btnRTTY_mark_color
o->end();
} // Fl_Group* o
{ Fl_Check_Button* o = btnPreferXhairScope = new Fl_Check_Button(15, 254, 165, 20, _("Use cross hair scope"));

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

@ -2129,10 +2129,24 @@ progdefaults.changed = true;}
Fl_Check_Button chk_useMARKfreq {
label {Use MARK freq'}
callback {progdefaults.useMARKfreq=o->value();
progdefaults.changed = true;} selected
tooltip {Revert to Unsifted char's on a space} xywh {308 205 63 26} down_box DOWN_BOX
progdefaults.changed = true;}
tooltip {Revert to Unsifted char's on a space} xywh {269 205 63 26} down_box DOWN_BOX
code0 {o->value(progdefaults.useMARKfreq);}
}
Fl_Button btnRTTY_mark_color {
label {track clr}
callback {if (fl_color_chooser("MARK freq track",
progdefaults.rttymarkRGBI.R,
progdefaults.rttymarkRGBI.G,
progdefaults.rttymarkRGBI.B) ) {
o->color(fl_rgb_color(progdefaults.rttymarkRGBI.R,progdefaults.rttymarkRGBI.G,progdefaults.rttymarkRGBI.B));
o->redraw();
wf->redraw_marker();
progdefaults.changed = true;
}} selected
tooltip {Change color} xywh {403 208 18 18} color 2 align 8
code0 {o->color(fl_rgb_color(progdefaults.rttymarkRGBI.R,progdefaults.rttymarkRGBI.G,progdefaults.rttymarkRGBI.B));}
}
}
Fl_Check_Button btnPreferXhairScope {
label {Use cross hair scope}

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

@ -227,6 +227,7 @@ extern Fl_Counter2 *cntrAUTOCRLF;
extern Fl_Check_Button *chkUOSrx;
extern Fl_Check_Button *chkUOStx;
extern Fl_Check_Button *chk_useMARKfreq;
extern Fl_Button *btnRTTY_mark_color;
extern Fl_Check_Button *btnPreferXhairScope;
extern Fl_Check_Button *chkPseudoFSK;
extern Fl_Choice *mnuRTTYAFCSpeed;

3
src/include/configuration.h
Wyświetl plik

@ -529,6 +529,9 @@
ELEM_(RGBI, bwTrackRGBI, "BWTCOLORS", \
"Color of bandwidth marker (RGBI)", \
{255, 0, 0, 255}) \
ELEM_(RGBI, rttymarkRGBI, "RTTYMARKRGBI", \
"Color of RTTY MARK freq marker (RGBI)", \
{255, 128, 0, 255}) \
ELEM_(int, feldfontnbr, "FELDFONTNBR", \
"Index of raster font used for transmission", \
4) \

13
src/waterfall/waterfall.cxx
Wyświetl plik

@ -851,7 +851,18 @@ void WFdisp::update_waterfall() {
pos2--;
if (likely(pos1 >= fft_img && pos2 < fft_img + disp_width)) {
for (int y = 0; y < image_height; y ++) {
*pos1 = *pos2 = progdefaults.bwTrackRGBI;
if (mode == MODE_RTTY && progdefaults.useMARKfreq) {
if (active_modem->get_reverse()) {
*pos1 = progdefaults.rttymarkRGBI;
*pos2 = progdefaults.bwTrackRGBI;
} else {
*pos1 = progdefaults.bwTrackRGBI;
*pos2 = progdefaults.rttymarkRGBI;
}
} else {
*pos1 = progdefaults.bwTrackRGBI;
*pos2 = progdefaults.bwTrackRGBI;
}
pos1 += disp_width;
pos2 += disp_width;
}