X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=0ee89a1f23a403df763ae56a33319fb07fc439a7;hb=5ccfc97e20bbea19b9bc37905dd4cf63ee1f6303;hp=09a6da8f17a3d7b9b2377cfa0dc1a251e454edde;hpb=99af6802961b0a5ec7ec7d3ff2215c8eb6925ca3;p=pulseview.git
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 09a6da8..0ee89a1 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.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
@@ -31,16 +30,17 @@
#include
+#include "pv/data/signalbase.hpp"
+
#include "signal.hpp"
#include "view.hpp"
using std::shared_ptr;
using std::make_shared;
-using sigrok::Channel;
-
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const char *const ChannelNames[] = {
"CLK",
@@ -60,46 +60,45 @@ const char *const ChannelNames[] = {
};
Signal::Signal(pv::Session &session,
- std::shared_ptr channel) :
- Trace(QString::fromUtf8(channel->name().c_str())),
+ std::shared_ptr channel) :
+ Trace(channel),
session_(session),
- channel_(channel),
scale_handle_(make_shared(*this)),
items_({scale_handle_}),
- name_widget_(nullptr),
- updating_name_widget_(false)
+ name_widget_(nullptr)
{
- assert(channel_);
+ assert(base_);
+
+ 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;
- // Store the channel name in sigrok::Channel so that it
- // will end up in the .sr file upon save.
- channel_->set_name(name.toUtf8().constData());
+ if (name != name_widget_->currentText())
+ name_widget_->setEditText(name);
}
bool Signal::enabled() const
{
- return channel_->enabled();
+ return base_->enabled();
}
-void Signal::enable(bool enable)
+shared_ptr Signal::base() const
{
- channel_->set_enabled(enable);
+ return base_;
+}
- if (owner_)
- owner_->extents_changed(true, true);
+void Signal::save_settings(QSettings &settings) const
+{
+ (void)settings;
}
-shared_ptr Signal::channel() const
+void Signal::restore_settings(QSettings &settings)
{
- return channel_;
+ (void)settings;
}
const ViewItemOwner::item_list& Signal::child_items() const
@@ -109,7 +108,7 @@ const ViewItemOwner::item_list& Signal::child_items() const
void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
- if (channel_->enabled())
+ if (base_->enabled())
Trace::paint_back(p, pp);
}
@@ -117,22 +116,22 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
{
name_widget_ = new QComboBox(parent);
name_widget_->setEditable(true);
- name_widget_->setCompleter(0);
+ 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(name_, Qt::MatchExactly);
+ const int index = name_widget_->findText(base_->name(), Qt::MatchExactly);
if (index == -1) {
- name_widget_->insertItem(0, name_);
+ 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_text_changed(const QString&)));
+ this, SLOT(on_nameedit_changed(const QString&)));
form->addRow(tr("Name"), name_widget_);
@@ -158,10 +157,32 @@ void Signal::delete_pressed()
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()
{
- enable(false);
+ 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