X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=985c295059a5da42c1390323de9396296712bfea;hb=c063290ac7189bdd15221450f598504f43286b43;hp=d9cccdb649e94a0669be4d30084323341cc5077d;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index d9cccdb..985c295 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,24 +31,31 @@ #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) { + 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&)), @@ -132,16 +138,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()); @@ -165,7 +168,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 +281,6 @@ void Trace::on_colouredit_changed(const QColor &colour) set_colour(colour); } -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv