X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Ftrace.cpp;h=e481f2a009753aacd2a82a15eca93bb5a3895761;hb=e3ac35531f1e76a31669e821e14dbeb95a5cba63;hp=d6a4fec6045ad1bf21ee3dd5ee3d01685d43c47c;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;p=pulseview.git
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index d6a4fec..e481f2a 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -14,8 +14,7 @@
* 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
@@ -36,7 +35,8 @@
#include
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
const int Trace::LabelHitPadding = 2;
@@ -45,7 +45,7 @@ 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) :
- channel_(channel),
+ base_(channel),
coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
popup_(nullptr),
popup_form_(nullptr)
@@ -65,7 +65,7 @@ void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
{
const int y = get_visual_y();
- p.setBrush(channel_->colour());
+ p.setBrush(base_->colour());
if (!enabled())
return;
@@ -96,23 +96,23 @@ void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
}
p.setPen(Qt::transparent);
- p.setBrush(hover ? channel_->colour().lighter() : channel_->colour());
+ p.setBrush(hover ? base_->colour().lighter() : base_->colour());
p.drawPolygon(points, countof(points));
- p.setPen(channel_->colour().lighter());
+ p.setPen(base_->colour().lighter());
p.setBrush(Qt::transparent);
p.drawPolygon(highlight_points, countof(highlight_points));
- p.setPen(channel_->colour().darker());
+ p.setPen(base_->colour().darker());
p.setBrush(Qt::transparent);
p.drawPolygon(points, countof(points));
// Paint the text
- p.setPen(select_text_colour(channel_->colour()));
+ p.setPen(select_text_colour(base_->colour()));
p.setFont(QApplication::font());
p.drawText(QRectF(r.x(), r.y(),
r.width() - label_arrow_length, r.height()),
- Qt::AlignCenter | Qt::AlignVCenter, channel_->name());
+ Qt::AlignCenter | Qt::AlignVCenter, base_->name());
}
QMenu* Trace::create_context_menu(QWidget *parent)
@@ -140,11 +140,9 @@ 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, channel_->name()).width(), m.height());
+ m.boundingRect(QRect(), 0, base_->name()).width(), m.height());
const QSizeF label_size(
text_size.width() + LabelPadding.width() * 2,
ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
@@ -159,7 +157,7 @@ QRectF Trace::label_rect(const QRectF &rect) const
void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
if (coloured_bg_)
- p.setBrush(channel_->bgcolour());
+ p.setBrush(base_->bgcolour());
else
p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
@@ -192,7 +190,7 @@ void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
ColourButton *const colour_button = new ColourButton(
TracePalette::Rows, TracePalette::Cols, parent);
colour_button->set_palette(TracePalette::Colours);
- colour_button->set_colour(channel_->colour());
+ colour_button->set_colour(base_->colour());
connect(colour_button, SIGNAL(selected(const QColor&)),
this, SLOT(on_colouredit_changed(const QColor&)));
@@ -222,7 +220,7 @@ void Trace::create_popup_form()
void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
{
QLineEdit *const name_edit = new QLineEdit(parent);
- name_edit->setText(channel_->name());
+ name_edit->setText(base_->name());
connect(name_edit, SIGNAL(textChanged(const QString&)),
this, SLOT(on_nameedit_changed(const QString&)));
form->addRow(tr("Name"), name_edit);
@@ -232,12 +230,12 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
void Trace::set_name(QString name)
{
- channel_->set_name(name);
+ base_->set_name(name);
}
void Trace::set_colour(QColor colour)
{
- channel_->set_colour(colour);
+ base_->set_colour(colour);
}
void Trace::on_name_changed(const QString &text)
@@ -278,5 +276,6 @@ void Trace::on_colouredit_changed(const QColor &colour)
set_colour(colour);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv