[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 08/23: qtgui: adds an alternative qss file.
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 08/23: qtgui: adds an alternative qss file. |
Date: |
Thu, 26 Jun 2014 19:54:43 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 1beb26555301221476fa9293300d00f565f11a3e
Author: Tom Rondeau <address@hidden>
Date: Tue Jun 24 18:58:47 2014 -0400
qtgui: adds an alternative qss file.
---
gr-qtgui/examples/CMakeLists.txt | 1 +
gr-qtgui/examples/alt.qss | 126 +++++++++++++++++++++
.../include/gnuradio/qtgui/TimeRasterDisplayPlot.h | 6 +-
gr-qtgui/lib/TimeRasterDisplayPlot.cc | 12 ++
4 files changed, 144 insertions(+), 1 deletion(-)
diff --git a/gr-qtgui/examples/CMakeLists.txt b/gr-qtgui/examples/CMakeLists.txt
index 8d3b299..cd6de24 100644
--- a/gr-qtgui/examples/CMakeLists.txt
+++ b/gr-qtgui/examples/CMakeLists.txt
@@ -39,6 +39,7 @@ GR_PYTHON_INSTALL(PROGRAMS
install(
FILES
dark.qss
+ alt.qss
qtgui_tags_viewing.grc
DESTINATION ${GR_PKG_QTGUI_EXAMPLES_DIR}
COMPONENT "qtgui_python"
diff --git a/gr-qtgui/examples/alt.qss b/gr-qtgui/examples/alt.qss
new file mode 100644
index 0000000..c310b80
--- /dev/null
+++ b/gr-qtgui/examples/alt.qss
@@ -0,0 +1,126 @@
+QWidget
+{
+ color: white;
+ background-color: black;
+}
+
+QwtPlot
+{
+ padding: 10px;
+ font-size: 18px;
+}
+
+DisplayPlot {
+ qproperty-zoomer_color: green;
+ qproperty-line_color1: #00FF00;
+ qproperty-line_color2: magenta;
+ qproperty-line_color3: #FF6905;
+ qproperty-line_style1: SolidLine;
+ qproperty-line_style2: DashLine;
+ qproperty-line_style3: DotLine;
+ qproperty-line_width1: 2;
+ qproperty-line_width2: 2;
+ qproperty-line_width3: 2;
+ qproperty-axes_label_font_size: 18;
+}
+
+WaterfallDisplayPlot {
+ qproperty-intensity_color_map_type1: 5;
+ qproperty-low_intensity_color: black;
+ qproperty-high_intensity_color: green;
+}
+
+TimeRasterDisplayPlot {
+ qproperty-intensity_color_map_type1: 6;
+}
+
+FrequencyDisplayPlot {
+ qproperty-line_color1: cyan;
+ qproperty-line_color2: magenta;
+ qproperty-line_color3: purple;
+ qproperty-line_style1: SolidLine;
+ qproperty-line_style2: DashLine;
+ qproperty-line_style3: DotLine;
+ qproperty-max_fft_color: palegreen;
+ qproperty-min_fft_color: darkblue;
+ qproperty-marker_lower_intensity_color: white;
+ qproperty-marker_upper_intensity_color: red;
+ qproperty-marker_lower_intensity_visible: false;
+ qproperty-marker_upper_intensity_visible: false;
+ qproperty-marker_noise_floor_amplitude_color: red;
+ qproperty-marker_noise_floor_amplitude_visible: false;
+}
+
+QwtPlotCanvas
+{
+ border: 1px solid White;
+ border-radius: 10px;
+}
+
+QwtScaleWidget
+{
+ font-size: 14px;
+}
+
+QwtLegend
+{
+ padding: 3px;
+ margin: 3px;
+ font-size: 14px;
+}
+
+QwtLegendItem
+{
+ padding: 2px;
+ margin: 2px;
+}
+
+QLineEdit,
+QPlainTextEdit,
+QComboBox,
+QMenu {
+ selection-color: black;
+ selection-background-color: lightgrey;
+ background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 black, stop: 1
rgb(128, 128, 128));
+ border: 1px solid gray;
+ padding: 2px;
+ border-radius: 3px;
+}
+
+QPushButton,
+QToolButton {
+ selection-color: black;
+ selection-background-color: white;
+ background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 black, stop: 1
rgb(128, 128, 128));
+ border: 1px solid gray;
+ padding: 2px;
+ border-radius: 3px;
+}
+
+QTabWidget::pane {
+ border: 1px solid white;
+}
+
+QTabBar {
+ margin: 20px;
+ padding: 20px;
+}
+
+QTabBar::tab {
+ background-color: rgb(100, 100, 100);
+ border: 1px solid white;
+ padding: 5px;
+}
+
+QTabBar::tab:first {
+ border-top-left-radius: 4px;
+}
+
+QTabBar::tab:last {
+ border-top-right-radius: 4px;
+}
+
+QTabBar::tab:selected {
+ background-color: rgb(200, 200, 200);
+ color: black;
+}
diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
index f22028c..7ef1ad2 100644
--- a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
@@ -46,6 +46,8 @@ class TimeRasterDisplayPlot: public DisplayPlot
{
Q_OBJECT
+ Q_PROPERTY(int intensity_color_map_type1 READ getIntensityColorMapType1
WRITE setIntensityColorMapType1)
+
public:
TimeRasterDisplayPlot(int nplots,
double samp_rate,
@@ -67,7 +69,7 @@ public:
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);
@@ -80,7 +82,9 @@ public:
void replot(void);
int getIntensityColorMapType(int) const;
+ int getIntensityColorMapType1() const;
void setIntensityColorMapType(const int, const int, const QColor, const
QColor);
+ void setIntensityColorMapType1(int);
const QColor getUserDefinedLowIntensityColor() const;
const QColor getUserDefinedHighIntensityColor() const;
diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc
b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
index 2d4ed41..5cf736d3 100644
--- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc
+++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
@@ -468,6 +468,12 @@ TimeRasterDisplayPlot::getIntensityColorMapType(int which)
const
return d_color_map_type[which];
}
+int
+TimeRasterDisplayPlot::getIntensityColorMapType1() const
+{
+ return getIntensityColorMapType(0);
+}
+
void
TimeRasterDisplayPlot::setIntensityColorMapType(const int which,
const int newType,
@@ -528,6 +534,12 @@ TimeRasterDisplayPlot::setIntensityColorMapType(const int
which,
}
}
+void
+TimeRasterDisplayPlot::setIntensityColorMapType1(int newType)
+{
+ setIntensityColorMapType(0, newType, d_low_intensity, d_high_intensity);
+}
+
const QColor
TimeRasterDisplayPlot::getUserDefinedLowIntensityColor() const
{
- [Commit-gnuradio] [gnuradio] branch master updated (ad9b547 -> 71a57cc), git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 07/23: qtgui: Mostly adds sunset and cool color schemes for waterfall/raster plots., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 10/23: qtgui: allows toggling rf frequencies on/off in GRC options box., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 12/23: qtgui: freq, waterfall, and sink blocks produce a frequency message when double-clicked. Also can take in a frequency message to adjust the x-axis., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 05/23: digital: adding a rotate_phase message for the constellation_receiver to adjust the phase of the constellation., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 01/23: volk: cmake: Rename GrBoost to VolkBoost to differentiate it from GR's GrBoost. Although they set the same BOOST variables internally, this change make it clear which cmake file to include., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 09/23: qtgui: minor mods, including putting min/max lines in FFT sink behind all other lines., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 04/23: blocks: adding a message port to the copy block to enable/disable copy., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 13/23: filter: adds a message input port to frequency xlating FIR filter to update the frequency., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 03/23: digital: expose set_constellation message port in GRC for constellation_receiver., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 08/23: qtgui: adds an alternative qss file.,
git <=
- [Commit-gnuradio] [gnuradio] 14/23: docs: adding docs for blocks::copy and digital::constellation_receiver to describe their message ports., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 15/23: qtgui: dynamically adjust min/max amplitude for qtgui freq and waterfall plots., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 16/23: Merge branch 'maint', git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 11/23: qtgui: for sink_x, waterfall_sink_x, and freq_sink_x, when the display is double-clicked, the center frequency is adjusted to the clicked frequency and a message is posted containing the new center frequency., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 17/23: replaced dynamic_ by static_cast; typechecking done before, git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 02/23: cmake: Include GrBoost at the top level such that the correct default BOOST variables are set throughout the build. Because of the way CMake handles non-cached variables, each GR component (e.g., Volk) can change the BOOST variables for its particular needs without overriding these default values for other components., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 06/23: blocks.head: added callback to GRC definition, git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 18/23: crc32_async: fix memory leak; coverity 1215946, git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 23/23: build: removed some gcc warnings., git, 2014/06/26
- [Commit-gnuradio] [gnuradio] 21/23: Merge remote-tracking branch 'mmueller/blocks_grc_add_head_set_length_cb', git, 2014/06/26