X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Ftrace.cpp;h=0d4a4536171aacd99082465740deabe66f957793;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hp=d9cccdb649e94a0669be4d30084323341cc5077d;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index d9cccdb..0d4a453 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,11 +31,16 @@
#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 int Trace::LabelHitPadding = 2;
@@ -44,12 +48,14 @@ 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);
-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)
{
+ 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&)),
@@ -140,8 +146,6 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
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());
@@ -165,7 +169,7 @@ void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
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 +282,6 @@ void Trace::on_colouredit_changed(const QColor &colour)
set_colour(colour);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv