X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=2a1eb959634fb23289cc1b12fa8c5613ef795e81;hp=d9cccdb649e94a0669be4d30084323341cc5077d;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index d9cccdb6..2a1eb959 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -14,13 +14,12 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
-#include
+#include
#include
#include
@@ -32,21 +31,25 @@
#include "tracepalette.hpp"
#include "view.hpp"
-#include
-#include
+#include "pv/globalsettings.hpp"
+#include "pv/widgets/colourbutton.hpp"
+#include "pv/widgets/popup.hpp"
+
+using std::pair;
+using std::shared_ptr;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
+const QPen Trace::AxisPen(QColor(0, 0, 0, 30 * 256 / 100));
const int Trace::LabelHitPadding = 2;
-const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100);
-const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100);
+const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10 * 255 / 100);
+const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15 * 255 / 100);
-Trace::Trace(std::shared_ptr channel) :
+Trace::Trace(shared_ptr channel) :
base_(channel),
- coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
popup_(nullptr),
popup_form_(nullptr)
{
@@ -56,11 +59,6 @@ Trace::Trace(std::shared_ptr channel) :
this, SLOT(on_colour_changed(const QColor&)));
}
-void Trace::set_coloured_bg(bool state)
-{
- coloured_bg_ = state;
-}
-
void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
{
const int y = get_visual_y();
@@ -132,16 +130,13 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
create_popup_form();
- connect(popup_, SIGNAL(closed()),
- this, SLOT(on_popup_closed()));
+ connect(popup_, SIGNAL(closed()), this, SLOT(on_popup_closed()));
return popup_;
}
QRectF Trace::label_rect(const QRectF &rect) const
{
- using pv::view::View;
-
QFontMetrics m(QApplication::font());
const QSize text_size(
m.boundingRect(QRect(), 0, base_->name()).width(), m.height());
@@ -158,14 +153,17 @@ QRectF Trace::label_rect(const QRectF &rect) const
void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- if (coloured_bg_)
+ const View *view = owner_->view();
+ assert(view);
+
+ if (view->coloured_bg())
p.setBrush(base_->bgcolour());
else
p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
p.setPen(QPen(Qt::NoPen));
- const std::pair extents = v_extents();
+ const pair extents = v_extents();
const int x = 0;
const int y = get_visual_y() + extents.first;
@@ -278,5 +276,6 @@ void Trace::on_colouredit_changed(const QColor &colour)
set_colour(colour);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv