diff options
63 files changed, 783 insertions, 771 deletions
diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h index eba12e2635..a92a33a897 100644 --- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h @@ -193,18 +193,18 @@ public slots: virtual void setAxisLabels(bool en); virtual void setYaxis(double min, double max); virtual void setXaxis(double min, double max); - virtual void setLineLabel(int which, QString label); - virtual QString getLineLabel(int which); - virtual void setLineColor(int which, QColor color); - virtual QColor getLineColor(int which) const; - virtual void setLineWidth(int which, int width); - virtual int getLineWidth(int which) const; - virtual void setLineStyle(int which, Qt::PenStyle style); - virtual const Qt::PenStyle getLineStyle(int which) const; - virtual void setLineMarker(int which, QwtSymbol::Style marker); - virtual const QwtSymbol::Style getLineMarker(int which) const; - virtual void setMarkerAlpha(int which, int alpha); - virtual int getMarkerAlpha(int which) const; + virtual void setLineLabel(unsigned int which, QString label); + virtual QString getLineLabel(unsigned int which); + virtual void setLineColor(unsigned int which, QColor color); + virtual QColor getLineColor(unsigned int which) const; + virtual void setLineWidth(unsigned int which, int width); + virtual int getLineWidth(unsigned int which) const; + virtual void setLineStyle(unsigned int which, Qt::PenStyle style); + virtual const Qt::PenStyle getLineStyle(unsigned int which) const; + virtual void setLineMarker(unsigned int which, QwtSymbol::Style marker); + virtual const QwtSymbol::Style getLineMarker(unsigned int which) const; + virtual void setMarkerAlpha(unsigned int which, int alpha); + virtual int getMarkerAlpha(unsigned int which) const; // Need a function for each curve for setting via stylesheet. // Can't use preprocessor directives because we're inside a Q_OBJECT. @@ -283,7 +283,7 @@ protected slots: virtual void legendEntryChecked(const QVariant &plotItem, bool on, int index); protected: - int d_nplots; + unsigned int d_nplots; std::vector<QwtPlotCurve*> d_plot_curve; QwtPlotPanner* d_panner; diff --git a/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h index c7d1b3b006..cb032cad71 100644 --- a/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/HistogramDisplayPlot.h @@ -37,11 +37,11 @@ class HistogramDisplayPlot: public DisplayPlot Q_OBJECT public: - HistogramDisplayPlot(int nplots, QWidget*); + HistogramDisplayPlot(unsigned int nplots, QWidget*); virtual ~HistogramDisplayPlot(); void plotNewData(const std::vector<double*> dataPoints, - const int64_t numDataPoints, const double timeInterval); + const uint64_t numDataPoints, const double timeInterval); void replot(); @@ -53,11 +53,11 @@ public slots: void setAccumulate(bool en); bool getAccumulate() const; - void setMarkerAlpha(int which, int alpha); - int getMarkerAlpha(int which) const; - void setLineColor(int which, QColor color); + void setMarkerAlpha(unsigned int which, int alpha); + int getMarkerAlpha(unsigned int which) const; + void setLineColor(unsigned int which, QColor color); - void setNumBins(int bins); + void setNumBins(unsigned int bins); void setXaxis(double min, double max); void clear(); @@ -69,7 +69,7 @@ private: double* d_xdata; std::vector<double*> d_ydata; - int d_bins; + unsigned int d_bins; bool d_accum; double d_xmin, d_xmax, d_left, d_right; double d_width; diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h index 47fc0b3c69..a92b21eebd 100644 --- a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h @@ -72,7 +72,7 @@ public slots: void legendEntryChecked(QwtPlotItem *plotItem, bool on); void legendEntryChecked(const QVariant &plotItem, bool on, int index); - void enableTagMarker(int which, bool en); + void enableTagMarker(unsigned int which, bool en); void setYLabel(const std::string &label, const std::string &unit=""); diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h index 88a64a9910..da77d4b7c8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h @@ -60,39 +60,39 @@ public: void setNumRows(double rows); void setNumCols(double cols); - void setAlpha(int which, int alpha); + void setAlpha(unsigned int which, int alpha); void setSampleRate(double samprate); double numRows() const; double numCols() const; - int getAlpha(int which); + int getAlpha(unsigned int which); void setPlotDimensions(const double rows, const double cols, const double units, const std::string &strunits); void plotNewData(const std::vector<double*> dataPoints, - const int64_t numDataPoints); + const uint64_t numDataPoints); void plotNewData(const double* dataPoints, - const int64_t numDataPoints); + const uint64_t numDataPoints); void setIntensityRange(const double minIntensity, const double maxIntensity); void replot(void); - int getIntensityColorMapType(int) const; + int getIntensityColorMapType(unsigned int) const; int getIntensityColorMapType1() const; - void setIntensityColorMapType(const int, const int, const QColor, const QColor); + void setIntensityColorMapType(const unsigned int, const int, const QColor, const QColor); void setIntensityColorMapType1(int); int getColorMapTitleFontSize() const; void setColorMapTitleFontSize(int tfs); const QColor getUserDefinedLowIntensityColor() const; const QColor getUserDefinedHighIntensityColor() const; - double getMinIntensity(int which) const; - double getMaxIntensity(int which) const; + double getMinIntensity(unsigned int which) const; + double getMaxIntensity(unsigned int which) const; signals: void updatedLowerIntensityLevel(const double); diff --git a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h index e4db145517..e40f8c76d9 100644 --- a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h @@ -77,25 +77,25 @@ public: const int droppedFrames); void setIntensityRange(const double minIntensity, const double maxIntensity); - double getMinIntensity(int which) const; - double getMaxIntensity(int which) const; + double getMinIntensity(unsigned int which) const; + double getMaxIntensity(unsigned int which) const; void replot(void); void clearData(); - int getIntensityColorMapType(int) const; + int getIntensityColorMapType(unsigned int) const; int getIntensityColorMapType1() const; int getColorMapTitleFontSize() const; const QColor getUserDefinedLowIntensityColor() const; const QColor getUserDefinedHighIntensityColor() const; - int getAlpha(int which); - void setAlpha(int which, int alpha); + int getAlpha(unsigned int which); + void setAlpha(unsigned int which, int alpha); int getNumRows() const; public slots: - void setIntensityColorMapType(const int, const int, const QColor, const QColor); + void setIntensityColorMapType(const unsigned int, const int, const QColor, const QColor); void setIntensityColorMapType1(int); void setColorMapTitleFontSize(int tfs); void setUserDefinedLowIntensityColor(QColor); diff --git a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h index 1f10976441..ddbf2b8ff6 100644 --- a/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h @@ -60,21 +60,21 @@ namespace gr { virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &label) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, int style) = 0; - virtual void set_line_marker(int which, int marker) = 0; + virtual void set_line_label(unsigned int which, const std::string &label) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, int style) = 0; + virtual void set_line_marker(unsigned int which, int marker) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index 9905eb7690..b59a78f7f1 100644 --- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -89,13 +89,13 @@ namespace gr { virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &label) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, int style) = 0; - virtual void set_line_marker(int which, int marker) = 0; + virtual void set_line_label(unsigned int which, const std::string &label) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, int style) = 0; + virtual void set_line_marker(unsigned int which, int marker) = 0; virtual void set_nsamps(const int newsize) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; /*! * Set up a trigger for the sink to know when to start @@ -132,12 +132,12 @@ namespace gr { const std::string &tag_key="") = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h index 1da1383370..215f1889cf 100644 --- a/gr-qtgui/include/gnuradio/qtgui/displayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h @@ -62,20 +62,20 @@ public slots: void setUpdateTime(double t); void setTitle(const QString &title); - void setLineLabel(int which, const QString &label); - void setLineColor(int which, const QString &color); - void setLineWidth(int which, int width); - void setLineStyle(int which, Qt::PenStyle style); - void setLineMarker(int which, QwtSymbol::Style style); - void setMarkerAlpha(int which, int alpha); + void setLineLabel(unsigned int which, const QString &label); + void setLineColor(unsigned int which, const QString &color); + void setLineWidth(unsigned int which, int width); + void setLineStyle(unsigned int which, Qt::PenStyle style); + void setLineMarker(unsigned int which, QwtSymbol::Style style); + void setMarkerAlpha(unsigned int which, int alpha); QString title(); - QString lineLabel(int which); - QString lineColor(int which); - int lineWidth(int which); - Qt::PenStyle lineStyle(int which); - QwtSymbol::Style lineMarker(int which); - int markerAlpha(int which); + QString lineLabel(unsigned int which); + QString lineColor(unsigned int which); + int lineWidth(unsigned int which); + Qt::PenStyle lineStyle(unsigned int which); + QwtSymbol::Style lineMarker(unsigned int which); + int markerAlpha(unsigned int which); virtual void setSampleRate(const QString &rate); @@ -103,7 +103,7 @@ signals: protected: bool d_isclosed; - int d_nplots; + unsigned int d_nplots; QGridLayout *d_layout; DisplayPlot* d_display_plot; diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index 26c63c2d75..f4be98e5f6 100644 --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -43,7 +43,7 @@ class LineColorMenu: public QMenu Q_OBJECT public: - LineColorMenu(int which, QWidget *parent) + LineColorMenu(unsigned int which, QWidget *parent) : QMenu("Line Color", parent), d_which(which) { d_grp = new QActionGroup(this); @@ -91,16 +91,16 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("LineColorMenu::getAction: which out of range.\n"); } signals: - void whichTrigger(int which, const QString &name); + void whichTrigger(unsigned int which, const QString &name); public slots: void getBlue() { emit whichTrigger(d_which, "blue"); } @@ -131,7 +131,7 @@ class LineWidthMenu: public QMenu Q_OBJECT public: - LineWidthMenu(int which, QWidget *parent) + LineWidthMenu(unsigned int which, QWidget *parent) : QMenu("Line Width", parent), d_which(which) { d_grp = new QActionGroup(this); @@ -175,16 +175,16 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("LineWidthMenu::getAction: which out of range.\n"); } signals: - void whichTrigger(int which, int width); + void whichTrigger(unsigned int which, int width); public slots: void getOne() { emit whichTrigger(d_which, 1); } @@ -213,7 +213,7 @@ class LineStyleMenu: public QMenu Q_OBJECT public: - LineStyleMenu(int which, QWidget *parent) + LineStyleMenu(unsigned int which, QWidget *parent) : QMenu("Line Style", parent), d_which(which) { d_grp = new QActionGroup(this); @@ -249,16 +249,16 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("LineStyleMenu::getAction: which out of range.\n"); } signals: - void whichTrigger(int which, Qt::PenStyle); + void whichTrigger(unsigned int which, Qt::PenStyle); public slots: void getNone() { emit whichTrigger(d_which, Qt::NoPen); } @@ -283,7 +283,7 @@ class LineMarkerMenu: public QMenu Q_OBJECT public: - LineMarkerMenu(int which, QWidget *parent) + LineMarkerMenu(unsigned int which, QWidget *parent) : QMenu("Line Marker", parent), d_which(which) { d_grp = new QActionGroup(this); @@ -337,16 +337,16 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("LineMarkerMenu::getAction: which out of range.\n"); } signals: - void whichTrigger(int which, QwtSymbol::Style); + void whichTrigger(unsigned int which, QwtSymbol::Style); public slots: void getNone() { emit whichTrigger(d_which, QwtSymbol::NoSymbol); } @@ -380,7 +380,7 @@ class MarkerAlphaMenu: public QMenu Q_OBJECT public: - MarkerAlphaMenu(int which, QWidget *parent) + MarkerAlphaMenu(unsigned int which, QWidget *parent) : QMenu("Line Transparency", parent), d_which(which) { d_grp = new QActionGroup(this); @@ -414,16 +414,16 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("MarkerAlphaMenu::getAction: which out of range.\n"); } signals: - void whichTrigger(int which, int); + void whichTrigger(unsigned int which, int); public slots: void getNone() { emit whichTrigger(d_which, 255); } @@ -447,7 +447,7 @@ class LineTitleAction: public QAction Q_OBJECT public: - LineTitleAction(int which, QWidget *parent) + LineTitleAction(unsigned int which, QWidget *parent) : QAction("Line Title", parent), d_which(which) { d_diag = new QDialog(parent); @@ -473,7 +473,7 @@ public: {} signals: - void whichTrigger(int which, const QString &text); + void whichTrigger(unsigned int which, const QString &text); public slots: void getTextDiag() @@ -692,9 +692,9 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("FFTSizeMenu::getAction: which out of range.\n"); @@ -706,7 +706,7 @@ public: float which = std::log(static_cast<float>(size))/std::log(2.0f) - 5; // If we're a predefined value if(std::modf(which,&ipt) == 0) { - if(which < d_act.size()-1) + if(which < static_cast<unsigned int>(d_act.size())-1) return d_act[static_cast<int>(which)]; else throw std::runtime_error("FFTSizeMenu::getActionFromString: which out of range.\n"); @@ -802,9 +802,9 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("FFTSizeMenu::getAction: which out of range.\n"); @@ -927,9 +927,9 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("FFTWindowMenu::getAction: which out of range.\n"); @@ -1040,7 +1040,7 @@ class ColorMapMenu: public QMenu Q_OBJECT public: - ColorMapMenu(int which, QWidget *parent) + ColorMapMenu(unsigned int which, QWidget *parent) : QMenu("Color Map", parent), d_which(which) { d_grp = new QActionGroup(this); @@ -1082,16 +1082,16 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("ColorMapMenu::getAction: which out of range.\n"); } signals: - void whichTrigger(int which, const int type, + void whichTrigger(unsigned int which, const int type, const QColor &min_color=QColor(), const QColor &max_color=QColor()); @@ -1163,9 +1163,9 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("TriggerModeMenu::getAction: which out of range.\n"); @@ -1241,9 +1241,9 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("TriggerSlopeMenu::getAction: which out of range.\n"); @@ -1306,9 +1306,9 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("TriggerChannelMenu::getAction: which out of range.\n"); @@ -1369,9 +1369,9 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("NumberLayoutMenu::getAction: which out of range.\n"); @@ -1416,7 +1416,7 @@ class NumberColorMapMenu: public QMenu Q_OBJECT public: - NumberColorMapMenu(int which, QWidget *parent) + NumberColorMapMenu(unsigned int which, QWidget *parent) : QMenu("Color Map", parent), d_which(which) { d_grp = new QActionGroup(this); @@ -1455,16 +1455,16 @@ public: return d_act.size(); } - QAction * getAction(int which) + QAction * getAction(unsigned int which) { - if(which < d_act.size()) + if(which < static_cast<unsigned int>(d_act.size())) return d_act[which]; else throw std::runtime_error("ColorMapMenu::getAction: which out of range.\n"); } signals: - void whichTrigger(int which, + void whichTrigger(unsigned int which, const QColor &min_color, const QColor &max_color); @@ -1562,7 +1562,7 @@ class ItemFloatAct: public QAction Q_OBJECT public: - ItemFloatAct(int which, QString title, QWidget *parent) + ItemFloatAct(unsigned int which, QString title, QWidget *parent) : QAction(title, parent), d_which(which) { d_diag = new QDialog(parent); @@ -1595,7 +1595,7 @@ public: signals: - void whichTrigger(int which, float data); + void whichTrigger(unsigned int which, float data); public slots: void getTextDiag() diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index f2fc571acb..0adc85eda9 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -129,12 +129,12 @@ namespace gr { virtual void set_title(const std::string &title) = 0; virtual void set_y_label(const std::string &label, const std::string &unit) = 0; - virtual void set_line_label(int which, const std::string &label) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, int style) = 0; - virtual void set_line_marker(int which, int marker) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; + virtual void set_line_label(unsigned int which, const std::string &label) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, int style) = 0; + virtual void set_line_marker(unsigned int which, int marker) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; /*! * Set up a trigger for the sink to know when to start @@ -164,12 +164,12 @@ namespace gr { const std::string &tag_key="") = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index f13653731d..0dc1f7700d 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -129,12 +129,12 @@ namespace gr { virtual void set_title(const std::string &title) = 0; virtual void set_y_label(const std::string &label, const std::string &unit) = 0; - virtual void set_line_label(int which, const std::string &label) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, int style) = 0; - virtual void set_line_marker(int which, int marker) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; + virtual void set_line_label(unsigned int which, const std::string &label) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, int style) = 0; + virtual void set_line_marker(unsigned int which, int marker) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; /*! * Pass "true" to this function to only show the positive half @@ -171,12 +171,12 @@ namespace gr { const std::string &tag_key="") = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h index 6e7dee005d..6a10466276 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h @@ -106,12 +106,12 @@ namespace gr { public: virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; @@ -133,12 +133,12 @@ namespace gr { virtual void set_x_axis(double min, double max) = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &line) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, int style) = 0; - virtual void set_line_marker(int which, int marker) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; + virtual void set_line_label(unsigned int which, const std::string &line) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, int style) = 0; + virtual void set_line_marker(unsigned int which, int marker) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; virtual void set_nsamps(const int newsize) = 0; virtual void set_bins(const int bins) = 0; virtual void disable_legend() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h index 3d6647c592..125d917529 100644 --- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h +++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h @@ -96,27 +96,27 @@ namespace gr { virtual void set_update_time(double t) = 0; virtual void set_average(const float avg) = 0; virtual void set_graph_type(const graph_t type) = 0; - virtual void set_color(int which, + virtual void set_color(unsigned int which, const std::string &min, const std::string &max) = 0; - virtual void set_color(int which, int min, int max) = 0; - virtual void set_label(int which, const std::string &label) = 0; - virtual void set_min(int which, float min) = 0; - virtual void set_max(int which, float max) = 0; + virtual void set_color(unsigned int which, int min, int max) = 0; + virtual void set_label(unsigned int which, const std::string &label) = 0; + virtual void set_min(unsigned int which, float min) = 0; + virtual void set_max(unsigned int which, float max) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_unit(int which, const std::string &unit) = 0; - virtual void set_factor(int which, float factor) = 0; + virtual void set_unit(unsigned int which, const std::string &unit) = 0; + virtual void set_factor(unsigned int which, float factor) = 0; virtual float average() const = 0; virtual graph_t graph_type() const = 0; - virtual std::string color_min(int which) const = 0; - virtual std::string color_max(int which) const = 0; - virtual std::string label(int which) const = 0; - virtual float min(int which) const = 0; - virtual float max(int which) const = 0; + virtual std::string color_min(unsigned int which) const = 0; + virtual std::string color_max(unsigned int which) const = 0; + virtual std::string label(unsigned int which) const = 0; + virtual float min(unsigned int which) const = 0; + virtual float max(unsigned int which) const = 0; virtual std::string title() const = 0; - virtual std::string unit(int which) const = 0; - virtual float factor(int which) const = 0; + virtual std::string unit(unsigned int which) const = 0; + virtual float factor(unsigned int which) const = 0; virtual void enable_menu(bool en=true) = 0; virtual void enable_autoscale(bool en=true) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h index 6f90766903..7423dd8ec1 100644 --- a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h @@ -44,16 +44,16 @@ class NumberDisplayForm : public QWidget ~NumberDisplayForm(); gr::qtgui::graph_t graphType() const; - QColor colorMin(int which) const; - QColor colorMax(int which) const; - std::string label(int which) const; + QColor colorMin(unsigned int which) const; + QColor colorMax(unsigned int which) const; + std::string label(unsigned int which) const; float average() const; float updateTime() const; - int scaleMin(int which); - int scaleMax(int which); + int scaleMin(unsigned int which); + int scaleMax(unsigned int which); std::string title() const; - std::string unit(int which) const; - float factor(int which) const; + std::string unit(unsigned int which) const; + float factor(unsigned int which) const; public slots: void mousePressEvent(QMouseEvent * e); @@ -61,28 +61,28 @@ public slots: void setStop(bool on); void setStop(); void setGraphType(const gr::qtgui::graph_t type); - void setColor(int which, const QColor &min, const QColor &max); - void setColorMin(int which, QString min); - void setColorMax(int which, QString max); - void setLabel(int which, const std::string &label); - void setLabel(int which, QString label); + void setColor(unsigned int which, const QColor &min, const QColor &max); + void setColorMin(unsigned int which, QString min); + void setColorMax(unsigned int which, QString max); + void setLabel(unsigned int which, const std::string &label); + void setLabel(unsigned int which, QString label); void setAverage(const float avg); void setUpdateTime(const float time); void setUpdateTime(QString time); void saveFigure(); - void setScale(int which, int min, int max); - void setScaleMin(int which, int min); - void setScaleMax(int which, int max); + void setScale(unsigned int which, int min, int max); + void setScaleMin(unsigned int which, int min); + void setScaleMax(unsigned int which, int max); void autoScale(bool on); void setTitle(const std::string &title); - void setUnit(int which, const std::string &unit); - void setFactor(int which, float factor); + void setUnit(unsigned int which, const std::string &unit); + void setFactor(unsigned int which, float factor); private slots: void newData(const QEvent*); private: - int d_nplots; + unsigned int d_nplots; QGridLayout *d_layout; std::vector<QLabel*> d_label; std::vector<QLabel*> d_text_box; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h index efaef1cc4b..5e5141a21b 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h @@ -97,22 +97,22 @@ namespace gr { virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &lable) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, Qt::PenStyle style) = 0; - virtual void set_line_marker(int which, QwtSymbol::Style marker) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; - virtual void set_color_map(int which, const int color) = 0; + virtual void set_line_label(unsigned int which, const std::string &lable) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, Qt::PenStyle style) = 0; + virtual void set_line_marker(unsigned int which, QwtSymbol::Style marker) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; + virtual void set_color_map(unsigned int which, const int color) = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; - virtual int color_map(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; + virtual int color_map(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h index ae2ec8d11b..94f0e08ef8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h @@ -93,22 +93,22 @@ namespace gr { virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &lable) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, Qt::PenStyle style) = 0; - virtual void set_line_marker(int which, QwtSymbol::Style marker) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; - virtual void set_color_map(int which, const int color) = 0; + virtual void set_line_label(unsigned int which, const std::string &lable) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, Qt::PenStyle style) = 0; + virtual void set_line_marker(unsigned int which, QwtSymbol::Style marker) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; + virtual void set_color_map(unsigned int which, const int color) = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; - virtual int color_map(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; + virtual int color_map(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index af921afc1b..6537edd7d4 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -76,7 +76,7 @@ namespace gr { */ static sptr make(int size, double samp_rate, const std::string &name, - int nconnections=1, + unsigned int nconnections=1, QWidget *parent=NULL); virtual void exec_() = 0; @@ -93,14 +93,14 @@ namespace gr { const std::string &unit="") = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &label) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, int style) = 0; - virtual void set_line_marker(int which, int marker) = 0; + virtual void set_line_label(unsigned int which, const std::string &label) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, int style) = 0; + virtual void set_line_marker(unsigned int which, int marker) = 0; virtual void set_nsamps(const int newsize) = 0; virtual void set_samp_rate(const double samp_rate) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; /*! * Set up a trigger for the sink to know when to start @@ -153,12 +153,12 @@ namespace gr { const std::string &tag_key="") = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; @@ -169,7 +169,8 @@ namespace gr { virtual void enable_semilogx(bool en=true) = 0; virtual void enable_semilogy(bool en=true) = 0; virtual void enable_control_panel(bool en=true) = 0; - virtual void enable_tags(int which, bool en) = 0; + virtual void enable_tags(unsigned int which, bool en) = 0; + virtual void enable_tags(bool en) = 0; virtual void enable_axis_labels(bool en=true) = 0; virtual void disable_legend() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index 7ddca46297..e2d898185f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -74,7 +74,7 @@ namespace gr { */ static sptr make(int size, double samp_rate, const std::string &name, - int nconnections=1, + unsigned int nconnections=1, QWidget *parent=NULL); virtual void exec_() = 0; @@ -91,14 +91,14 @@ namespace gr { const std::string &unit="") = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &line) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, int style) = 0; - virtual void set_line_marker(int which, int marker) = 0; + virtual void set_line_label(unsigned int which, const std::string &line) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, int style) = 0; + virtual void set_line_marker(unsigned int which, int marker) = 0; virtual void set_nsamps(const int newsize) = 0; virtual void set_samp_rate(const double samp_rate) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; /*! * Set up a trigger for the sink to know when to start @@ -143,12 +143,12 @@ namespace gr { const std::string &tag_key="") = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; @@ -159,7 +159,8 @@ namespace gr { virtual void enable_semilogx(bool en=true) = 0; virtual void enable_semilogy(bool en=true) = 0; virtual void enable_control_panel(bool en=true) = 0; - virtual void enable_tags(int which, bool en) = 0; + virtual void enable_tags(unsigned int which, bool en) = 0; + virtual void enable_tags(bool en) = 0; virtual void enable_axis_labels(bool en=true) = 0; virtual void disable_legend() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h index 258cc5d8dd..257654cc26 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h @@ -68,7 +68,7 @@ public slots: void setSemilogx(bool en); void setSemilogy(bool en); void tagMenuSlot(bool en); - void setTagMenu(int which, bool en); + void setTagMenu(unsigned int which, bool en); void updateTrigger(gr::qtgui::trigger_mode mode); void setTriggerMode(gr::qtgui::trigger_mode mode); diff --git a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h index 1abc6ebe16..8aff0e8950 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h @@ -53,10 +53,10 @@ class TimeRasterDisplayForm : public DisplayForm double numRows(); double numCols(); - int getColorMap(int which); - int getAlpha(int which); - double getMinIntensity(int which); - double getMaxIntensity(int which); + int getColorMap(unsigned int which); + int getAlpha(unsigned int which); + double getMinIntensity(unsigned int which); + double getMaxIntensity(unsigned int which); public slots: void customEvent(QEvent *e); @@ -75,12 +75,12 @@ public slots: void setMaxIntensity(const QString &m); void setMinIntensity(const QString &m); - void setColorMap(int which, + void setColorMap(unsigned int which, const int newType, const QColor lowColor=QColor("white"), const QColor highColor=QColor("white")); - void setAlpha(int which, int alpha); + void setAlpha(unsigned int which, int alpha); void autoScale(bool en=false); diff --git a/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h index b609752483..19284b19ad 100644 --- a/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h @@ -111,20 +111,20 @@ namespace gr { virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &label) = 0; - virtual void set_line_color(int which, const std::string &color) = 0; - virtual void set_line_width(int which, int width) = 0; - virtual void set_line_style(int which, int style) = 0; - virtual void set_line_marker(int which, int marker) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; + virtual void set_line_label(unsigned int which, const std::string &label) = 0; + virtual void set_line_color(unsigned int which, const std::string &color) = 0; + virtual void set_line_width(unsigned int which, int width) = 0; + virtual void set_line_style(unsigned int which, int style) = 0; + virtual void set_line_marker(unsigned int which, int marker) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual std::string line_color(int which) = 0; - virtual int line_width(int which) = 0; - virtual int line_style(int which) = 0; - virtual int line_marker(int which) = 0; - virtual double line_alpha(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual std::string line_color(unsigned int which) = 0; + virtual int line_width(unsigned int which) = 0; + virtual int line_style(unsigned int which) = 0; + virtual int line_marker(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index c0bdf1623b..8891529753 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -138,20 +138,20 @@ namespace gr { virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; virtual void set_time_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &line) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; - virtual void set_color_map(int which, const int color) = 0; + virtual void set_line_label(unsigned int which, const std::string &line) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; + virtual void set_color_map(unsigned int which, const int color) = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual double line_alpha(int which) = 0; - virtual int color_map(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; + virtual int color_map(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; virtual void auto_scale() = 0; - virtual double min_intensity(int which) = 0; - virtual double max_intensity(int which) = 0; + virtual double min_intensity(unsigned int which) = 0; + virtual double max_intensity(unsigned int which) = 0; virtual void enable_menu(bool en=true) = 0; virtual void enable_grid(bool en=true) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index d38cb2cae7..e8c659cb09 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -139,9 +139,9 @@ namespace gr { virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; virtual void set_time_title(const std::string &title) = 0; - virtual void set_line_label(int which, const std::string &line) = 0; - virtual void set_line_alpha(int which, double alpha) = 0; - virtual void set_color_map(int which, const int color) = 0; + virtual void set_line_label(unsigned int which, const std::string &line) = 0; + virtual void set_line_alpha(unsigned int which, double alpha) = 0; + virtual void set_color_map(unsigned int which, const int color) = 0; /*! * Pass "true" to this function to only show the positive half @@ -151,15 +151,15 @@ namespace gr { virtual void set_plot_pos_half(bool half) = 0; virtual std::string title() = 0; - virtual std::string line_label(int which) = 0; - virtual double line_alpha(int which) = 0; - virtual int color_map(int which) = 0; + virtual std::string line_label(unsigned int which) = 0; + virtual double line_alpha(unsigned int which) = 0; + virtual int color_map(unsigned int which) = 0; virtual void set_size(int width, int height) = 0; virtual void auto_scale() = 0; - virtual double min_intensity(int which) = 0; - virtual double max_intensity(int which) = 0; + virtual double min_intensity(unsigned int which) = 0; + virtual double max_intensity(unsigned int which) = 0; virtual void enable_menu(bool en=true) = 0; virtual void enable_grid(bool en=true) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h index 6d1e4beb2e..8bbbb935ef 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h @@ -50,10 +50,10 @@ class WaterfallDisplayForm : public DisplayForm float getFFTAverage() const; gr::filter::firdes::win_type getFFTWindowType() const; - int getColorMap(int which); - int getAlpha(int which); - double getMinIntensity(int which); - double getMaxIntensity(int which); + int getColorMap(unsigned int which); + int getAlpha(unsigned int which); + double getMinIntensity(unsigned int which); + double getMaxIntensity(unsigned int which); void clearData(); @@ -79,9 +79,9 @@ public slots: void setMaxIntensity(const QString &m); void setMinIntensity(const QString &m); - void setAlpha(int which, int alpha); + void setAlpha(unsigned int which, int alpha); - void setColorMap(int which, + void setColorMap(unsigned int which, const int newType, const QColor lowColor=QColor("white"), const QColor highColor=QColor("white")); diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index a3ad6bf035..9d290e08e3 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc @@ -105,7 +105,7 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(int nplots, QWidget* parent) // Setup dataPoints and plot vectors // Automatically deleted when parent is deleted - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_real_data.push_back(new double[d_numPoints]); d_imag_data.push_back(new double[d_numPoints]); memset(d_real_data[i], 0x0, d_numPoints*sizeof(double)); @@ -133,7 +133,7 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(int nplots, QWidget* parent) ConstellationDisplayPlot::~ConstellationDisplayPlot() { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { delete [] d_real_data[i]; delete [] d_imag_data[i]; } @@ -167,7 +167,7 @@ ConstellationDisplayPlot::set_pen_size(int size) { if(size > 0 && size < 30){ d_pen_size = size; - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_plot_curve[i]->setPen(QPen(Qt::blue, d_pen_size, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); } @@ -192,7 +192,7 @@ ConstellationDisplayPlot::plotNewData(const std::vector<double*> realDataPoints, if(numDataPoints != d_numPoints) { d_numPoints = numDataPoints; - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { delete [] d_real_data[i]; delete [] d_imag_data[i]; d_real_data[i] = new double[d_numPoints]; @@ -206,14 +206,14 @@ ConstellationDisplayPlot::plotNewData(const std::vector<double*> realDataPoints, } } - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { memcpy(d_real_data[i], realDataPoints[i], numDataPoints*sizeof(double)); memcpy(d_imag_data[i], imagDataPoints[i], numDataPoints*sizeof(double)); } if(d_autoscale_state) { double bottom=1e20, top=-1e20; - for(int n = 0; n < d_nplots; n++) { + for(unsigned int n = 0; n < d_nplots; ++n) { for(int64_t point = 0; point < numDataPoints; point++) { double b = std::min(realDataPoints[n][point], imagDataPoints[n][point]); double t = std::max(realDataPoints[n][point], imagDataPoints[n][point]); diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc index 59384c88f6..b79b912270 100644 --- a/gr-qtgui/lib/DisplayPlot.cc +++ b/gr-qtgui/lib/DisplayPlot.cc @@ -125,19 +125,23 @@ DisplayPlot::setXaxis(double min, double max) } void -DisplayPlot::setLineLabel(int which, QString label) +DisplayPlot::setLineLabel(unsigned int which, QString label) { - d_plot_curve[which]->setTitle(label); + if(which >= d_plot_curve.size()) + throw std::runtime_error("DisplayPlot::setLineLabel: index out of bounds"); + d_plot_curve[which]->setTitle(label); } QString -DisplayPlot::getLineLabel(int which) +DisplayPlot::getLineLabel(unsigned int which) { - return d_plot_curve[which]->title().text(); + if(which >= d_plot_curve.size()) + throw std::runtime_error("DisplayPlot::getLineLabel: index out of bounds"); + return d_plot_curve[which]->title().text(); } void -DisplayPlot::setLineColor(int which, QColor color) +DisplayPlot::setLineColor(unsigned int which, QColor color) { if (which < d_nplots) { // Set the color of the pen @@ -162,7 +166,7 @@ DisplayPlot::setLineColor(int which, QColor color) } QColor -DisplayPlot::getLineColor(int which) const +DisplayPlot::getLineColor(unsigned int which) const { // If that plot doesn't exist then return black. if (which < d_nplots) @@ -267,7 +271,7 @@ DisplayPlot::getAxesLabelFontSize() const { } void -DisplayPlot::setLineWidth(int which, int width) +DisplayPlot::setLineWidth(unsigned int which, int width) { if(which < d_nplots) { // Set the new line width @@ -291,7 +295,7 @@ DisplayPlot::setLineWidth(int which, int width) } int -DisplayPlot::getLineWidth(int which) const { +DisplayPlot::getLineWidth(unsigned int which) const { if (which < d_nplots) { return d_plot_curve[which]->pen().width(); } @@ -301,7 +305,7 @@ DisplayPlot::getLineWidth(int which) const { } void -DisplayPlot::setLineStyle(int which, Qt::PenStyle style) +DisplayPlot::setLineStyle(unsigned int which, Qt::PenStyle style) { if(which < d_nplots) { QPen pen(d_plot_curve[which]->pen()); @@ -311,7 +315,7 @@ DisplayPlot::setLineStyle(int which, Qt::PenStyle style) } const Qt::PenStyle -DisplayPlot::getLineStyle(int which) const +DisplayPlot::getLineStyle(unsigned int which) const { if(which < d_nplots) { return d_plot_curve[which]->pen().style(); @@ -322,7 +326,7 @@ DisplayPlot::getLineStyle(int which) const } void -DisplayPlot::setLineMarker(int which, QwtSymbol::Style marker) +DisplayPlot::setLineMarker(unsigned int which, QwtSymbol::Style marker) { if(which < d_nplots) { #if QWT_VERSION < 0x060000 @@ -344,7 +348,7 @@ DisplayPlot::setLineMarker(int which, QwtSymbol::Style marker) } const QwtSymbol::Style -DisplayPlot::getLineMarker(int which) const +DisplayPlot::getLineMarker(unsigned int which) const { if(which < d_nplots) { #if QWT_VERSION < 0x060000 @@ -361,7 +365,7 @@ DisplayPlot::getLineMarker(int which) const } void -DisplayPlot::setMarkerAlpha(int which, int alpha) +DisplayPlot::setMarkerAlpha(unsigned int which, int alpha) { if (which < d_nplots) { // Get the pen color @@ -389,7 +393,7 @@ DisplayPlot::setMarkerAlpha(int which, int alpha) } int -DisplayPlot::getMarkerAlpha(int which) const +DisplayPlot::getMarkerAlpha(unsigned int which) const { if(which < d_nplots) { return d_plot_curve[which]->pen().color().alpha(); diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index 2820bae2f5..db0056c9bc 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -107,7 +107,7 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots, QWidget* parent) // Create a curve for each input // Automatically deleted when parent is deleted - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_ydata.push_back(new double[d_numPoints]); memset(d_ydata[i], 0x0, d_numPoints*sizeof(double)); @@ -247,7 +247,7 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots, QWidget* parent) FrequencyDisplayPlot::~FrequencyDisplayPlot() { - for(int i = 0; i < d_nplots; i++) + for(unsigned int i = 0; i < d_nplots; ++i) delete [] d_ydata[i]; delete[] d_max_fft_data; delete[] d_min_fft_data; @@ -374,7 +374,7 @@ FrequencyDisplayPlot::plotNewData(const std::vector<double*> dataPoints, d_min_fft_data = new double[d_numPoints]; d_max_fft_data = new double[d_numPoints]; - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { delete[] d_ydata[i]; d_ydata[i] = new double[d_numPoints]; @@ -397,7 +397,7 @@ FrequencyDisplayPlot::plotNewData(const std::vector<double*> dataPoints, } double bottom=1e20, top=-1e20; - for(int n = 0; n < d_nplots; n++) { + for(unsigned int n = 0; n < d_nplots; ++n) { memcpy(d_ydata[n], &(dataPoints[n][_in_index]), _npoints_in*sizeof(double)); diff --git a/gr-qtgui/lib/HistogramDisplayPlot.cc b/gr-qtgui/lib/HistogramDisplayPlot.cc index 60d838d431..0b7f824cff 100644 --- a/gr-qtgui/lib/HistogramDisplayPlot.cc +++ b/gr-qtgui/lib/HistogramDisplayPlot.cc @@ -119,7 +119,7 @@ private: /*********************************************************************** * Main Time domain plotter widget **********************************************************************/ -HistogramDisplayPlot::HistogramDisplayPlot(int nplots, QWidget* parent) +HistogramDisplayPlot::HistogramDisplayPlot(unsigned int nplots, QWidget* parent) : DisplayPlot(nplots, parent) { d_bins = 100; @@ -165,7 +165,7 @@ HistogramDisplayPlot::HistogramDisplayPlot(int nplots, QWidget* parent) // Setup dataPoints and plot vectors // Automatically deleted when parent is deleted - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_ydata.push_back(new double[d_bins]); memset(d_ydata[i], 0, d_bins*sizeof(double)); @@ -196,7 +196,7 @@ HistogramDisplayPlot::HistogramDisplayPlot(int nplots, QWidget* parent) HistogramDisplayPlot::~HistogramDisplayPlot() { - for(int i = 0; i < d_nplots; i++) + for(unsigned int i = 0; i < d_nplots; ++i) delete[] d_ydata[i]; delete[] d_xdata; @@ -211,7 +211,7 @@ HistogramDisplayPlot::replot() void HistogramDisplayPlot::plotNewData(const std::vector<double*> dataPoints, - const int64_t numDataPoints, + const uint64_t numDataPoints, const double timeInterval) { if(!d_stop) { @@ -220,7 +220,7 @@ HistogramDisplayPlot::plotNewData(const std::vector<double*> dataPoints, // keep track of the min/max values for when autoscaleX is called. d_xmin = 1e20; d_xmax = -1e20; - for(int n = 0; n < d_nplots; n++) { + for(unsigned int n = 0; n < d_nplots; ++n) { d_xmin = std::min(d_xmin, *std::min_element(dataPoints[n], dataPoints[n]+numDataPoints)); d_xmax = std::max(d_xmax, *std::max_element(dataPoints[n], dataPoints[n]+numDataPoints)); } @@ -237,17 +237,17 @@ HistogramDisplayPlot::plotNewData(const std::vector<double*> dataPoints, clear(); } - int index; - for(int n = 0; n < d_nplots; n++) { - for(int64_t point = 0; point < numDataPoints; point++) { + unsigned int index; + for(unsigned int n = 0; n < d_nplots; ++n) { + for(uint64_t point = 0; point < numDataPoints; point++) { index = boost::math::iround(1e-20 + (dataPoints[n][point] - d_left)/d_width); if((index >= 0) && (index < d_bins)) - d_ydata[n][static_cast<int>(index)] += 1; + d_ydata[n][static_cast<unsigned int>(index)] += 1; } } double height = *std::max_element(d_ydata[0], d_ydata[0]+d_bins); - for(int n = 1; n < d_nplots; n++) { + for(unsigned int n = 1; n < d_nplots; ++n) { height = std::max(height, *std::max_element(d_ydata[n], d_ydata[n]+d_bins)); } @@ -275,7 +275,7 @@ HistogramDisplayPlot::_resetXAxisPoints(double left, double right) d_left = left *(1 - copysign(0.1, left)); d_right = right*(1 + copysign(0.1, right)); d_width = (d_right - d_left)/(d_bins); - for(long loc = 0; loc < d_bins; loc++){ + for(unsigned int loc = 0; loc < d_bins; loc++){ d_xdata[loc] = d_left + loc*d_width; } #if QWT_VERSION < 0x060100 @@ -391,7 +391,7 @@ HistogramDisplayPlot::getAccumulate() const } void -HistogramDisplayPlot::setMarkerAlpha(int which, int alpha) +HistogramDisplayPlot::setMarkerAlpha(unsigned int which, int alpha) { if(which < d_nplots) { // Get the pen color @@ -423,7 +423,7 @@ HistogramDisplayPlot::setMarkerAlpha(int which, int alpha) } int -HistogramDisplayPlot::getMarkerAlpha(int which) const +HistogramDisplayPlot::getMarkerAlpha(unsigned int which) const { if(which < d_nplots) { return d_plot_curve[which]->brush().color().alpha(); @@ -434,7 +434,7 @@ HistogramDisplayPlot::getMarkerAlpha(int which) const } void -HistogramDisplayPlot::setLineColor(int which, QColor color) +HistogramDisplayPlot::setLineColor(unsigned int which, QColor color) { if(which < d_nplots) { // Adjust color's transparency for the brush @@ -467,7 +467,7 @@ HistogramDisplayPlot::setLineColor(int which, QColor color) } void -HistogramDisplayPlot::setNumBins(int bins) +HistogramDisplayPlot::setNumBins(unsigned int bins) { d_bins = bins; @@ -475,7 +475,7 @@ HistogramDisplayPlot::setNumBins(int bins) d_xdata = new double[d_bins]; _resetXAxisPoints(d_left, d_right); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { delete [] d_ydata[i]; d_ydata[i] = new double[d_bins]; memset(d_ydata[i], 0, d_bins*sizeof(double)); @@ -493,7 +493,7 @@ void HistogramDisplayPlot::clear() { if(!d_stop) { - for(int n = 0; n < d_nplots; n++) { + for(unsigned int n = 0; n < d_nplots; ++n) { memset(d_ydata[n], 0, d_bins*sizeof(double)); } } diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index e1e8482369..c979642b59 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -180,7 +180,7 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(int nplots, QWidget* parent) // Setup dataPoints and plot vectors // Automatically deleted when parent is deleted - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_ydata.push_back(new double[d_numPoints]); memset(d_ydata[i], 0x0, d_numPoints*sizeof(double)); @@ -225,7 +225,7 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(int nplots, QWidget* parent) TimeDomainDisplayPlot::~TimeDomainDisplayPlot() { - for(int i = 0; i < d_nplots; i++) + for(unsigned int i = 0; i < d_nplots; ++i) delete [] d_ydata[i]; delete[] d_xdata; @@ -252,7 +252,7 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, delete[] d_xdata; d_xdata = new double[d_numPoints]; - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { delete[] d_ydata[i]; d_ydata[i] = new double[d_numPoints]; @@ -266,7 +266,7 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, _resetXAxisPoints(); } - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { if(d_semilogy) { for(int n = 0; n < numDataPoints; n++) d_ydata[i][n] = fabs(dataPoints[i][n]); @@ -277,7 +277,7 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, } // Detach and delete any tags that were plotted last time - for(int n = 0; n < d_nplots; n++) { + for(unsigned int n = 0; n < d_nplots; ++n) { for(size_t i = 0; i < d_tag_markers[n].size(); i++) { d_tag_markers[n][i]->detach(); delete d_tag_markers[n][i]; @@ -290,12 +290,12 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, // split here into two stream. if(tags.size() > 0) { bool cmplx = false; - int mult = (int)d_nplots / (int)tags.size(); + unsigned int mult = d_nplots / tags.size(); if(mult == 2) cmplx = true; std::vector< std::vector<gr::tag_t> >::const_iterator tag = tags.begin(); - for(int i = 0; i < d_nplots; i+=mult) { + for(unsigned int i = 0; i < d_nplots; i += mult) { std::vector<gr::tag_t>::const_iterator t; for(t = tag->begin(); t != tag->end(); t++) { uint64_t offset = (*t).offset; @@ -408,7 +408,7 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, if(d_autoscale_state) { double bottom=1e20, top=-1e20; - for(int n = 0; n < d_nplots; n++) { + for(unsigned int n = 0; n < d_nplots; ++n) { for(int64_t point = 0; point < numDataPoints; point++) { if(d_ydata[n][point] < bottom) { bottom = d_ydata[n][point]; @@ -434,7 +434,7 @@ void TimeDomainDisplayPlot::legendEntryChecked(QwtPlotItem* plotItem, bool on) { // When line is turned on/off, immediately show/hide tag markers - for(int n = 0; n < d_nplots; n++) { + for(unsigned int n = 0; n < d_nplots; ++n) { if(plotItem == d_plot_curve[n]) { for(size_t i = 0; i < d_tag_markers[n].size(); i++) { if(!(!on && d_tag_markers_en[n])) @@ -549,13 +549,13 @@ void TimeDomainDisplayPlot::stemPlot(bool en) { if(en) { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_plot_curve[i]->setStyle(QwtPlotCurve::Sticks); setLineMarker(i, QwtSymbol::Ellipse); } } else { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_plot_curve[i]->setStyle(QwtPlotCurve::Lines); setLineMarker(i, QwtSymbol::NoSymbol); } @@ -607,7 +607,7 @@ TimeDomainDisplayPlot::setSemilogy(bool en) } void -TimeDomainDisplayPlot::enableTagMarker(int which, bool en) +TimeDomainDisplayPlot::enableTagMarker(unsigned int which, bool en) { if((size_t)which < d_tag_markers_en.size()) d_tag_markers_en[which] = en; diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 201b470d21..9f87abd435 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -210,7 +210,7 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot(int nplots, setAxisScaleDraw(QwtPlot::xBottom, new QwtXScaleDraw()); setAxisScaleDraw(QwtPlot::yLeft, new QwtYScaleDraw()); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data.push_back(new TimeRasterData(d_rows, d_cols)); d_raster.push_back(new PlotTimeRaster("Raster")); d_raster[i]->setData(d_data[i]); @@ -248,7 +248,7 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot(int nplots, // Set intensity color now (needed d_zoomer before we could do this). // We've made sure the old type is different than here so we'll // force and update. - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { setIntensityColorMapType(i, INTENSITY_COLOR_MAP_TYPE_WHITE_HOT, QColor("white"), QColor("white")); } @@ -265,7 +265,7 @@ TimeRasterDisplayPlot::~TimeRasterDisplayPlot() void TimeRasterDisplayPlot::reset() { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data[i]->resizeData(d_rows, d_cols); d_data[i]->reset(); } @@ -324,7 +324,7 @@ TimeRasterDisplayPlot::setNumCols(double cols) } void -TimeRasterDisplayPlot::setAlpha(int which, int alpha) +TimeRasterDisplayPlot::setAlpha(unsigned int which, int alpha) { d_raster[which]->setAlpha(alpha); } @@ -349,7 +349,7 @@ TimeRasterDisplayPlot::numCols() const } int -TimeRasterDisplayPlot::getAlpha(int which) +TimeRasterDisplayPlot::getAlpha(unsigned int which) { return d_raster[which]->alpha(); } @@ -374,11 +374,11 @@ TimeRasterDisplayPlot::setPlotDimensions(const double rows, const double cols, void TimeRasterDisplayPlot::plotNewData(const std::vector<double*> dataPoints, - const int64_t numDataPoints) + const uint64_t numDataPoints) { if(!d_stop) { if(numDataPoints > 0) { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data[i]->addData(dataPoints[i], numDataPoints); d_raster[i]->invalidateCache(); d_raster[i]->itemChanged(); @@ -391,7 +391,7 @@ TimeRasterDisplayPlot::plotNewData(const std::vector<double*> dataPoints, void TimeRasterDisplayPlot::plotNewData(const double* dataPoints, - const int64_t numDataPoints) + const uint64_t numDataPoints) { std::vector<double*> vecDataPoints; vecDataPoints.push_back((double*)dataPoints); @@ -402,7 +402,7 @@ void TimeRasterDisplayPlot::setIntensityRange(const double minIntensity, const double maxIntensity) { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { #if QWT_VERSION < 0x060000 d_data[i]->setRange(QwtDoubleInterval(minIntensity, maxIntensity)); #else @@ -417,7 +417,7 @@ TimeRasterDisplayPlot::setIntensityRange(const double minIntensity, } double -TimeRasterDisplayPlot::getMinIntensity(int which) const +TimeRasterDisplayPlot::getMinIntensity(unsigned int which) const { #if QWT_VERSION < 0x060000 QwtDoubleInterval r = d_data[which]->range(); @@ -429,7 +429,7 @@ TimeRasterDisplayPlot::getMinIntensity(int which) const } double -TimeRasterDisplayPlot::getMaxIntensity(int which) const +TimeRasterDisplayPlot::getMaxIntensity(unsigned int which) const { #if QWT_VERSION < 0x060000 QwtDoubleInterval r = d_data[which]->range(); @@ -463,9 +463,9 @@ TimeRasterDisplayPlot::replot() } int -TimeRasterDisplayPlot::getIntensityColorMapType(int which) const +TimeRasterDisplayPlot::getIntensityColorMapType(unsigned int which) const { - if(which >= (int)d_color_map_type.size()) + if(which >= d_color_map_type.size()) throw std::runtime_error("TimerasterDisplayPlot::GetIntesityColorMap: invalid which.\n"); return d_color_map_type[which]; @@ -490,12 +490,12 @@ TimeRasterDisplayPlot::setColorMapTitleFontSize(int tfs) } void -TimeRasterDisplayPlot::setIntensityColorMapType(const int which, +TimeRasterDisplayPlot::setIntensityColorMapType(const unsigned int which, const int newType, const QColor lowColor, const QColor highColor) { - if(which >= (int)d_color_map_type.size()) + if(which >= d_color_map_type.size()) throw std::runtime_error("TimerasterDisplayPlot::setIntesityColorMap: invalid which.\n"); if((d_color_map_type[which] != newType) || @@ -576,7 +576,7 @@ TimeRasterDisplayPlot::_updateIntensityRangeDisplay() rightAxis->setTitle(colorBarTitle); rightAxis->setColorBarEnabled(true); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { #if QWT_VERSION < 0x060000 rightAxis->setColorMap(d_raster[i]->data()->range(), d_raster[i]->colorMap()); diff --git a/gr-qtgui/lib/VectorDisplayPlot.cc b/gr-qtgui/lib/VectorDisplayPlot.cc index 54d5c49acc..009233b3e6 100644 --- a/gr-qtgui/lib/VectorDisplayPlot.cc +++ b/gr-qtgui/lib/VectorDisplayPlot.cc @@ -124,7 +124,7 @@ VectorDisplayPlot::VectorDisplayPlot(int nplots, QWidget* parent) // Create a curve for each input // Automatically deleted when parent is deleted - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_ydata.push_back(new double[d_numPoints]); memset(d_ydata[i], 0x0, d_numPoints*sizeof(double)); @@ -235,7 +235,7 @@ VectorDisplayPlot::VectorDisplayPlot(int nplots, QWidget* parent) VectorDisplayPlot::~VectorDisplayPlot() { - for(int i = 0; i < d_nplots; i++) + for(unsigned int i = 0; i < d_nplots; ++i) delete [] d_ydata[i]; delete[] d_max_vec_data; delete[] d_min_vec_data; @@ -340,7 +340,7 @@ VectorDisplayPlot::plotNewData( d_min_vec_data = new double[d_numPoints]; d_max_vec_data = new double[d_numPoints]; - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { delete[] d_ydata[i]; d_ydata[i] = new double[d_numPoints]; @@ -363,7 +363,7 @@ VectorDisplayPlot::plotNewData( } double bottom=1e20, top=-1e20; - for(int n = 0; n < d_nplots; n++) { + for(unsigned int n = 0; n < d_nplots; ++n) { memcpy(d_ydata[n], dataPoints[n], numDataPoints*sizeof(double)); diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index b16c32bf9d..66299f1fa8 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -150,7 +150,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(int nplots, QWidget* parent) setAxisTitle(QwtPlot::yLeft, "Time (s)"); setAxisScaleDraw(QwtPlot::yLeft, new QwtTimeScaleDraw()); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data.push_back(new WaterfallData(d_start_frequency, d_stop_frequency, d_numPoints, d_nrows)); @@ -209,7 +209,7 @@ WaterfallDisplayPlot::~WaterfallDisplayPlot() void WaterfallDisplayPlot::resetAxis() { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data[i]->resizeData(d_start_frequency, d_stop_frequency, d_numPoints, d_nrows); d_data[i]->reset(); @@ -295,7 +295,7 @@ WaterfallDisplayPlot::plotNewData(const std::vector<double*> dataPoints, // If not displaying just the positive half of the spectrum, // plot the full thing now. if(!d_half_freq) { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data[i]->setSpectrumDataBuffer(dataPoints[i]); d_data[i]->setNumLinesToUpdate(0); d_spectrogram[i]->invalidateCache(); @@ -306,7 +306,7 @@ WaterfallDisplayPlot::plotNewData(const std::vector<double*> dataPoints, // Otherwise, loop through our input data vector and only plot // the second half of each row. else { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data[i]->setSpectrumDataBuffer(&(dataPoints[i][d_numPoints])); for(int n = 1; n < d_nrows; n++) { d_data[i]->addFFTData(&(dataPoints[i][d_numPoints + 2*n*d_numPoints]), @@ -333,7 +333,7 @@ WaterfallDisplayPlot::plotNewData(const std::vector<double*> dataPoints, d_numPoints = _npoints_in; resetAxis(); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_spectrogram[i]->invalidateCache(); d_spectrogram[i]->itemChanged(); } @@ -350,7 +350,7 @@ WaterfallDisplayPlot::plotNewData(const std::vector<double*> dataPoints, ((WaterfallZoomer*)d_zoomer)->setSecondsPerLine(timePerFFT); ((WaterfallZoomer*)d_zoomer)->setZeroTime(timestamp); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data[i]->addFFTData(&(dataPoints[i][_in_index]), _npoints_in, droppedFrames); d_data[i]->incrementNumLinesToUpdate(); @@ -380,7 +380,7 @@ void WaterfallDisplayPlot::setIntensityRange(const double minIntensity, const double maxIntensity) { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { #if QWT_VERSION < 0x060000 d_data[i]->setRange(QwtDoubleInterval(minIntensity, maxIntensity)); #else @@ -395,7 +395,7 @@ WaterfallDisplayPlot::setIntensityRange(const double minIntensity, } double -WaterfallDisplayPlot::getMinIntensity(int which) const +WaterfallDisplayPlot::getMinIntensity(unsigned int which) const { #if QWT_VERSION < 0x060000 QwtDoubleInterval r = d_data[which]->range(); @@ -407,7 +407,7 @@ WaterfallDisplayPlot::getMinIntensity(int which) const } double -WaterfallDisplayPlot::getMaxIntensity(int which) const +WaterfallDisplayPlot::getMaxIntensity(unsigned int which) const { #if QWT_VERSION < 0x060000 QwtDoubleInterval r = d_data[which]->range(); @@ -460,20 +460,20 @@ WaterfallDisplayPlot::replot() void WaterfallDisplayPlot::clearData() { - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_data[i]->reset(); } } int -WaterfallDisplayPlot::getIntensityColorMapType(int which) const +WaterfallDisplayPlot::getIntensityColorMapType(unsigned int which) const { return d_intensity_color_map_type[which]; } void -WaterfallDisplayPlot::setIntensityColorMapType(const int which, +WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which, const int newType, const QColor lowColor, const QColor highColor) @@ -599,13 +599,13 @@ WaterfallDisplayPlot::getUserDefinedHighIntensityColor() const } int -WaterfallDisplayPlot::getAlpha(int which) +WaterfallDisplayPlot::getAlpha(unsigned int which) { return d_spectrogram[which]->alpha(); } void -WaterfallDisplayPlot::setAlpha(int which, int alpha) +WaterfallDisplayPlot::setAlpha(unsigned int which, int alpha) { d_spectrogram[which]->setAlpha(alpha); } @@ -625,7 +625,7 @@ WaterfallDisplayPlot::_updateIntensityRangeDisplay() rightAxis->setTitle(colorBarTitle); rightAxis->setColorBarEnabled(true); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { #if QWT_VERSION < 0x060000 rightAxis->setColorMap(d_spectrogram[i]->data()->range(), d_spectrogram[i]->colorMap()); diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc index c0629d5b99..5c9c447cc9 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.cc +++ b/gr-qtgui/lib/ber_sink_b_impl.cc @@ -214,37 +214,37 @@ namespace gr { } void - ber_sink_b_impl::set_line_label(int which, const std::string &label) + ber_sink_b_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - ber_sink_b_impl::set_line_color(int which, const std::string &color) + ber_sink_b_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - ber_sink_b_impl::set_line_width(int which, int width) + ber_sink_b_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - ber_sink_b_impl::set_line_style(int which, int style) + ber_sink_b_impl::set_line_style(unsigned int which, int style) { d_main_gui->setLineStyle(which, (Qt::PenStyle)style); } void - ber_sink_b_impl::set_line_marker(int which, int marker) + ber_sink_b_impl::set_line_marker(unsigned int which, int marker) { d_main_gui->setLineMarker(which, (QwtSymbol::Style)marker); } void - ber_sink_b_impl::set_line_alpha(int which, double alpha) + ber_sink_b_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setMarkerAlpha(which, (int)(255.0*alpha)); } @@ -262,37 +262,37 @@ namespace gr { } std::string - ber_sink_b_impl::line_label(int which) + ber_sink_b_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - ber_sink_b_impl::line_color(int which) + ber_sink_b_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - ber_sink_b_impl::line_width(int which) + ber_sink_b_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - ber_sink_b_impl::line_style(int which) + ber_sink_b_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - ber_sink_b_impl::line_marker(int which) + ber_sink_b_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } double - ber_sink_b_impl::line_alpha(int which) + ber_sink_b_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } diff --git a/gr-qtgui/lib/ber_sink_b_impl.h b/gr-qtgui/lib/ber_sink_b_impl.h index 23957230ed..b70d6e7b97 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.h +++ b/gr-qtgui/lib/ber_sink_b_impl.h @@ -75,21 +75,21 @@ namespace gr { void set_update_time(double t); void set_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, int style); - void set_line_marker(int which, int marker); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, int style); + void set_line_marker(unsigned int which, int marker); - void set_line_alpha(int which, double alpha); + void set_line_alpha(unsigned int which, double alpha); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); void set_size(int width, int height); diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 7cfd689189..af9cc1034a 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -206,37 +206,37 @@ namespace gr { } void - const_sink_c_impl::set_line_label(int which, const std::string &label) + const_sink_c_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - const_sink_c_impl::set_line_color(int which, const std::string &color) + const_sink_c_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - const_sink_c_impl::set_line_width(int which, int width) + const_sink_c_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - const_sink_c_impl::set_line_style(int which, int style) + const_sink_c_impl::set_line_style(unsigned int which, int style) { d_main_gui->setLineStyle(which, (Qt::PenStyle)style); } void - const_sink_c_impl::set_line_marker(int which, int marker) + const_sink_c_impl::set_line_marker(unsigned int which, int marker) { d_main_gui->setLineMarker(which, (QwtSymbol::Style)marker); } void - const_sink_c_impl::set_line_alpha(int which, double alpha) + const_sink_c_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setMarkerAlpha(which, (int)(255.0*alpha)); } @@ -280,37 +280,37 @@ namespace gr { } std::string - const_sink_c_impl::line_label(int which) + const_sink_c_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - const_sink_c_impl::line_color(int which) + const_sink_c_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - const_sink_c_impl::line_width(int which) + const_sink_c_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - const_sink_c_impl::line_style(int which) + const_sink_c_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - const_sink_c_impl::line_marker(int which) + const_sink_c_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } double - const_sink_c_impl::line_alpha(int which) + const_sink_c_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index 54fa39f27d..ddaa0116a8 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -94,24 +94,24 @@ namespace gr { void set_update_time(double t); void set_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, int style); - void set_line_marker(int which, int marker); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, int style); + void set_line_marker(unsigned int which, int marker); void set_nsamps(const int size); - void set_line_alpha(int which, double alpha); + void set_line_alpha(unsigned int which, double alpha); void set_trigger_mode(trigger_mode mode, trigger_slope slope, float level, int channel, const std::string &tag_key=""); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); void set_size(int width, int height); diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc index d4e86b1768..d8129551b1 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -68,7 +68,7 @@ DisplayForm::DisplayForm(int nplots, QWidget* parent) d_menu->addAction(d_grid_act); d_menu->addAction(d_axislabelsmenu); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_line_title_act.push_back(new LineTitleAction(i, this)); d_line_color_menu.push_back(new LineColorMenu(i, this)); d_line_width_menu.push_back(new LineWidthMenu(i, this)); @@ -162,7 +162,7 @@ DisplayForm::mousePressEvent( QMouseEvent * e) d_stop_act->setText(tr("Start")); // Update the line titles if changed externally - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_lines_menu[i]->setTitle(d_display_plot->getLineLabel(i)); } d_menu->exec(e->globalPos()); @@ -219,13 +219,13 @@ DisplayForm::setTitle(const QString &title) } void -DisplayForm::setLineLabel(int which, const QString &label) +DisplayForm::setLineLabel(unsigned int which, const QString &label) { d_display_plot->setLineLabel(which, label); } void -DisplayForm::setLineColor(int which, const QString &color) +DisplayForm::setLineColor(unsigned int which, const QString &color) { QColor c = QColor(color); d_display_plot->setLineColor(which, c); @@ -233,28 +233,28 @@ DisplayForm::setLineColor(int which, const QString &color) } void -DisplayForm::setLineWidth(int which, int width) +DisplayForm::setLineWidth(unsigned int which, int width) { d_display_plot->setLineWidth(which, width); d_display_plot->replot(); } void -DisplayForm::setLineStyle(int which, Qt::PenStyle style) +DisplayForm::setLineStyle(unsigned int which, Qt::PenStyle style) { d_display_plot->setLineStyle(which, style); d_display_plot->replot(); } void -DisplayForm::setLineMarker(int which, QwtSymbol::Style marker) +DisplayForm::setLineMarker(unsigned int which, QwtSymbol::Style marker) { d_display_plot->setLineMarker(which, marker); d_display_plot->replot(); } void -DisplayForm::setMarkerAlpha(int which, int alpha) +DisplayForm::setMarkerAlpha(unsigned int which, int alpha) { d_display_plot->setMarkerAlpha(which, alpha); d_display_plot->replot(); @@ -267,37 +267,37 @@ DisplayForm::title() } QString -DisplayForm::lineLabel(int which) +DisplayForm::lineLabel(unsigned int which) { return d_display_plot->getLineLabel(which); } QString -DisplayForm::lineColor(int which) +DisplayForm::lineColor(unsigned int which) { return d_display_plot->getLineColor(which).name(); } int -DisplayForm::lineWidth(int which) +DisplayForm::lineWidth(unsigned int which) { return d_display_plot->getLineWidth(which); } Qt::PenStyle -DisplayForm::lineStyle(int which) +DisplayForm::lineStyle(unsigned int which) { return d_display_plot->getLineStyle(which); } QwtSymbol::Style -DisplayForm::lineMarker(int which) +DisplayForm::lineMarker(unsigned int which) { return d_display_plot->getLineMarker(which); } int -DisplayForm::markerAlpha(int which) +DisplayForm::markerAlpha(unsigned int which) { return d_display_plot->getMarkerAlpha(which); } diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index afd4f91d98..9b627eb3ec 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -288,37 +288,37 @@ namespace gr { } void - freq_sink_c_impl::set_line_label(int which, const std::string &label) + freq_sink_c_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - freq_sink_c_impl::set_line_color(int which, const std::string &color) + freq_sink_c_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - freq_sink_c_impl::set_line_width(int which, int width) + freq_sink_c_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - freq_sink_c_impl::set_line_style(int which, int style) + freq_sink_c_impl::set_line_style(unsigned int which, int style) { d_main_gui->setLineStyle(which, (Qt::PenStyle)style); } void - freq_sink_c_impl::set_line_marker(int which, int marker) + freq_sink_c_impl::set_line_marker(unsigned int which, int marker) { d_main_gui->setLineMarker(which, (QwtSymbol::Style)marker); } void - freq_sink_c_impl::set_line_alpha(int which, double alpha) + freq_sink_c_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setMarkerAlpha(which, (int)(255.0*alpha)); } @@ -359,37 +359,37 @@ namespace gr { } std::string - freq_sink_c_impl::line_label(int which) + freq_sink_c_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - freq_sink_c_impl::line_color(int which) + freq_sink_c_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - freq_sink_c_impl::line_width(int which) + freq_sink_c_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - freq_sink_c_impl::line_style(int which) + freq_sink_c_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - freq_sink_c_impl::line_marker(int which) + freq_sink_c_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } double - freq_sink_c_impl::line_alpha(int which) + freq_sink_c_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index 9dcde0887e..ae45b5702d 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -125,23 +125,23 @@ namespace gr { void set_title(const std::string &title); void set_y_label(const std::string &label, const std::string &unit); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, int style); - void set_line_marker(int which, int marker); - void set_line_alpha(int which, double alpha); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, int style); + void set_line_marker(unsigned int which, int marker); + void set_line_alpha(unsigned int which, double alpha); void set_trigger_mode(trigger_mode mode, float level, int channel, const std::string &tag_key=""); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); void set_size(int width, int height); diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index c131b89bf6..33b39de3b1 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -287,37 +287,37 @@ namespace gr { } void - freq_sink_f_impl::set_line_label(int which, const std::string &label) + freq_sink_f_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - freq_sink_f_impl::set_line_color(int which, const std::string &color) + freq_sink_f_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - freq_sink_f_impl::set_line_width(int which, int width) + freq_sink_f_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - freq_sink_f_impl::set_line_style(int which, int style) + freq_sink_f_impl::set_line_style(unsigned int which, int style) { d_main_gui->setLineStyle(which, (Qt::PenStyle)style); } void - freq_sink_f_impl::set_line_marker(int which, int marker) + freq_sink_f_impl::set_line_marker(unsigned int which, int marker) { d_main_gui->setLineMarker(which, (QwtSymbol::Style)marker); } void - freq_sink_f_impl::set_line_alpha(int which, double alpha) + freq_sink_f_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setMarkerAlpha(which, (int)(255.0*alpha)); } @@ -364,37 +364,37 @@ namespace gr { } std::string - freq_sink_f_impl::line_label(int which) + freq_sink_f_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - freq_sink_f_impl::line_color(int which) + freq_sink_f_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - freq_sink_f_impl::line_width(int which) + freq_sink_f_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - freq_sink_f_impl::line_style(int which) + freq_sink_f_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - freq_sink_f_impl::line_marker(int which) + freq_sink_f_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } double - freq_sink_f_impl::line_alpha(int which) + freq_sink_f_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index 782bdb5626..cea22136d0 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -124,24 +124,24 @@ namespace gr { void set_update_time(double t); void set_title(const std::string &title); void set_y_label(const std::string &label, const std::string &unit); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, int style); - void set_line_marker(int which, int marker); - void set_line_alpha(int which, double alpha); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, int style); + void set_line_marker(unsigned int which, int marker); + void set_line_alpha(unsigned int which, double alpha); void set_plot_pos_half(bool half); void set_trigger_mode(trigger_mode mode, float level, int channel, const std::string &tag_key=""); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); void set_size(int width, int height); diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index c08df37e7d..004ff535a6 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -198,37 +198,37 @@ namespace gr { } void - histogram_sink_f_impl::set_line_label(int which, const std::string &label) + histogram_sink_f_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - histogram_sink_f_impl::set_line_color(int which, const std::string &color) + histogram_sink_f_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - histogram_sink_f_impl::set_line_width(int which, int width) + histogram_sink_f_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - histogram_sink_f_impl::set_line_style(int which, int style) + histogram_sink_f_impl::set_line_style(unsigned int which, int style) { d_main_gui->setLineStyle(which, (Qt::PenStyle)style); } void - histogram_sink_f_impl::set_line_marker(int which, int marker) + histogram_sink_f_impl::set_line_marker(unsigned int which, int marker) { d_main_gui->setLineMarker(which, (QwtSymbol::Style)marker); } void - histogram_sink_f_impl::set_line_alpha(int which, double alpha) + histogram_sink_f_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setMarkerAlpha(which, (int)(255.0*alpha)); } @@ -246,37 +246,37 @@ namespace gr { } std::string - histogram_sink_f_impl::line_label(int which) + histogram_sink_f_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - histogram_sink_f_impl::line_color(int which) + histogram_sink_f_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - histogram_sink_f_impl::line_width(int which) + histogram_sink_f_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - histogram_sink_f_impl::line_style(int which) + histogram_sink_f_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - histogram_sink_f_impl::line_marker(int which) + histogram_sink_f_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } double - histogram_sink_f_impl::line_alpha(int which) + histogram_sink_f_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index 27c0017915..342167714c 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -81,23 +81,23 @@ namespace gr { void set_x_axis(double min, double max); void set_update_time(double t); void set_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, int style); - void set_line_marker(int which, int marker); - void set_line_alpha(int which, double alpha); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, int style); + void set_line_marker(unsigned int which, int marker); + void set_line_alpha(unsigned int which, double alpha); void set_nsamps(const int newsize); void set_bins(const int bins); void enable_axis_labels(bool en); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); void set_size(int width, int height); diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index 129e6462f3..9eb52a159a 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -179,7 +179,7 @@ namespace gr { } void - number_sink_impl::set_color(int which, + number_sink_impl::set_color(unsigned int which, const std::string &min, const std::string &max) { @@ -189,25 +189,25 @@ namespace gr { } void - number_sink_impl::set_color(int which, int min, int max) + number_sink_impl::set_color(unsigned int which, int min, int max) { d_main_gui->setColor(which, QColor(min), QColor(max)); } void - number_sink_impl::set_label(int which, const std::string &label) + number_sink_impl::set_label(unsigned int which, const std::string &label) { d_main_gui->setLabel(which, label); } void - number_sink_impl::set_min(int which, float min) + number_sink_impl::set_min(unsigned int which, float min) { d_main_gui->setScaleMin(which, min); } void - number_sink_impl::set_max(int which, float max) + number_sink_impl::set_max(unsigned int which, float max) { d_main_gui->setScaleMax(which, max); } @@ -219,13 +219,13 @@ namespace gr { } void - number_sink_impl::set_unit(int which, const std::string &unit) + number_sink_impl::set_unit(unsigned int which, const std::string &unit) { d_main_gui->setUnit(which, unit); } void - number_sink_impl::set_factor(int which, float factor) + number_sink_impl::set_factor(unsigned int which, float factor) { d_main_gui->setFactor(which, factor); } @@ -243,31 +243,31 @@ namespace gr { } std::string - number_sink_impl::color_min(int which) const + number_sink_impl::color_min(unsigned int which) const { return d_main_gui->colorMin(which).name().toStdString(); } std::string - number_sink_impl::color_max(int which) const + number_sink_impl::color_max(unsigned int which) const { return d_main_gui->colorMax(which).name().toStdString(); } std::string - number_sink_impl::label(int which) const + number_sink_impl::label(unsigned int which) const { return d_main_gui->label(which); } float - number_sink_impl::min(int which) const + number_sink_impl::min(unsigned int which) const { return d_main_gui->scaleMin(which); } float - number_sink_impl::max(int which) const + number_sink_impl::max(unsigned int which) const { return d_main_gui->scaleMax(which); } @@ -279,13 +279,13 @@ namespace gr { } std::string - number_sink_impl::unit(int which) const + number_sink_impl::unit(unsigned int which) const { return d_main_gui->unit(which); } float - number_sink_impl::factor(int which) const + number_sink_impl::factor(unsigned int which) const { return d_main_gui->factor(which); } diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h index e17d409f32..4b92f15969 100644 --- a/gr-qtgui/lib/number_sink_impl.h +++ b/gr-qtgui/lib/number_sink_impl.h @@ -85,27 +85,27 @@ namespace gr { void set_update_time(double t); void set_average(const float avg); void set_graph_type(const graph_t type); - void set_color(int which, + void set_color(unsigned int which, const std::string &min, const std::string &max); - void set_color(int which, int min, int max); - void set_label(int which, const std::string &label); - void set_min(int which, float min); - void set_max(int which, float max); + void set_color(unsigned int which, int min, int max); + void set_label(unsigned int which, const std::string &label); + void set_min(unsigned int which, float min); + void set_max(unsigned int which, float max); void set_title(const std::string &title); - void set_unit(int which, const std::string &unit); - void set_factor(int which, float factor); + void set_unit(unsigned int which, const std::string &unit); + void set_factor(unsigned int which, float factor); float average() const; graph_t graph_type() const; - std::string color_min(int which) const; - std::string color_max(int which) const; - std::string label(int which) const; - float min(int which) const; - float max(int which) const; + std::string color_min(unsigned int which) const; + std::string color_max(unsigned int which) const; + std::string label(unsigned int which) const; + float min(unsigned int which) const; + float max(unsigned int which) const; std::string title() const; - std::string unit(int which) const; - float factor(int which) const; + std::string unit(unsigned int which) const; + float factor(unsigned int which) const; void enable_menu(bool en); void enable_autoscale(bool en=true); diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index 33b5076be0..0f64156939 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -37,7 +37,7 @@ NumberDisplayForm::NumberDisplayForm(int nplots, gr::qtgui::graph_t type, d_graph_type = type; d_title = new QLabel(QString("")); d_layout = new QGridLayout(this); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_min.push_back(+1e32); d_max.push_back(-1e32); d_label.push_back(new QLabel(QString("Data %1").arg(i))); @@ -98,7 +98,7 @@ NumberDisplayForm::NumberDisplayForm(int nplots, gr::qtgui::graph_t type, d_menu->addAction(d_stop_act); // Menu items for each number line - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_label_act.push_back(new LineTitleAction(i, this)); connect(d_label_act[i], SIGNAL(whichTrigger(int, const QString&)), this, SLOT(setLabel(int, const QString&))); @@ -169,7 +169,7 @@ NumberDisplayForm::mousePressEvent(QMouseEvent * e) d_stop_act->setText(tr("Start")); // Update the line titles if changed externally - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_label_menu[i]->setTitle(label(i).c_str()); } d_menu->exec(e->globalPos()); @@ -240,7 +240,7 @@ NumberDisplayForm::newData(const QEvent* updateEvent) NumberUpdateEvent *tevent = (NumberUpdateEvent*)updateEvent; const std::vector<float> samples = tevent->getSamples(); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { float f = d_factor[i]*samples[i]; d_text_box[i]->setText(QString("%1 %2").arg(f, 4, ' ').\ arg(QString(d_unit[i].c_str()))); @@ -283,7 +283,7 @@ NumberDisplayForm::setGraphType(const gr::qtgui::graph_t type) } d_graph_type = type; - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { switch(d_graph_type) { case(gr::qtgui::NUM_GRAPH_HORIZ): #if QWT_VERSION < 0x060100 @@ -319,7 +319,7 @@ NumberDisplayForm::setGraphType(const gr::qtgui::graph_t type) } void -NumberDisplayForm::setColor(int which, const QColor &min, const QColor &max) +NumberDisplayForm::setColor(unsigned int which, const QColor &min, const QColor &max) { QwtLinearColorMap *map = new QwtLinearColorMap(); map->setColorInterval(min, max); @@ -332,25 +332,25 @@ NumberDisplayForm::setColor(int which, const QColor &min, const QColor &max) } void -NumberDisplayForm::setColorMin(int which, QString min) +NumberDisplayForm::setColorMin(unsigned int which, QString min) { setColor(which, QColor(min), colorMax(which)); } void -NumberDisplayForm::setColorMax(int which, QString max) +NumberDisplayForm::setColorMax(unsigned int which, QString max) { setColor(which, colorMin(which), QColor(max)); } void -NumberDisplayForm::setLabel(int which, const std::string &label) +NumberDisplayForm::setLabel(unsigned int which, const std::string &label) { d_label[which]->setText(label.c_str()); } void -NumberDisplayForm::setLabel(int which, QString label) +NumberDisplayForm::setLabel(unsigned int which, QString label) { d_label[which]->setText(label); } @@ -374,7 +374,7 @@ NumberDisplayForm::setUpdateTime(QString time) } void -NumberDisplayForm::setScale(int which, int min, int max) +NumberDisplayForm::setScale(unsigned int which, int min, int max) { d_min[which] = min; d_max[which] = max; @@ -385,13 +385,13 @@ NumberDisplayForm::setScale(int which, int min, int max) } void -NumberDisplayForm::setScaleMin(int which, int min) +NumberDisplayForm::setScaleMin(unsigned int which, int min) { setScale(which, min, d_max[which]); } void -NumberDisplayForm::setScaleMax(int which, int max) +NumberDisplayForm::setScaleMax(unsigned int which, int max) { setScale(which, d_min[which], max); } @@ -403,7 +403,7 @@ NumberDisplayForm::graphType() const } QColor -NumberDisplayForm::colorMin(int which) const +NumberDisplayForm::colorMin(unsigned int which) const { #if QWT_VERSION < 0x060000 return d_indicator[which]->fillColor(); @@ -414,7 +414,7 @@ NumberDisplayForm::colorMin(int which) const } QColor -NumberDisplayForm::colorMax(int which) const +NumberDisplayForm::colorMax(unsigned int which) const { #if QWT_VERSION < 0x060000 return d_indicator[which]->fillColor(); @@ -425,7 +425,7 @@ NumberDisplayForm::colorMax(int which) const } std::string -NumberDisplayForm::label(int which) const +NumberDisplayForm::label(unsigned int which) const { return d_label[which]->text().toStdString(); } @@ -443,13 +443,13 @@ NumberDisplayForm::updateTime() const } int -NumberDisplayForm::scaleMin(int which) +NumberDisplayForm::scaleMin(unsigned int which) { return d_min[which]; } int -NumberDisplayForm::scaleMax(int which) +NumberDisplayForm::scaleMax(unsigned int which) { return d_max[which]; } @@ -461,7 +461,7 @@ NumberDisplayForm::autoScale(bool on) d_autoscale_act->setChecked(on); // Reset the autoscale limits - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_min[i] = +1e32; d_max[i] = -1e32; } @@ -484,7 +484,7 @@ NumberDisplayForm::setTitle(const std::string &title) } std::string -NumberDisplayForm::unit(int which) const +NumberDisplayForm::unit(unsigned int which) const { if(static_cast<size_t>(which) >= d_unit.size()) throw std::runtime_error("NumberDisplayForm::units: invalid 'which'.\n"); @@ -493,7 +493,7 @@ NumberDisplayForm::unit(int which) const } void -NumberDisplayForm::setUnit(int which, const std::string &unit) +NumberDisplayForm::setUnit(unsigned int which, const std::string &unit) { if(static_cast<size_t>(which) >= d_unit.size()) throw std::runtime_error("NumberDisplayForm::setUnits: invalid 'which'.\n"); @@ -502,7 +502,7 @@ NumberDisplayForm::setUnit(int which, const std::string &unit) } float -NumberDisplayForm::factor(int which) const +NumberDisplayForm::factor(unsigned int which) const { if(static_cast<size_t>(which) >= d_factor.size()) throw std::runtime_error("NumberDisplayForm::factor: invalid 'which'.\n"); @@ -511,7 +511,7 @@ NumberDisplayForm::factor(int which) const } void -NumberDisplayForm::setFactor(int which, float factor) +NumberDisplayForm::setFactor(unsigned int which, float factor) { if(static_cast<size_t>(which) >= d_factor.size()) throw std::runtime_error("NumberDisplayForm::setFactor: invalid 'which'.\n"); diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index b8e55ae724..dcf42896a5 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -205,43 +205,43 @@ namespace gr { } void - time_raster_sink_b_impl::set_line_label(int which, const std::string &label) + time_raster_sink_b_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - time_raster_sink_b_impl::set_line_color(int which, const std::string &color) + time_raster_sink_b_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - time_raster_sink_b_impl::set_line_width(int which, int width) + time_raster_sink_b_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - time_raster_sink_b_impl::set_line_style(int which, Qt::PenStyle style) + time_raster_sink_b_impl::set_line_style(unsigned int which, Qt::PenStyle style) { d_main_gui->setLineStyle(which, style); } void - time_raster_sink_b_impl::set_line_marker(int which, QwtSymbol::Style marker) + time_raster_sink_b_impl::set_line_marker(unsigned int which, QwtSymbol::Style marker) { d_main_gui->setLineMarker(which, marker); } void - time_raster_sink_b_impl::set_color_map(int which, const int color) + time_raster_sink_b_impl::set_color_map(unsigned int which, const int color) { d_main_gui->setColorMap(which, color); } void - time_raster_sink_b_impl::set_line_alpha(int which, double alpha) + time_raster_sink_b_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setAlpha(which, (int)(255.0*alpha)); } @@ -299,43 +299,43 @@ namespace gr { } std::string - time_raster_sink_b_impl::line_label(int which) + time_raster_sink_b_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - time_raster_sink_b_impl::line_color(int which) + time_raster_sink_b_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - time_raster_sink_b_impl::line_width(int which) + time_raster_sink_b_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - time_raster_sink_b_impl::line_style(int which) + time_raster_sink_b_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - time_raster_sink_b_impl::line_marker(int which) + time_raster_sink_b_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } int - time_raster_sink_b_impl::color_map(int which) + time_raster_sink_b_impl::color_map(unsigned int which) { return d_main_gui->getColorMap(which); } double - time_raster_sink_b_impl::line_alpha(int which) + time_raster_sink_b_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 1bfe3d68bb..066f908e4f 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -89,22 +89,22 @@ namespace gr { void set_update_time(double t); void set_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, Qt::PenStyle style); - void set_line_marker(int which, QwtSymbol::Style marker); - void set_line_alpha(int which, double alpha); - void set_color_map(int which, const int color); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, Qt::PenStyle style); + void set_line_marker(unsigned int which, QwtSymbol::Style marker); + void set_line_alpha(unsigned int which, double alpha); + void set_color_map(unsigned int which, const int color); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); - int color_map(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); + int color_map(unsigned int which); void set_size(int width, int height); diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index 5b23f98235..d2a2bdad02 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -203,43 +203,43 @@ namespace gr { } void - time_raster_sink_f_impl::set_line_label(int which, const std::string &label) + time_raster_sink_f_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - time_raster_sink_f_impl::set_line_color(int which, const std::string &color) + time_raster_sink_f_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - time_raster_sink_f_impl::set_line_width(int which, int width) + time_raster_sink_f_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - time_raster_sink_f_impl::set_line_style(int which, Qt::PenStyle style) + time_raster_sink_f_impl::set_line_style(unsigned int which, Qt::PenStyle style) { d_main_gui->setLineStyle(which, style); } void - time_raster_sink_f_impl::set_line_marker(int which, QwtSymbol::Style marker) + time_raster_sink_f_impl::set_line_marker(unsigned int which, QwtSymbol::Style marker) { d_main_gui->setLineMarker(which, marker); } void - time_raster_sink_f_impl::set_color_map(int which, const int color) + time_raster_sink_f_impl::set_color_map(unsigned int which, const int color) { d_main_gui->setColorMap(which, color); } void - time_raster_sink_f_impl::set_line_alpha(int which, double alpha) + time_raster_sink_f_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setAlpha(which, (int)(255.0*alpha)); } @@ -299,43 +299,43 @@ namespace gr { } std::string - time_raster_sink_f_impl::line_label(int which) + time_raster_sink_f_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - time_raster_sink_f_impl::line_color(int which) + time_raster_sink_f_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - time_raster_sink_f_impl::line_width(int which) + time_raster_sink_f_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - time_raster_sink_f_impl::line_style(int which) + time_raster_sink_f_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - time_raster_sink_f_impl::line_marker(int which) + time_raster_sink_f_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } int - time_raster_sink_f_impl::color_map(int which) + time_raster_sink_f_impl::color_map(unsigned int which) { return d_main_gui->getColorMap(which); } double - time_raster_sink_f_impl::line_alpha(int which) + time_raster_sink_f_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index 31ac460d03..1e2777453a 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -88,22 +88,22 @@ namespace gr { void set_update_time(double t); void set_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, Qt::PenStyle style); - void set_line_marker(int which, QwtSymbol::Style marker); - void set_line_alpha(int which, double alpha); - void set_color_map(int which, const int color); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, Qt::PenStyle style); + void set_line_marker(unsigned int which, QwtSymbol::Style marker); + void set_line_alpha(unsigned int which, double alpha); + void set_color_map(unsigned int which, const int color); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); - int color_map(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); + int color_map(unsigned int which); void set_size(int width, int height); diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 89fafb7f5a..f138278796 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -41,7 +41,7 @@ namespace gr { time_sink_c::sptr time_sink_c::make(int size, double samp_rate, const std::string &name, - int nconnections, + unsigned int nconnections, QWidget *parent) { return gnuradio::get_initial_sptr @@ -50,7 +50,7 @@ namespace gr { time_sink_c_impl::time_sink_c_impl(int size, double samp_rate, const std::string &name, - int nconnections, + unsigned int nconnections, QWidget *parent) : sync_block("time_sink_c", io_signature::make(0, nconnections, sizeof(gr_complex)), @@ -77,14 +77,14 @@ namespace gr { boost::bind(&time_sink_c_impl::handle_pdus, this, _1)); // +2 for the PDU message buffers - for(int n = 0; n < d_nconnections+2; n++) { + for(unsigned int n = 0; n < d_nconnections+2; n++) { d_buffers.push_back((double*)volk_malloc(d_buffer_size*sizeof(double), volk_get_alignment())); memset(d_buffers[n], 0, d_buffer_size*sizeof(double)); } // We don't use cbuffers with the PDU message handling capabilities. - for(int n = 0; n < d_nconnections/2; n++) { + for(unsigned int n = 0; n < d_nconnections/2; n++) { d_cbuffers.push_back((gr_complex*)volk_malloc(d_buffer_size*sizeof(gr_complex), volk_get_alignment())); memset(d_cbuffers[n], 0, d_buffer_size*sizeof(gr_complex)); @@ -112,10 +112,10 @@ namespace gr { d_main_gui->close(); // d_main_gui is a qwidget destroyed with its parent - for(int n = 0; n < d_nconnections+2; n++) { + for(unsigned int n = 0; n < d_nconnections+2; n++) { volk_free(d_buffers[n]); } - for(int n = 0; n < d_nconnections/2; n++) { + for(unsigned int n = 0; n < d_nconnections/2; n++) { volk_free(d_cbuffers[n]); } @@ -145,7 +145,7 @@ namespace gr { // If a style sheet is set in the prefs file, enable it here. check_set_qss(d_qApplication); - int numplots = (d_nconnections > 0) ? d_nconnections : 2; + unsigned int numplots = (d_nconnections > 0) ? d_nconnections : 2; d_main_gui = new TimeDisplayForm(numplots, d_parent); d_main_gui->setNPoints(d_size); d_main_gui->setSampleRate(d_samp_rate); @@ -215,37 +215,37 @@ namespace gr { } void - time_sink_c_impl::set_line_label(int which, const std::string &label) + time_sink_c_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - time_sink_c_impl::set_line_color(int which, const std::string &color) + time_sink_c_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - time_sink_c_impl::set_line_width(int which, int width) + time_sink_c_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - time_sink_c_impl::set_line_style(int which, int style) + time_sink_c_impl::set_line_style(unsigned int which, int style) { d_main_gui->setLineStyle(which, (Qt::PenStyle)style); } void - time_sink_c_impl::set_line_marker(int which, int marker) + time_sink_c_impl::set_line_marker(unsigned int which, int marker) { d_main_gui->setLineMarker(which, (QwtSymbol::Style)marker); } void - time_sink_c_impl::set_line_alpha(int which, double alpha) + time_sink_c_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setMarkerAlpha(which, (int)(255.0*alpha)); } @@ -298,37 +298,37 @@ namespace gr { } std::string - time_sink_c_impl::line_label(int which) + time_sink_c_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - time_sink_c_impl::line_color(int which) + time_sink_c_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - time_sink_c_impl::line_width(int which) + time_sink_c_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - time_sink_c_impl::line_style(int which) + time_sink_c_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - time_sink_c_impl::line_marker(int which) + time_sink_c_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } double - time_sink_c_impl::line_alpha(int which) + time_sink_c_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } @@ -345,14 +345,14 @@ namespace gr { d_buffer_size = 2*d_size; // Resize buffers and replace data - for(int n = 0; n < d_nconnections+2; n++) { + for(unsigned int n = 0; n < d_nconnections+2; n++) { volk_free(d_buffers[n]); d_buffers[n] = (double*)volk_malloc(d_buffer_size*sizeof(double), volk_get_alignment()); memset(d_buffers[n], 0, d_buffer_size*sizeof(double)); } - for(int n = 0; n < d_nconnections/2; n++) { + for(unsigned int n = 0; n < d_nconnections/2; n++) { volk_free(d_cbuffers[n]); d_cbuffers[n] = (gr_complex*)volk_malloc(d_buffer_size*sizeof(gr_complex), volk_get_alignment()); @@ -432,17 +432,19 @@ namespace gr { } void - time_sink_c_impl::enable_tags(int which, bool en) + time_sink_c_impl::enable_tags(unsigned int which, bool en) { - if(which == -1) { - for(int n = 0; n < d_nconnections; n++) { - d_main_gui->setTagMenu(n, en); - } - } - else d_main_gui->setTagMenu(which, en); } + void + time_sink_c_impl::enable_tags(bool en) + { + for(unsigned int n = 0; n < d_nconnections; ++n) { + d_main_gui->setTagMenu(n, en); + } + } + void time_sink_c_impl::enable_axis_labels(bool en) { @@ -465,7 +467,7 @@ namespace gr { void time_sink_c_impl::_reset() { - int n; + unsigned int n; if(d_trigger_delay) { for(n = 0; n < d_nconnections/2; n++) { // Move the tail of the buffers to the front. This section @@ -633,7 +635,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - int n=0; + unsigned int n=0; const gr_complex *in; _npoints_resize(); diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 92cda21df1..9c82674865 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -39,7 +39,7 @@ namespace gr { int d_size, d_buffer_size; double d_samp_rate; std::string d_name; - int d_nconnections; + unsigned int d_nconnections; int d_index, d_start, d_end; std::vector<gr_complex*> d_cbuffers; @@ -79,7 +79,7 @@ namespace gr { public: time_sink_c_impl(int size, double samp_rate, const std::string &name, - int nconnections, + unsigned int nconnections, QWidget *parent=NULL); ~time_sink_c_impl(); @@ -99,25 +99,25 @@ namespace gr { const std::string &unit=""); void set_update_time(double t); void set_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, int style); - void set_line_marker(int which, int marker); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, int style); + void set_line_marker(unsigned int which, int marker); void set_nsamps(const int size); void set_samp_rate(const double samp_rate); - void set_line_alpha(int which, double alpha); + void set_line_alpha(unsigned int which, double alpha); void set_trigger_mode(trigger_mode mode, trigger_slope slope, float level, float delay, int channel, const std::string &tag_key=""); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); void set_size(int width, int height); @@ -130,7 +130,8 @@ namespace gr { void enable_semilogx(bool en); void enable_semilogy(bool en); void enable_control_panel(bool en); - void enable_tags(int which, bool en); + void enable_tags(unsigned int which, bool en); + void enable_tags(bool en); void enable_axis_labels(bool en); void disable_legend(); diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index a1af17cfb5..6b32d71e95 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -43,7 +43,7 @@ namespace gr { time_sink_f::sptr time_sink_f::make(int size, double samp_rate, const std::string &name, - int nconnections, + unsigned int nconnections, QWidget *parent) { return gnuradio::get_initial_sptr @@ -52,7 +52,7 @@ namespace gr { time_sink_f_impl::time_sink_f_impl(int size, double samp_rate, const std::string &name, - int nconnections, + unsigned int nconnections, QWidget *parent) : sync_block("time_sink_f", io_signature::make(0, nconnections, sizeof(float)), @@ -79,7 +79,7 @@ namespace gr { boost::bind(&time_sink_f_impl::handle_pdus, this, _1)); // +1 for the PDU buffer - for(int n = 0; n < d_nconnections+1; n++) { + for(unsigned int n = 0; n < d_nconnections+1; n++) { d_buffers.push_back((double*)volk_malloc(d_buffer_size*sizeof(double), volk_get_alignment())); memset(d_buffers[n], 0, d_buffer_size*sizeof(double)); @@ -111,7 +111,7 @@ namespace gr { d_main_gui->close(); // d_main_gui is a qwidget destroyed with its parent - for(int n = 0; n < d_nconnections+1; n++) { + for(unsigned int n = 0; n < d_nconnections+1; n++) { volk_free(d_buffers[n]); volk_free(d_fbuffers[n]); } @@ -142,7 +142,7 @@ namespace gr { // If a style sheet is set in the prefs file, enable it here. check_set_qss(d_qApplication); - int numplots = (d_nconnections > 0) ? d_nconnections : 1; + unsigned int numplots = (d_nconnections > 0) ? d_nconnections : 1; d_main_gui = new TimeDisplayForm(numplots, d_parent); d_main_gui->setNPoints(d_size); d_main_gui->setSampleRate(d_samp_rate); @@ -212,37 +212,37 @@ namespace gr { } void - time_sink_f_impl::set_line_label(int which, const std::string &label) + time_sink_f_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - time_sink_f_impl::set_line_color(int which, const std::string &color) + time_sink_f_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - time_sink_f_impl::set_line_width(int which, int width) + time_sink_f_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - time_sink_f_impl::set_line_style(int which, int style) + time_sink_f_impl::set_line_style(unsigned int which, int style) { d_main_gui->setLineStyle(which, (Qt::PenStyle)style); } void - time_sink_f_impl::set_line_marker(int which, int marker) + time_sink_f_impl::set_line_marker(unsigned int which, int marker) { d_main_gui->setLineMarker(which, (QwtSymbol::Style)marker); } void - time_sink_f_impl::set_line_alpha(int which, double alpha) + time_sink_f_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setMarkerAlpha(which, (int)(255.0*alpha)); } @@ -295,37 +295,37 @@ namespace gr { } std::string - time_sink_f_impl::line_label(int which) + time_sink_f_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - time_sink_f_impl::line_color(int which) + time_sink_f_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - time_sink_f_impl::line_width(int which) + time_sink_f_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - time_sink_f_impl::line_style(int which) + time_sink_f_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - time_sink_f_impl::line_marker(int which) + time_sink_f_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } double - time_sink_f_impl::line_alpha(int which) + time_sink_f_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } @@ -342,7 +342,7 @@ namespace gr { d_buffer_size = 2*d_size; // Resize buffers and replace data - for(int n = 0; n < d_nconnections+1; n++) { + for(unsigned int n = 0; n < d_nconnections+1; n++) { volk_free(d_buffers[n]); d_buffers[n] = (double*)volk_malloc(d_buffer_size*sizeof(double), volk_get_alignment()); @@ -427,15 +427,17 @@ namespace gr { } void - time_sink_f_impl::enable_tags(int which, bool en) + time_sink_f_impl::enable_tags(unsigned int which, bool en) { - if(which == -1) { - for(int n = 0; n < d_nconnections; n++) { - d_main_gui->setTagMenu(n, en); - } - } - else - d_main_gui->setTagMenu(which, en); + d_main_gui->setTagMenu(which, en); + } + + void + time_sink_f_impl::enable_tags(bool en) + { + for(unsigned int n = 0; n < d_nconnections; ++n) { + d_main_gui->setTagMenu(n, en); + } } void @@ -460,7 +462,7 @@ namespace gr { void time_sink_f_impl::_reset() { - int n; + unsigned int n; if(d_trigger_delay) { for(n = 0; n < d_nconnections; n++) { // Move the tail of the buffers to the front. This section @@ -622,7 +624,7 @@ namespace gr { gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - int n=0, idx=0; + unsigned int n=0, idx=0; const float *in; _npoints_resize(); diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 094c96efab..2cac336ed0 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -39,7 +39,7 @@ namespace gr { int d_size, d_buffer_size; double d_samp_rate; std::string d_name; - int d_nconnections; + unsigned int d_nconnections; int d_index, d_start, d_end; std::vector<float*> d_fbuffers; @@ -79,7 +79,7 @@ namespace gr { public: time_sink_f_impl(int size, double samp_rate, const std::string &name, - int nconnections, + unsigned int nconnections, QWidget *parent=NULL); ~time_sink_f_impl(); @@ -99,25 +99,25 @@ namespace gr { const std::string &unit=""); void set_update_time(double t); void set_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, int style); - void set_line_marker(int which, int marker); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, int style); + void set_line_marker(unsigned int which, int marker); void set_nsamps(const int size); void set_samp_rate(const double samp_rate); - void set_line_alpha(int which, double alpha); + void set_line_alpha(unsigned int which, double alpha); void set_trigger_mode(trigger_mode mode, trigger_slope slope, float level, float delay, int channel, const std::string &tag_key=""); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); void set_size(int width, int height); @@ -130,7 +130,8 @@ namespace gr { void enable_semilogx(bool en); void enable_semilogy(bool en); void enable_control_panel(bool en); - void enable_tags(int which, bool en); + void enable_tags(unsigned int which, bool en); + void enable_tags(bool en); void enable_axis_labels(bool en); void disable_legend(); diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index efb8a4f9fd..50b73980fe 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -85,7 +85,7 @@ TimeDisplayForm::TimeDisplayForm(int nplots, QWidget* parent) connect(d_semilogymenu, SIGNAL(triggered(bool)), this, SLOT(setSemilogy(bool))); - for(int i = 0; i < d_nplots; i++) { + for(unsigned int i = 0; i < d_nplots; ++i) { d_tagsmenu.push_back(new QAction("Show Tag Makers", this)); d_tagsmenu[i]->setCheckable(true); d_tagsmenu[i]->setChecked(true); @@ -346,7 +346,7 @@ TimeDisplayForm::setSemilogy(bool en) } void -TimeDisplayForm::setTagMenu(int which, bool en) +TimeDisplayForm::setTagMenu(unsigned int which, bool en) { getPlot()->enableTagMarker(which, en); d_tagsmenu[which]->setChecked(en); diff --git a/gr-qtgui/lib/timerasterdisplayform.cc b/gr-qtgui/lib/timerasterdisplayform.cc index 5b1d8f5e37..fc577f2e01 100644 --- a/gr-qtgui/lib/timerasterdisplayform.cc +++ b/gr-qtgui/lib/timerasterdisplayform.cc @@ -136,25 +136,25 @@ TimeRasterDisplayForm::numCols() } int -TimeRasterDisplayForm::getColorMap(int which) +TimeRasterDisplayForm::getColorMap(unsigned int which) { return getPlot()->getIntensityColorMapType(which); } int -TimeRasterDisplayForm::getAlpha(int which) +TimeRasterDisplayForm::getAlpha(unsigned int which) { return getPlot()->getAlpha(which); } double -TimeRasterDisplayForm::getMinIntensity(int which) +TimeRasterDisplayForm::getMinIntensity(unsigned int which) { return getPlot()->getMinIntensity(which); } double -TimeRasterDisplayForm::getMaxIntensity(int which) +TimeRasterDisplayForm::getMaxIntensity(unsigned int which) { return getPlot()->getMaxIntensity(which); } @@ -237,7 +237,7 @@ TimeRasterDisplayForm::setSampleRate(const QString &rate) } void -TimeRasterDisplayForm::setColorMap(int which, +TimeRasterDisplayForm::setColorMap(unsigned int which, const int newType, const QColor lowColor, const QColor highColor) @@ -248,7 +248,7 @@ TimeRasterDisplayForm::setColorMap(int which, } void -TimeRasterDisplayForm::setAlpha(int which, int alpha) +TimeRasterDisplayForm::setAlpha(unsigned int which, int alpha) { getPlot()->setAlpha(which, alpha); getPlot()->replot(); diff --git a/gr-qtgui/lib/vector_sink_f_impl.cc b/gr-qtgui/lib/vector_sink_f_impl.cc index ca6a8c3054..031b486862 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.cc +++ b/gr-qtgui/lib/vector_sink_f_impl.cc @@ -275,37 +275,37 @@ namespace gr { } void - vector_sink_f_impl::set_line_label(int which, const std::string &label) + vector_sink_f_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - vector_sink_f_impl::set_line_color(int which, const std::string &color) + vector_sink_f_impl::set_line_color(unsigned int which, const std::string &color) { d_main_gui->setLineColor(which, color.c_str()); } void - vector_sink_f_impl::set_line_width(int which, int width) + vector_sink_f_impl::set_line_width(unsigned int which, int width) { d_main_gui->setLineWidth(which, width); } void - vector_sink_f_impl::set_line_style(int which, int style) + vector_sink_f_impl::set_line_style(unsigned int which, int style) { d_main_gui->setLineStyle(which, (Qt::PenStyle)style); } void - vector_sink_f_impl::set_line_marker(int which, int marker) + vector_sink_f_impl::set_line_marker(unsigned int which, int marker) { d_main_gui->setLineMarker(which, (QwtSymbol::Style)marker); } void - vector_sink_f_impl::set_line_alpha(int which, double alpha) + vector_sink_f_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setMarkerAlpha(which, (int)(255.0*alpha)); } @@ -323,37 +323,37 @@ namespace gr { } std::string - vector_sink_f_impl::line_label(int which) + vector_sink_f_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } std::string - vector_sink_f_impl::line_color(int which) + vector_sink_f_impl::line_color(unsigned int which) { return d_main_gui->lineColor(which).toStdString(); } int - vector_sink_f_impl::line_width(int which) + vector_sink_f_impl::line_width(unsigned int which) { return d_main_gui->lineWidth(which); } int - vector_sink_f_impl::line_style(int which) + vector_sink_f_impl::line_style(unsigned int which) { return d_main_gui->lineStyle(which); } int - vector_sink_f_impl::line_marker(int which) + vector_sink_f_impl::line_marker(unsigned int which) { return d_main_gui->lineMarker(which); } double - vector_sink_f_impl::line_alpha(int which) + vector_sink_f_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } diff --git a/gr-qtgui/lib/vector_sink_f_impl.h b/gr-qtgui/lib/vector_sink_f_impl.h index 6abd61d170..3c10b94b20 100644 --- a/gr-qtgui/lib/vector_sink_f_impl.h +++ b/gr-qtgui/lib/vector_sink_f_impl.h @@ -108,20 +108,20 @@ namespace gr { void set_update_time(double t); void set_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_color(int which, const std::string &color); - void set_line_width(int which, int width); - void set_line_style(int which, int style); - void set_line_marker(int which, int marker); - void set_line_alpha(int which, double alpha); + void set_line_label(unsigned int which, const std::string &label); + void set_line_color(unsigned int which, const std::string &color); + void set_line_width(unsigned int which, int width); + void set_line_style(unsigned int which, int style); + void set_line_marker(unsigned int which, int marker); + void set_line_alpha(unsigned int which, double alpha); std::string title(); - std::string line_label(int which); - std::string line_color(int which); - int line_width(int which); - int line_style(int which); - int line_marker(int which); - double line_alpha(int which); + std::string line_label(unsigned int which); + std::string line_color(unsigned int which); + int line_width(unsigned int which); + int line_style(unsigned int which); + int line_marker(unsigned int which); + double line_alpha(unsigned int which); void set_size(int width, int height); diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index 50611dccc6..db81e6ed52 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -289,19 +289,19 @@ namespace gr { } void - waterfall_sink_c_impl::set_line_label(int which, const std::string &label) + waterfall_sink_c_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - waterfall_sink_c_impl::set_color_map(int which, const int color) + waterfall_sink_c_impl::set_color_map(unsigned int which, const int color) { d_main_gui->setColorMap(which, color); } void - waterfall_sink_c_impl::set_line_alpha(int which, double alpha) + waterfall_sink_c_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setAlpha(which, (int)(255.0*alpha)); } @@ -319,19 +319,19 @@ namespace gr { } std::string - waterfall_sink_c_impl::line_label(int which) + waterfall_sink_c_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } int - waterfall_sink_c_impl::color_map(int which) + waterfall_sink_c_impl::color_map(unsigned int which) { return d_main_gui->getColorMap(which); } double - waterfall_sink_c_impl::line_alpha(int which) + waterfall_sink_c_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->markerAlpha(which))/255.0; } @@ -343,13 +343,13 @@ namespace gr { } double - waterfall_sink_c_impl::min_intensity(int which) + waterfall_sink_c_impl::min_intensity(unsigned int which) { return d_main_gui->getMinIntensity(which); } double - waterfall_sink_c_impl::max_intensity(int which) + waterfall_sink_c_impl::max_intensity(unsigned int which) { return d_main_gui->getMaxIntensity(which); } diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index c6e7236c37..e274a189a1 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -115,20 +115,20 @@ namespace gr { void set_time_per_fft(double t); void set_title(const std::string &title); void set_time_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_alpha(int which, double alpha); - void set_color_map(int which, const int color); + void set_line_label(unsigned int which, const std::string &label); + void set_line_alpha(unsigned int which, double alpha); + void set_color_map(unsigned int which, const int color); std::string title(); - std::string line_label(int which); - double line_alpha(int which); - int color_map(int which); + std::string line_label(unsigned int which); + double line_alpha(unsigned int which); + int color_map(unsigned int which); void set_size(int width, int height); void auto_scale(); - double min_intensity(int which); - double max_intensity(int which); + double min_intensity(unsigned int which); + double max_intensity(unsigned int which); void enable_menu(bool en); void enable_grid(bool en); diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index f1df670029..4991d48fd7 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -289,19 +289,19 @@ namespace gr { } void - waterfall_sink_f_impl::set_line_label(int which, const std::string &label) + waterfall_sink_f_impl::set_line_label(unsigned int which, const std::string &label) { d_main_gui->setLineLabel(which, label.c_str()); } void - waterfall_sink_f_impl::set_color_map(int which, const int color) + waterfall_sink_f_impl::set_color_map(unsigned int which, const int color) { d_main_gui->setColorMap(which, color); } void - waterfall_sink_f_impl::set_line_alpha(int which, double alpha) + waterfall_sink_f_impl::set_line_alpha(unsigned int which, double alpha) { d_main_gui->setAlpha(which, (int)(255.0*alpha)); } @@ -325,19 +325,19 @@ namespace gr { } std::string - waterfall_sink_f_impl::line_label(int which) + waterfall_sink_f_impl::line_label(unsigned int which) { return d_main_gui->lineLabel(which).toStdString(); } int - waterfall_sink_f_impl::color_map(int which) + waterfall_sink_f_impl::color_map(unsigned int which) { return d_main_gui->getColorMap(which); } double - waterfall_sink_f_impl::line_alpha(int which) + waterfall_sink_f_impl::line_alpha(unsigned int which) { return (double)(d_main_gui->getAlpha(which))/255.0; } @@ -349,13 +349,13 @@ namespace gr { } double - waterfall_sink_f_impl::min_intensity(int which) + waterfall_sink_f_impl::min_intensity(unsigned int which) { return d_main_gui->getMinIntensity(which); } double - waterfall_sink_f_impl::max_intensity(int which) + waterfall_sink_f_impl::max_intensity(unsigned int which) { return d_main_gui->getMaxIntensity(which); } diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index fb6fdddc0e..cff4ef1778 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -115,21 +115,21 @@ namespace gr { void set_time_per_fft(double t); void set_title(const std::string &title); void set_time_title(const std::string &title); - void set_line_label(int which, const std::string &label); - void set_line_alpha(int which, double alpha); - void set_color_map(int which, const int color); + void set_line_label(unsigned int which, const std::string &label); + void set_line_alpha(unsigned int which, double alpha); + void set_color_map(unsigned int which, const int color); void set_plot_pos_half(bool half); std::string title(); - std::string line_label(int which); - double line_alpha(int which); - int color_map(int which); + std::string line_label(unsigned int which); + double line_alpha(unsigned int which); + int color_map(unsigned int which); void set_size(int width, int height); void auto_scale(); - double min_intensity(int which); - double max_intensity(int which); + double min_intensity(unsigned int which); + double max_intensity(unsigned int which); void enable_menu(bool en); void enable_grid(bool en); diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index 38ac91b836..e599b97d07 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -174,25 +174,25 @@ WaterfallDisplayForm::getFFTWindowType() const } int -WaterfallDisplayForm::getColorMap(int which) +WaterfallDisplayForm::getColorMap(unsigned int which) { return getPlot()->getIntensityColorMapType(which); } int -WaterfallDisplayForm::getAlpha(int which) +WaterfallDisplayForm::getAlpha(unsigned int which) { return getPlot()->getAlpha(which); } double -WaterfallDisplayForm::getMinIntensity(int which) +WaterfallDisplayForm::getMinIntensity(unsigned int which) { return getPlot()->getMinIntensity(which); } double -WaterfallDisplayForm::getMaxIntensity(int which) +WaterfallDisplayForm::getMaxIntensity(unsigned int which) { return getPlot()->getMaxIntensity(which); } @@ -246,7 +246,7 @@ WaterfallDisplayForm::setFrequencyRange(const double centerfreq, } void -WaterfallDisplayForm::setColorMap(int which, +WaterfallDisplayForm::setColorMap(unsigned int which, const int newType, const QColor lowColor, const QColor highColor) @@ -257,7 +257,7 @@ WaterfallDisplayForm::setColorMap(int which, } void -WaterfallDisplayForm::setAlpha(int which, int alpha) +WaterfallDisplayForm::setAlpha(unsigned int which, int alpha) { getPlot()->setAlpha(which, alpha); getPlot()->replot(); |