X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=66f13edb12dac9b4cf4795af5916c026f1713772;hb=857ebbef1c10cdc02df03af1fb446c704809394e;hp=ca5f7150353ac67f03f94aae996d37e49d4a35eb;hpb=b5cb6c35e5475e143554ec6daea86310de5e32a5;p=pulseview.git
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ca5f715..66f13ed 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -14,112 +14,61 @@
* 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
#include
#include
-#include "trace.h"
-#include "tracepalette.h"
-#include "view.h"
+#include "trace.hpp"
+#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) :
- _view(NULL),
- _name(name),
- _v_offset(0),
- _popup(NULL),
- _popup_form(NULL)
-{
-}
-
-QString Trace::get_name() const
-{
- return _name;
-}
-
-void Trace::set_name(QString name)
-{
- _name = name;
-}
-
-QColor Trace::get_colour() const
-{
- return _colour;
-}
-
-void Trace::set_colour(QColor colour)
-{
- _colour = colour;
-}
-
-int Trace::get_v_offset() const
-{
- return _v_offset;
-}
-
-void Trace::set_v_offset(int v_offset)
-{
- _v_offset = v_offset;
-}
-
-void Trace::set_view(pv::view::View *view)
-{
- assert(view);
- _view = view;
-}
+const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10 * 255 / 100);
+const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15 * 255 / 100);
-void Trace::paint_back(QPainter &p, int left, int right)
+Trace::Trace(shared_ptr channel) :
+ base_(channel),
+ popup_(nullptr),
+ popup_form_(nullptr)
{
- (void)p;
- (void)left;
- (void)right;
-}
-
-void Trace::paint_mid(QPainter &p, int left, int right)
-{
- (void)p;
- (void)left;
- (void)right;
-}
-
-void Trace::paint_fore(QPainter &p, int left, int right)
-{
- (void)p;
- (void)left;
- (void)right;
+ 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)
{
- assert(_view);
- const int y = _v_offset - _view->v_offset();
+ const int y = get_visual_y();
- p.setBrush(_colour);
+ p.setBrush(base_->colour());
if (!enabled())
return;
- const QColor colour = get_colour();
-
- const QRectF r = label_rect(right);
+ const QRectF r = label_rect(rect);
// Paint the label
const float label_arrow_length = r.height() / 2;
@@ -145,34 +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);
-}
-
-bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
-{
- (void)left;
- return enabled() && label_rect(right).contains(point);
+ 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;
}
@@ -181,55 +124,58 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
{
using pv::widgets::Popup;
- _popup = new Popup(parent);
+ 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;
-}
-
-int Trace::get_y() const
-{
- return _v_offset - _view->v_offset();
+ return popup_;
}
-QRectF Trace::label_rect(int right)
+QRectF Trace::label_rect(const QRectF &rect) const
{
- using pv::view::View;
-
- assert(_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,
- get_y() + 0.5f - half_height,
+ rect.right() - half_height - label_size.width() - 0.5,
+ get_visual_y() + 0.5f - half_height,
label_size.width() + half_height,
label_size.height());
}
-void Trace::hover_point_changed()
+void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
-}
+ const View *view = owner_->view();
+ assert(view);
-QColor Trace::get_text_colour() const
-{
- return (_colour.lightness() > 64) ? Qt::black : Qt::white;
+ 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();
+ p.drawRect(pp.left(), get_visual_y() + extents.first,
+ pp.width(), extents.second - extents.first);
}
-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)
@@ -239,9 +185,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);
}
@@ -251,45 +197,80 @@ 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);
- _popup->setLayout(_popup_form);
- populate_popup_form(_popup, _popup_form);
+ popup_form_ = new QFormLayout(popup_);
+ popup_->setLayout(popup_form_);
+ populate_popup_form(popup_, 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);
- text_changed();
+ base_->set_colour(colour);
+}
+
+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)
{
+ /* This event handler is called by SignalBase when the colour was changed there */
+ (void)colour;
+
+ if (owner_)
+ 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);
- colour_changed();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv