summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib
diff options
context:
space:
mode:
Diffstat (limited to 'gr-qtgui/lib')
-rw-r--r--gr-qtgui/lib/TimeRasterDisplayPlot.cc38
-rw-r--r--gr-qtgui/lib/WaterfallDisplayPlot.cc33
-rw-r--r--gr-qtgui/lib/spectrumdisplayform.cc2
3 files changed, 38 insertions, 35 deletions
diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
index 887bc8c7c0..27bc1f5c89 100644
--- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc
+++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
@@ -194,7 +194,7 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot(
d_raster[i]->attach(this);
- d_color_map_type.push_back(INTENSITY_COLOR_MAP_TYPE_BLACK_HOT);
+ d_color_map_type.push_back(gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT);
setAlpha(i, 255 / d_nplots);
}
@@ -221,8 +221,10 @@ TimeRasterDisplayPlot::TimeRasterDisplayPlot(
// We've made sure the old type is different than here so we'll
// force and update.
for (unsigned int i = 0; i < d_nplots; ++i) {
- setIntensityColorMapType(
- i, INTENSITY_COLOR_MAP_TYPE_WHITE_HOT, QColor("white"), QColor("white"));
+ setIntensityColorMapType(i,
+ gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT,
+ QColor("white"),
+ QColor("white"));
}
_updateIntensityRangeDisplay();
@@ -446,10 +448,10 @@ void TimeRasterDisplayPlot::setIntensityColorMapType(const unsigned int which,
"TimerasterDisplayPlot::setIntesityColorMap: invalid which.");
if ((d_color_map_type[which] != newType) ||
- ((newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) &&
+ ((newType == gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) &&
(lowColor.isValid() && highColor.isValid()))) {
switch (newType) {
- case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: {
d_color_map_type[which] = newType;
d_raster[which]->setColorMap(new ColorMap_MultiColor());
@@ -457,32 +459,32 @@ void TimeRasterDisplayPlot::setIntensityColorMapType(const unsigned int which,
d_zoomer->setTrackerPen(QColor(Qt::black));
break;
}
- case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: {
d_color_map_type[which] = newType;
d_raster[which]->setColorMap(new ColorMap_WhiteHot());
break;
}
- case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: {
d_color_map_type[which] = newType;
d_raster[which]->setColorMap(new ColorMap_BlackHot());
break;
}
- case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: {
d_color_map_type[which] = newType;
d_raster[which]->setColorMap(new ColorMap_Incandescent());
break;
}
- case INTENSITY_COLOR_MAP_TYPE_SUNSET: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET: {
d_color_map_type[which] = newType;
d_raster[which]->setColorMap(new ColorMap_Sunset());
break;
}
- case INTENSITY_COLOR_MAP_TYPE_COOL: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL: {
d_color_map_type[which] = newType;
d_raster[which]->setColorMap(new ColorMap_Cool());
break;
}
- case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: {
d_low_intensity = lowColor;
d_high_intensity = highColor;
d_color_map_type[which] = newType;
@@ -529,25 +531,25 @@ void TimeRasterDisplayPlot::_updateIntensityRangeDisplay()
#else
QwtInterval intv = d_raster[i]->interval(Qt::ZAxis);
switch (d_color_map_type[i]) {
- case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR:
rightAxis->setColorMap(intv, new ColorMap_MultiColor());
break;
- case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT:
rightAxis->setColorMap(intv, new ColorMap_WhiteHot());
break;
- case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT:
rightAxis->setColorMap(intv, new ColorMap_BlackHot());
break;
- case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT:
rightAxis->setColorMap(intv, new ColorMap_Incandescent());
break;
- case INTENSITY_COLOR_MAP_TYPE_SUNSET:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET:
rightAxis->setColorMap(intv, new ColorMap_Sunset());
break;
- case INTENSITY_COLOR_MAP_TYPE_COOL:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL:
rightAxis->setColorMap(intv, new ColorMap_Cool());
break;
- case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED:
rightAxis->setColorMap(
intv, new ColorMap_UserDefined(d_low_intensity, d_high_intensity));
break;
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc
index 166ff5a16e..f2068621dd 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
@@ -146,7 +146,8 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(int nplots, QWidget* parent)
d_spectrogram[i]->attach(this);
- d_intensity_color_map_type.push_back(INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR);
+ d_intensity_color_map_type.push_back(
+ gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR);
setIntensityColorMapType(
i, d_intensity_color_map_type[i], QColor("white"), QColor("white"));
@@ -435,10 +436,10 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which,
const QColor highColor)
{
if ((d_intensity_color_map_type[which] != newType) ||
- ((newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) &&
+ ((newType == gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) &&
(lowColor.isValid() && highColor.isValid()))) {
switch (newType) {
- case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR: {
d_intensity_color_map_type[which] = newType;
#if QWT_VERSION < 0x060000
ColorMap_MultiColor colorMap;
@@ -448,7 +449,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which,
#endif
break;
}
- case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT: {
d_intensity_color_map_type[which] = newType;
#if QWT_VERSION < 0x060000
ColorMap_WhiteHot colorMap;
@@ -458,7 +459,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which,
#endif
break;
}
- case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT: {
d_intensity_color_map_type[which] = newType;
#if QWT_VERSION < 0x060000
ColorMap_BlackHot colorMap;
@@ -468,7 +469,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which,
#endif
break;
}
- case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT: {
d_intensity_color_map_type[which] = newType;
#if QWT_VERSION < 0x060000
ColorMap_Incandescent colorMap;
@@ -478,7 +479,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which,
#endif
break;
}
- case INTENSITY_COLOR_MAP_TYPE_SUNSET: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET: {
d_intensity_color_map_type[which] = newType;
#if QWT_VERSION < 0x060000
ColorMap_Sunset colorMap;
@@ -488,7 +489,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which,
#endif
break;
}
- case INTENSITY_COLOR_MAP_TYPE_COOL: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL: {
d_intensity_color_map_type[which] = newType;
#if QWT_VERSION < 0x060000
ColorMap_Cool colorMap;
@@ -498,7 +499,7 @@ void WaterfallDisplayPlot::setIntensityColorMapType(const unsigned int which,
#endif
break;
}
- case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: {
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED: {
d_user_defined_low_intensity_color = lowColor;
d_user_defined_high_intensity_color = highColor;
d_intensity_color_map_type[which] = newType;
@@ -582,25 +583,25 @@ void WaterfallDisplayPlot::_updateIntensityRangeDisplay()
#else
QwtInterval intv = d_spectrogram[i]->interval(Qt::ZAxis);
switch (d_intensity_color_map_type[i]) {
- case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR:
rightAxis->setColorMap(intv, new ColorMap_MultiColor());
break;
- case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT:
rightAxis->setColorMap(intv, new ColorMap_WhiteHot());
break;
- case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT:
rightAxis->setColorMap(intv, new ColorMap_BlackHot());
break;
- case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT:
rightAxis->setColorMap(intv, new ColorMap_Incandescent());
break;
- case INTENSITY_COLOR_MAP_TYPE_SUNSET:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_SUNSET:
rightAxis->setColorMap(intv, new ColorMap_Sunset());
break;
- case INTENSITY_COLOR_MAP_TYPE_COOL:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_COOL:
rightAxis->setColorMap(intv, new ColorMap_Cool());
break;
- case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED:
+ case gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED:
rightAxis->setColorMap(
intv,
new ColorMap_UserDefined(d_user_defined_low_intensity_color,
diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc
index 21727bec92..34c3b7d72d 100644
--- a/gr-qtgui/lib/spectrumdisplayform.cc
+++ b/gr-qtgui/lib/spectrumdisplayform.cc
@@ -638,7 +638,7 @@ void SpectrumDisplayForm::waterfallIntensityColorTypeChanged(int newType)
{
QColor lowIntensityColor;
QColor highIntensityColor;
- if (newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) {
+ if (newType == gr::qtgui::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) {
// Select the Low Intensity Color
lowIntensityColor = _waterfallDisplayPlot->getUserDefinedLowIntensityColor();
if (!lowIntensityColor.isValid()) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 21:25:23 +0000