sebastian
/
gr-satnogs
mirror of https://gitlab.com/LongHairedHacker/gr-satnogs.git
1
0
Fork 0
Code Issues Releases Wiki Activity

NOAA sink fix 

* Remove completely the .png extension. satnogs-client will handle the
rest.
* Fix enumeration on the NOAA sink xml
This commit is contained in:
Manolis Surligas 2017-09-20 17:18:59 +03:00
parent 93025a1d83
commit 62cdbf7e51
2 changed files with 8 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grc/satnogs_noaa_apt_sink.xml
View File

@ -44,11 +44,11 @@
<type>bool</type> <type>bool</type>
<option> <option>
<name>Yes</name> <name>Yes</name>
<key>False</key> <key>True</key>
</option> </option>
<option> <option>
<name>No</name> <name>No</name>
<key>True</key> <key>False</key>
</option> </option>
</param> </param>
<param> <param>

49
lib/noaa_apt_sink_impl.cc
View File

@ -93,7 +93,6 @@ namespace gr
noaa_apt_sink_impl::init_png () noaa_apt_sink_impl::init_png ()
{ {
std::string fn (d_filename_png); std::string fn (d_filename_png);
fn.append(".png");
if (d_split) { if (d_split) {
d_images_per_frame = 2; d_images_per_frame = 2;
d_png_fd = new FILE*[2]; d_png_fd = new FILE*[2];
@ -101,42 +100,13 @@ namespace gr
d_info_ptr = new png_infop[2]; d_info_ptr = new png_infop[2];
std::string fn_left = fn; std::string fn_left = fn;
std::string fn_right = fn; std::string fn_right = fn;
std::size_t found = fn.find_last_of (".");
if (d_num_images == 0) { if (d_num_images == 0) {
if (found == std::string::npos) { fn_left.append ("_left");
fn_left.append ("_left"); fn_right.append ("_right");
fn_right.append ("_right");
}
else {
std::size_t found_dir = fn.substr (found).find ("/");
if (found_dir == std::string::npos) {
fn_left.insert (found, "_left");
fn_right.insert (found, "_right");
}
else {
fn_left.append ("_left");
fn_right.append ("_right");
}
}
} }
else { else {
if (found == std::string::npos) { fn_left.append (std::to_string (d_num_images).append ("_left"));
fn_left.append (std::to_string (d_num_images).append ("_left")); fn_right.append (std::to_string (d_num_images).append ("_right"));
fn_right.append (std::to_string (d_num_images).append ("_right"));
}
else {
std::size_t found_dir = fn.substr (found).find ("/");
if (found_dir == std::string::npos) {
fn_left.insert (found,
std::to_string (d_num_images).append ("_left"));
fn_right.insert (found,
std::to_string (d_num_images).append ("_right"));
}
else {
fn_left.append (std::to_string (d_num_images).append ("_left"));
fn_right.append (std::to_string (d_num_images).append ("_right"));
}
}
} }
d_png_fn[0] = fn_left; d_png_fn[0] = fn_left;
d_png_fn[1] = fn_right; d_png_fn[1] = fn_right;
@ -164,17 +134,10 @@ namespace gr
d_info_ptr = new png_infop[2]; d_info_ptr = new png_infop[2];
if (d_num_images == 0) { if (d_num_images == 0) {
d_png_fd[0] = fopen (fn.c_str (), "wb"); d_png_fd[0] = fopen (fn.c_str (), "wb");
d_png_fn[0] = fn;//std::string (d_filename_png); d_png_fn[0] = fn;
} }
else { else {
//std::string fn (d_filename_png); fn.append (std::to_string (d_num_images));
std::size_t found = fn.find (".");
if (found == std::string::npos) {
fn.append (std::to_string (d_num_images));
}
else {
fn.insert (found, std::to_string (d_num_images));
}
d_png_fd[0] = fopen (fn.c_str (), "wb"); d_png_fd[0] = fopen (fn.c_str (), "wb");
d_png_fn[0] = fn; d_png_fn[0] = fn;
} }