Group all flags in a single file

This makes easier to document and to add new ones.
Shortened version of common files have been added:
-c for -config_file
-s for -signal_source

src/algorithms/signal_source/adapters/file_signal_source.cc

@@ -35,18 +35,16 @@
 #include <fstream>
 #include <iomanip>
 #include <exception>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
-#include "gnss_sdr_valve.h"
 #include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
+
+
 
 using google::LogMessage;
 
 
-DEFINE_string(signal_source, "-",
-        "If defined, path to the file containing the signal samples (overrides the configuration file)");
-
-
 FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
         std::string role, unsigned int in_streams, unsigned int out_streams,
         boost::shared_ptr<gr::msg_queue> queue) :
@@ -64,6 +62,7 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
 
     // override value with commandline flag, if present
     if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source;
+    if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s;
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     repeat_ = configuration->property(role + ".repeat", false);

src/algorithms/signal_source/adapters/gn3s_signal_source.cc

@@ -31,7 +31,6 @@
 #include "gn3s_signal_source.h"
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gn3s/gn3s_source_cc.h>
 #include "configuration_interface.h"

src/algorithms/signal_source/adapters/nsr_file_signal_source.cc

@@ -35,17 +35,14 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
-#include "gnss_sdr_valve.h"
 #include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
 
 
 using google::LogMessage;
 
-DEFINE_string(nsr_signal_source, "-",
-        "If defined, path to the file containing the NSR (byte to 2-bit packed) signal samples (overrides the configuration file)");
-
 
 NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration,
         std::string role, unsigned int in_streams, unsigned int out_streams,
@@ -61,7 +58,8 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration,
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    if (FLAGS_nsr_signal_source.compare("-") != 0) filename_= FLAGS_nsr_signal_source;
+    if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source;
+    if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s;
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     repeat_ = configuration->property(role + ".repeat", false);

src/algorithms/signal_source/adapters/spir_file_signal_source.cc

@@ -34,17 +34,14 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
-#include "gnss_sdr_valve.h"
 #include "configuration_interface.h"
+#include "gnss_sdr_flags.h"
+#include "gnss_sdr_valve.h"
 
 
 using google::LogMessage;
 
-DEFINE_string(spir_signal_source, "-",
-        "If defined, path to the file containing the NSR (byte to 2-bit packed) signal samples (overrides the configuration file)");
-
 
 SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration,
         std::string role, unsigned int in_streams, unsigned int out_streams,
@@ -60,7 +57,8 @@ SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    if (FLAGS_spir_signal_source.compare("-") != 0) filename_= FLAGS_spir_signal_source;
+    if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source;
+    if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s;
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     repeat_ = configuration->property(role + ".repeat", false);

src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc

@@ -34,8 +34,8 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
+#include "gnss_sdr_flags.h"
 #include "gnss_sdr_valve.h"
 #include "configuration_interface.h"
 
@@ -57,7 +57,8 @@ TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource(ConfigurationInterface* con
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    //if (FLAGS_nsr_signal_source.compare("-") != 0) filename_= FLAGS_nsr_signal_source;
+    if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source;
+    if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s;
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     repeat_ = configuration->property(role + ".repeat", false);

src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc

@@ -35,11 +35,12 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
+#include <gnuradio/blocks/char_to_float.h>
+#include "gnss_sdr_flags.h"
 #include "gnss_sdr_valve.h"
 #include "configuration_interface.h"
-#include <gnuradio/blocks/char_to_float.h>
+
 
 
 using google::LogMessage;
@@ -61,7 +62,8 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    //if (FLAGS_nsr_signal_source.compare("-") != 0) filename_= FLAGS_nsr_signal_source;
+    if (FLAGS_signal_source.compare("-") != 0) filename_= FLAGS_signal_source;
+    if (FLAGS_s.compare("-") != 0) filename_= FLAGS_s;
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     big_endian_items_ = configuration->property(role + ".big_endian_items", true);