X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=2a1eb959634fb23289cc1b12fa8c5613ef795e81;hp=1734921a57c568585c648b177f8ce29019eb1a5e;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 1734921a..2a1eb959 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -14,14 +14,13 @@
* 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
#include
#include
@@ -32,52 +31,44 @@
#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(128, 128, 128, 64));
+const QPen Trace::AxisPen(QColor(0, 0, 0, 30 * 256 / 100));
const int Trace::LabelHitPadding = 2;
-Trace::Trace(QString name) :
- name_(name),
- popup_(NULL),
- popup_form_(NULL)
-{
-}
-
-QString Trace::name() const
-{
- return name_;
-}
-
-void Trace::set_name(QString name)
-{
- name_ = name;
-}
+const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10 * 255 / 100);
+const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15 * 255 / 100);
-QColor Trace::colour() const
+Trace::Trace(shared_ptr channel) :
+ base_(channel),
+ popup_(nullptr),
+ popup_form_(nullptr)
{
- return colour_;
-}
-
-void Trace::set_colour(QColor colour)
-{
- colour_ = colour;
+ connect(channel.get(), SIGNAL(name_changed(const QString&)),
+ this, SLOT(on_name_changed(const QString&)));
+ connect(channel.get(), SIGNAL(colour_changed(const QColor&)),
+ this, SLOT(on_colour_changed(const QColor&)));
}
-void Trace::paint_label(QPainter &p, int right, bool hover)
+void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
{
const int y = get_visual_y();
- p.setBrush(colour_);
+ p.setBrush(base_->colour());
if (!enabled())
return;
- const QRectF r = label_rect(right);
+ const QRectF r = label_rect(rect);
// Paint the label
const float label_arrow_length = r.height() / 2;
@@ -103,28 +94,28 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
}
p.setPen(Qt::transparent);
- p.setBrush(hover ? colour_.lighter() : colour_);
+ p.setBrush(hover ? base_->colour().lighter() : base_->colour());
p.drawPolygon(points, countof(points));
- p.setPen(colour_.lighter());
+ p.setPen(base_->colour().lighter());
p.setBrush(Qt::transparent);
p.drawPolygon(highlight_points, countof(highlight_points));
- p.setPen(colour_.darker());
+ p.setPen(base_->colour().darker());
p.setBrush(Qt::transparent);
p.drawPolygon(points, countof(points));
// Paint the text
- p.setPen(get_text_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, name_);
+ Qt::AlignCenter | Qt::AlignVCenter, base_->name());
}
QMenu* Trace::create_context_menu(QWidget *parent)
{
- QMenu *const menu = SelectableItem::create_context_menu(parent);
+ QMenu *const menu = ViewItem::create_context_menu(parent);
return menu;
}
@@ -134,43 +125,62 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
using pv::widgets::Popup;
popup_ = new Popup(parent);
+ popup_->set_position(parent->mapToGlobal(
+ point(parent->rect())), Popup::Right);
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(int right) const
+QRectF Trace::label_rect(const QRectF &rect) const
{
- using pv::view::View;
-
QFontMetrics m(QApplication::font());
const QSize text_size(
- m.boundingRect(QRect(), 0, name_).width(),
- m.boundingRect(QRect(), 0, "Tg").height());
+ m.boundingRect(QRect(), 0, base_->name()).width(), m.height());
const QSizeF label_size(
- text_size.width() + View::LabelPadding.width() * 2,
- ceilf((text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
+ text_size.width() + LabelPadding.width() * 2,
+ ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
const float half_height = label_size.height() / 2;
return QRectF(
- right - half_height - label_size.width() - 0.5,
+ rect.right() - half_height - label_size.width() - 0.5,
get_visual_y() + 0.5f - half_height,
label_size.width() + half_height,
label_size.height());
}
-QColor Trace::get_text_colour() const
+void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- return (colour_.lightness() > 64) ? Qt::black : Qt::white;
+ const View *view = owner_->view();
+ assert(view);
+
+ if (view->coloured_bg())
+ p.setBrush(base_->bgcolour());
+ else
+ p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
+
+ p.setPen(QPen(Qt::NoPen));
+
+ const pair extents = v_extents();
+
+ const int x = 0;
+ const int y = get_visual_y() + extents.first;
+ const int w = pp.right() - pp.left();
+ const int h = extents.second - extents.first;
+
+ p.drawRect(x, y, w, h);
}
-void Trace::paint_axis(QPainter &p, int y, int left, int right)
+void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
{
+ p.setRenderHint(QPainter::Antialiasing, false);
+
p.setPen(AxisPen);
- p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+ p.drawLine(QPointF(pp.left(), y), QPointF(pp.right(), y));
+
+ p.setRenderHint(QPainter::Antialiasing, true);
}
void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
@@ -180,9 +190,9 @@ 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(colour_);
+ colour_button->set_colour(base_->colour());
connect(colour_button, SIGNAL(selected(const QColor&)),
- this, SLOT(on_colour_changed(const QColor&)));
+ this, SLOT(on_colouredit_changed(const QColor&)));
form->addRow(tr("Colour"), colour_button);
}
@@ -192,10 +202,14 @@ void Trace::create_popup_form()
// Clear the layout
// Transfer the layout and the child widgets to a temporary widget
- // which then goes out of scope destroying the layout and all the child
- // widgets.
- if (popup_form_)
- QWidget().setLayout(popup_form_);
+ // which we delete after the event was handled. This way, the layout
+ // and all widgets contained therein are deleted after the event was
+ // handled, leaving the parent popup_ time to handle the change.
+ if (popup_form_) {
+ QWidget *suicidal = new QWidget();
+ suicidal->setLayout(popup_form_);
+ suicidal->deleteLater();
+ }
// Repopulate the popup
popup_form_ = new QFormLayout(popup_);
@@ -206,35 +220,62 @@ void Trace::create_popup_form()
void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
{
QLineEdit *const name_edit = new QLineEdit(parent);
- name_edit->setText(name_);
+ name_edit->setText(base_->name());
connect(name_edit, SIGNAL(textChanged(const QString&)),
- this, SLOT(on_text_changed(const QString&)));
+ this, SLOT(on_nameedit_changed(const QString&)));
form->addRow(tr("Name"), name_edit);
add_colour_option(parent, form);
}
-void Trace::on_popup_closed()
+void Trace::set_name(QString name)
{
- popup_ = NULL;
- popup_form_ = NULL;
+ base_->set_name(name);
}
-void Trace::on_text_changed(const QString &text)
+void Trace::set_colour(QColor colour)
{
- set_name(text);
+ base_->set_colour(colour);
+}
- if (owner_)
+void Trace::on_name_changed(const QString &text)
+{
+ /* This event handler is called by SignalBase when the name was changed there */
+ (void)text;
+
+ if (owner_) {
owner_->extents_changed(true, false);
+ owner_->row_item_appearance_changed(true, false);
+ }
}
void Trace::on_colour_changed(const QColor &colour)
{
- set_colour(colour);
+ /* This event handler is called by SignalBase when the colour was changed there */
+ (void)colour;
if (owner_)
- owner_->appearance_changed(true, false);
+ owner_->row_item_appearance_changed(true, true);
+}
+
+void Trace::on_popup_closed()
+{
+ popup_ = nullptr;
+ popup_form_ = nullptr;
+}
+
+void Trace::on_nameedit_changed(const QString &name)
+{
+ /* This event handler notifies SignalBase that the name changed */
+ set_name(name);
+}
+
+void Trace::on_colouredit_changed(const QColor &colour)
+{
+ /* This event handler notifies SignalBase that the colour changed */
+ set_colour(colour);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv