X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=960cefa6b20b6c3d4e027f57751eb361ed3e26fb;hb=e1e2666e31d80016612762940605fc5bdbc63971;hp=9b08336e3c64cc627f2e919a8a8b000383253017;hpb=931f20b0dbd480153611493f51fee68f9d29be74;p=pulseview.git
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 9b08336..960cefa 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -14,33 +14,42 @@
* 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
-#include "signal.h"
-#include "view.h"
+#include
-namespace pv {
-namespace view {
+#include "pv/data/signalbase.hpp"
+
+#include "signal.hpp"
+#include "view.hpp"
+
+using std::shared_ptr;
+using std::make_shared;
-const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
+namespace pv {
+namespace views {
+namespace TraceView {
-const char *const ProbeNames[] = {
+const char *const ChannelNames[] = {
"CLK",
"DATA",
"IN",
"OUT",
"RST",
- "Tx",
- "Rx",
+ "TX",
+ "RX",
"EN",
"SCLK",
"MOSI",
@@ -50,50 +59,130 @@ const char *const ProbeNames[] = {
"SCL"
};
-Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
- Trace(session, probe->name),
- _probe(probe),
- _name_action(NULL),
- _name_widget(),
- _updating_name_widget(false)
+Signal::Signal(pv::Session &session,
+ shared_ptr channel) :
+ Trace(channel),
+ session_(session),
+ scale_handle_(make_shared(*this)),
+ items_({scale_handle_}),
+ name_widget_(nullptr)
{
- assert(_probe);
-
- _name_action.setDefaultWidget(&_name_widget);
-
- _name_widget.setEditable(true);
- for(unsigned int i = 0; i < countof(ProbeNames); i++)
- _name_widget.insertItem(i, ProbeNames[i]);
- _name_widget.setEditText(probe->name);
+ assert(base_);
- connect(&_name_widget, SIGNAL(editTextChanged(const QString&)),
- this, SLOT(on_text_changed(const QString&)));
+ connect(base_.get(), SIGNAL(enabled_changed(bool)),
+ this, SLOT(on_enabled_changed(bool)));
}
void Signal::set_name(QString name)
{
Trace::set_name(name);
- _updating_name_widget = true;
- _name_widget.setEditText(name);
- _updating_name_widget = false;
+
+ if (name != name_widget_->currentText())
+ name_widget_->setEditText(name);
}
bool Signal::enabled() const
{
- return _probe->enabled;
+ return base_->enabled();
+}
+
+shared_ptr Signal::base() const
+{
+ return base_;
+}
+
+void Signal::save_settings(QSettings &settings) const
+{
+ (void)settings;
+}
+
+void Signal::restore_settings(QSettings &settings)
+{
+ (void)settings;
+}
+
+const ViewItemOwner::item_list& Signal::child_items() const
+{
+ return items_;
+}
+
+void Signal::paint_back(QPainter &p, ViewItemPaintParams &pp)
+{
+ if (base_->enabled())
+ Trace::paint_back(p, pp);
+}
+
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+ name_widget_ = new QComboBox(parent);
+ name_widget_->setEditable(true);
+ name_widget_->setCompleter(nullptr);
+
+ for (unsigned int i = 0; i < countof(ChannelNames); i++)
+ name_widget_->insertItem(i, ChannelNames[i]);
+
+ const int index = name_widget_->findText(base_->name(), Qt::MatchExactly);
+
+ if (index == -1) {
+ name_widget_->insertItem(0, base_->name());
+ name_widget_->setCurrentIndex(0);
+ } else {
+ name_widget_->setCurrentIndex(index);
+ }
+
+ connect(name_widget_, SIGNAL(editTextChanged(const QString&)),
+ this, SLOT(on_nameedit_changed(const QString&)));
+
+ form->addRow(tr("Name"), name_widget_);
+
+ add_colour_option(parent, form);
}
-void Signal::paint_axis(QPainter &p, int y, int left, int right)
+QMenu* Signal::create_context_menu(QWidget *parent)
{
- p.setPen(SignalAxisPen);
- p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+ QMenu *const menu = Trace::create_context_menu(parent);
+
+ menu->addSeparator();
+
+ QAction *const disable = new QAction(tr("Disable"), this);
+ disable->setShortcuts(QKeySequence::Delete);
+ connect(disable, SIGNAL(triggered()), this, SLOT(on_disable()));
+ menu->addAction(disable);
+
+ return menu;
}
-void Signal::on_text_changed(const QString &text)
+void Signal::delete_pressed()
{
- Trace::set_name(text);
- text_changed();
+ on_disable();
+}
+
+void Signal::on_name_changed(const QString &text)
+{
+ // On startup, this event is fired when a session restores signal
+ // names. However, the name widget hasn't yet been created.
+ if (!name_widget_)
+ return;
+
+ if (text != name_widget_->currentText())
+ name_widget_->setEditText(text);
+
+ Trace::on_name_changed(text);
+}
+
+void Signal::on_disable()
+{
+ base_->set_enabled(false);
+}
+
+void Signal::on_enabled_changed(bool enabled)
+{
+ (void)enabled;
+
+ if (owner_)
+ owner_->extents_changed(true, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv