kopia lustrzana https://github.com/jamescoxon/dl-fldigi
added in a input box into the dl-tab to allow you to change the directory that the waterfall png is saved. By default it goes into the directory that dl-fldigi was executed in. Also as its the full filename allows you to adjust the png filename.
James Coxon
rodzic
f0f7789dec
commit
73dce4074b
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/perl
|
||||
#!/opt/local/bin/perl
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# fldigi-shell version 0.36
|
||||
|
|
@ -337,7 +337,7 @@ sub pskrep_qsy
|
|||
|
||||
################################################################################
|
||||
|
||||
%opts = ( "c" => "", "d" => 0, "u" => "http://localhost:7362/RPC2" );
|
||||
%opts = ( "c" => "", "d" => 0, "u" => "http://localhost:7236/RPC2" );
|
||||
|
||||
%commands = (
|
||||
"debug" => [ "n:n", "Toggle debugging output", sub { $debug = (@_ ? $_[0] : !$debug); } ],
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
# data file for the Fltk User Interface Designer (fluid)
|
||||
version 1.0109
|
||||
version 1.0110
|
||||
i18n_type 1
|
||||
i18n_include "gettext.h"
|
||||
i18n_function _
|
||||
|
|
@ -98,7 +98,7 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
|
|||
xywh {635 224 500 400} type Double color 45 selection_color 51 labelsize 18 align 80 visible
|
||||
} {
|
||||
Fl_Tabs tabsConfigure {open
|
||||
xywh {-3 0 520 372} color 50 selection_color 50
|
||||
xywh {-3 0 520 375} color 50 selection_color 50
|
||||
} {
|
||||
Fl_Group tabOperator {
|
||||
label Operator
|
||||
|
|
@ -1248,7 +1248,7 @@ progdefaults.changed = true;}
|
|||
label {Transmit width}
|
||||
callback {progdefaults.HellXmtWidth=(int)o->value();
|
||||
progdefaults.changed = true;}
|
||||
tooltip {\# of multiple scans / character line} xywh {15 100 40 20} align 8 maximum 3 value 1
|
||||
tooltip {\# of multiple scans / character line} xywh {15 100 40 20} align 8 maximum 3
|
||||
code0 {o->value(progdefaults.HellXmtWidth);}
|
||||
code1 {o->labelsize(FL_NORMAL_SIZE);}
|
||||
class Fl_Spinner2
|
||||
|
|
@ -1556,7 +1556,7 @@ OFF - Clear & restart} xywh {212 125 165 20} down_box DOWN_BOX
|
|||
label Channels
|
||||
callback {progdefaults.VIEWERchannels = (int)(o->value());
|
||||
initViewer();}
|
||||
tooltip {Change \# of psk viewer channels} xywh {15 95 50 20} align 8 value 1
|
||||
tooltip {Change \# of psk viewer channels} xywh {15 95 50 20} align 8
|
||||
code0 {o->minimum(5); o->maximum(30); o->step(1);}
|
||||
code1 {o->value(progdefaults.VIEWERchannels);}
|
||||
code2 {o->labelsize(FL_NORMAL_SIZE);}
|
||||
|
|
@ -1567,7 +1567,7 @@ initViewer();}
|
|||
callback {progdefaults.VIEWERstart = (int)(o->value());
|
||||
progdefaults.changed = true;
|
||||
initViewer();}
|
||||
tooltip {Start decoding at this frequency} xywh {15 125 50 20} align 8 value 1
|
||||
tooltip {Start decoding at this frequency} xywh {15 125 50 20} align 8
|
||||
code0 {o->minimum(200); o->maximum(1000); o->step(100);}
|
||||
code1 {o->value(progdefaults.VIEWERstart);}
|
||||
code2 {o->labelsize(FL_NORMAL_SIZE);}
|
||||
|
|
@ -1578,7 +1578,7 @@ initViewer();}
|
|||
callback {progdefaults.VIEWERtimeout = (int)(o->value());
|
||||
progdefaults.changed = true;}
|
||||
tooltip {Clear channel text after
|
||||
\# seconds of inactivity} xywh {212 95 50 20} align 8 value 1
|
||||
\# seconds of inactivity} xywh {212 95 50 20} align 8
|
||||
code0 {o->minimum(1); o->maximum(180); o->step(1);}
|
||||
code1 {o->value(progdefaults.VIEWERtimeout);}
|
||||
code2 {o->labelsize(FL_NORMAL_SIZE);}
|
||||
|
|
@ -2543,7 +2543,7 @@ o->tooltip(src_get_description(sample_rate_converters[o->value()]));} open
|
|||
label {RX ppm}
|
||||
callback {progdefaults.RX_corr = (int)o->value();
|
||||
progdefaults.changed = true;}
|
||||
tooltip {RX sound card correction} xywh {15 180 85 20} align 8 value 1
|
||||
tooltip {RX sound card correction} xywh {15 180 85 20} align 8
|
||||
code0 {o->step(1);}
|
||||
code1 {o->minimum(-50000);}
|
||||
code2 {o->maximum(50000);}
|
||||
|
|
@ -2554,7 +2554,7 @@ progdefaults.changed = true;}
|
|||
label {TX ppm}
|
||||
callback {progdefaults.TX_corr = (int)o->value();
|
||||
progdefaults.changed = true;}
|
||||
tooltip {TX sound card correction} xywh {176 180 85 20} align 8 value 1
|
||||
tooltip {TX sound card correction} xywh {176 180 85 20} align 8
|
||||
code0 {o->step(1);}
|
||||
code1 {o->minimum(-50000);}
|
||||
code2 {o->maximum(50000);}
|
||||
|
|
@ -2565,7 +2565,7 @@ progdefaults.changed = true;}
|
|||
label {TX offset}
|
||||
callback {progdefaults.TxOffset = (int)o->value();
|
||||
progdefaults.changed = true;}
|
||||
tooltip {Difference between Rx & Tx freq (rig offset)} xywh {338 180 85 20} align 8 value 1
|
||||
tooltip {Difference between Rx & Tx freq (rig offset)} xywh {338 180 85 20} align 8
|
||||
code0 {o->value(progdefaults.TxOffset);}
|
||||
code1 {o->step(1);}
|
||||
code2 {o->minimum(-50); o->maximum(50);}
|
||||
|
|
@ -3237,8 +3237,8 @@ progdefaults.changed = true;}
|
|||
xywh {0 25 500 350}
|
||||
} {
|
||||
Fl_Group tabDLEnable {
|
||||
label Enable open selected
|
||||
xywh {0 50 500 320}
|
||||
label Enable open
|
||||
xywh {0 50 500 320} hide
|
||||
} {
|
||||
Fl_Group {} {
|
||||
label Enable open
|
||||
|
|
@ -3397,6 +3397,23 @@ progdefaults.changed = true;}
|
|||
}
|
||||
}
|
||||
}
|
||||
Fl_Group {} {
|
||||
label Remote open
|
||||
xywh {5 55 492 105}
|
||||
} {
|
||||
Fl_Group {} {
|
||||
label {Waterfall PNG} open
|
||||
xywh {5 55 492 105} box ENGRAVED_FRAME align 21
|
||||
} {
|
||||
Fl_Input {} {
|
||||
label {Location:}
|
||||
callback {progdefaults.waterfall_png_location = o->value();
|
||||
progdefaults.changed = true;} selected
|
||||
xywh {101 82 330 20} labelsize 12 textsize 12
|
||||
code0 {o->value(progdefaults.waterfall_png_location.c_str());}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1142,6 +1142,7 @@
|
|||
ELEM_(int, gpsSpeed, "GPSSPEED", "", 4800) \
|
||||
/* Config stuff */ \
|
||||
ELEM_(int, png_wfall, "PNG_WFALL", "", 0) \
|
||||
ELEM_(std::string, waterfall_png_location, "PNG_WFALL_LOC", "Save location for PNG", "dl-fldigi-waterfall.png") \
|
||||
ELEM_(bool, dl_online, "", "", false) \
|
||||
ELEM_(std::string, ssdv_packet_url, "SSDV_BLOCK_URL", "Remote URL", "http://www.sanslogic.co.uk/hadie/live.php") \
|
||||
ELEM_(std::string, ssdv_block_user, "SSDV_BLOCK_USER", "Username for remote URL", "") \
|
||||
|
|
|
|||
|
|
@ -865,7 +865,8 @@ void WFdisp::drawcolorWF() {
|
|||
{
|
||||
if (progdefaults.png_wfall == 1)
|
||||
{
|
||||
fp = fopen("dl-fldigi-waterfall.png", "w");
|
||||
const char * pngfilename = progdefaults.waterfall_png_location.c_str();
|
||||
fp = fopen(pngfilename, "w");
|
||||
if (fp == NULL)
|
||||
{
|
||||
perror("waterfall export fopen");
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue