projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
org.sigrok.PulseView.appdata.xml: Add <mimetype> tag.
[pulseview.git]
/
pv
/
view
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index 87d3dc1dc095fa7ebd7b1dd2b7dba0bf5c255c8e..2154f8a7af1354216dce1b2874bc42e6064135c9 100644
(file)
--- 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
* 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 <http://www.gnu.org/licenses/>.
*/
#include <extdef.h>
*/
#include <extdef.h>
-#include <
assert.h
>
+#include <
cassert
>
#include <cmath>
#include <QApplication>
#include <cmath>
#include <QApplication>
@@
-32,60
+31,44
@@
#include "tracepalette.hpp"
#include "view.hpp"
#include "tracepalette.hpp"
#include "view.hpp"
-#include <pv/widgets/colourbutton.hpp>
-#include <pv/widgets/popup.hpp>
+#include "pv/globalsettings.hpp"
+#include "pv/widgets/colourbutton.hpp"
+#include "pv/widgets/popup.hpp"
+
+using std::pair;
+using std::shared_ptr;
namespace pv {
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 int Trace::LabelHitPadding = 2;
-const int Trace::ColourBGAlpha = 8*256/100;
-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(QString name) :
- name_(name),
- coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
+Trace::Trace(shared_ptr<data::SignalBase> channel) :
+ base_(channel),
popup_(nullptr),
popup_form_(nullptr)
{
popup_(nullptr),
popup_form_(nullptr)
{
+ 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&)));
}
}
-QString Trace::name() const
-{
- return name_;
-}
-
-void Trace::set_name(QString name)
-{
- name_ = name;
-}
-
-QColor Trace::colour() const
-{
- return colour_;
-}
-
-void Trace::set_colour(QColor colour)
-{
- colour_ = colour;
-
- bgcolour_ = colour;
- bgcolour_.setAlpha(ColourBGAlpha);
-}
-
-void Trace::set_coloured_bg(bool state)
+shared_ptr<data::SignalBase> Trace::base() const
{
{
-
coloured_bg_ = state
;
+
return base_
;
}
void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
{
const int y = get_visual_y();
}
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;
if (!enabled())
return;
@@
-116,23
+99,23
@@
void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
}
p.setPen(Qt::transparent);
}
p.setPen(Qt::transparent);
- p.setBrush(hover ?
colour_.lighter() : colour_
);
+ p.setBrush(hover ?
base_->colour().lighter() : base_->colour()
);
p.drawPolygon(points, countof(points));
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.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.setBrush(Qt::transparent);
p.drawPolygon(points, countof(points));
// Paint the text
- p.setPen(select_text_colour(
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()),
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* Trace::create_context_menu(QWidget *parent)
@@
-152,19
+135,16
@@
pv::widgets::Popup* Trace::create_popup(QWidget *parent)
create_popup_form();
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
{
return popup_;
}
QRectF Trace::label_rect(const QRectF &rect) const
{
- using pv::view::View;
-
QFontMetrics m(QApplication::font());
const QSize text_size(
QFontMetrics m(QApplication::font());
const QSize text_size(
- m.boundingRect(QRect(), 0,
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);
const QSizeF label_size(
text_size.width() + LabelPadding.width() * 2,
ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
@@
-176,26
+156,24
@@
QRectF Trace::label_rect(const QRectF &rect) const
label_size.height());
}
label_size.height());
}
-void Trace::paint_back(QPainter &p,
const
ViewItemPaintParams &pp)
+void Trace::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
{
- if (coloured_bg_)
- p.setBrush(bgcolour_);
+ const View *view = owner_->view();
+ assert(view);
+
+ if (view->coloured_bg())
+ p.setBrush(base_->bgcolour());
else
else
- p.setBrush(
bgcolour_state_
? BrightGrayBGColour : DarkGrayBGColour);
+ p.setBrush(
pp.next_bg_colour_state()
? BrightGrayBGColour : DarkGrayBGColour);
p.setPen(QPen(Qt::NoPen));
p.setPen(QPen(Qt::NoPen));
- const std::pair<int, int> 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);
+ const pair<int, int> extents = v_extents();
+ p.drawRect(pp.left(), get_visual_y() + extents.first,
+ pp.width(), extents.second - extents.first);
}
}
-void Trace::paint_axis(QPainter &p,
const
ViewItemPaintParams &pp, int y)
+void Trace::paint_axis(QPainter &p, ViewItemPaintParams &pp, int y)
{
p.setRenderHint(QPainter::Antialiasing, false);
{
p.setRenderHint(QPainter::Antialiasing, false);
@@
-212,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);
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&)),
connect(colour_button, SIGNAL(selected(const QColor&)),
- this, SLOT(on_colour_changed(const QColor&)));
+ this, SLOT(on_colour
edit
_changed(const QColor&)));
form->addRow(tr("Colour"), colour_button);
}
form->addRow(tr("Colour"), colour_button);
}
@@
-242,35
+220,62
@@
void Trace::create_popup_form()
void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
{
QLineEdit *const name_edit = new QLineEdit(parent);
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&)),
connect(name_edit, SIGNAL(textChanged(const QString&)),
- this, SLOT(on_
tex
t_changed(const QString&)));
+ this, SLOT(on_
nameedi
t_changed(const QString&)));
form->addRow(tr("Name"), name_edit);
add_colour_option(parent, form);
}
form->addRow(tr("Name"), name_edit);
add_colour_option(parent, form);
}
-void Trace::
on_popup_closed(
)
+void Trace::
set_name(QString name
)
{
{
- popup_ = nullptr;
- popup_form_ = nullptr;
+ 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_->extents_changed(true, false);
+ owner_->row_item_appearance_changed(true, false);
+ }
}
void Trace::on_colour_changed(const QColor &colour)
{
}
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_->row_item_appearance_changed(true, true);
}
if (owner_)
owner_->row_item_appearance_changed(true, true);
}
-} // namespace view
+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 TraceView
+} // namespace views
} // namespace pv
} // namespace pv