#include <extdef.h>
-#include <assert.h>
+#include <cassert>
#include <cmath>
#include <QApplication>
#include "tracepalette.hpp"
#include "view.hpp"
-#include <pv/widgets/colourbutton.hpp>
-#include <pv/widgets/popup.hpp>
+#include "pv/globalsettings.hpp"
+#include "pv/widgets/colourbutton.hpp"
+#include "pv/widgets/popup.hpp"
+
+using std::pair;
+using std::shared_ptr;
namespace pv {
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<data::SignalBase> channel) :
+Trace::Trace(shared_ptr<data::SignalBase> channel) :
base_(channel),
- coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
popup_(nullptr),
popup_form_(nullptr)
{
+ GlobalSettings settings;
+ coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+
connect(channel.get(), SIGNAL(name_changed(const QString&)),
this, SLOT(on_name_changed(const QString&)));
connect(channel.get(), SIGNAL(colour_changed(const QColor&)),
create_popup_form();
- connect(popup_, SIGNAL(closed()),
- this, SLOT(on_popup_closed()));
+ connect(popup_, SIGNAL(closed()), this, SLOT(on_popup_closed()));
return popup_;
}
p.setPen(QPen(Qt::NoPen));
- const std::pair<int, int> extents = v_extents();
+ const pair<int, int> extents = v_extents();
const int x = 0;
const int y = get_visual_y() + extents.first;