Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / view / trace.cpp

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 3bdf725df4f4bc52fb739586da259191c5b386e0..985c295059a5da42c1390323de9396296712bfea 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <extdef.h>
 
-#include <assert.h>
+#include <cassert>
 #include <cmath>
 
 #include <QApplication>
@@ -32,25 +31,31 @@
 #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&)),
@@ -133,8 +138,7 @@ 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_;
 }
@@ -164,7 +168,7 @@ void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 
        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;