X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=960cefa6b20b6c3d4e027f57751eb361ed3e26fb;hb=e1e2666e31d80016612762940605fc5bdbc63971;hp=fc90eba1fcd11cf6f5b5d0e132895304b8cbc9f9;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;p=pulseview.git
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index fc90eba..960cefa 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -14,13 +14,12 @@
* 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
@@ -40,7 +39,8 @@ using std::shared_ptr;
using std::make_shared;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const char *const ChannelNames[] = {
"CLK",
@@ -60,14 +60,17 @@ const char *const ChannelNames[] = {
};
Signal::Signal(pv::Session &session,
- std::shared_ptr channel) :
+ shared_ptr channel) :
Trace(channel),
session_(session),
scale_handle_(make_shared(*this)),
items_({scale_handle_}),
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)
@@ -80,20 +83,22 @@ void Signal::set_name(QString 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
@@ -101,9 +106,9 @@ const ViewItemOwner::item_list& Signal::child_items() const
return items_;
}
-void Signal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+void Signal::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
- if (channel_->enabled())
+ if (base_->enabled())
Trace::paint_back(p, pp);
}
@@ -116,10 +121,10 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
for (unsigned int i = 0; i < countof(ChannelNames); i++)
name_widget_->insertItem(i, ChannelNames[i]);
- const int index = name_widget_->findText(channel_->name(), Qt::MatchExactly);
+ const int index = name_widget_->findText(base_->name(), Qt::MatchExactly);
if (index == -1) {
- name_widget_->insertItem(0, channel_->name());
+ name_widget_->insertItem(0, base_->name());
name_widget_->setCurrentIndex(0);
} else {
name_widget_->setCurrentIndex(index);
@@ -154,6 +159,11 @@ void Signal::delete_pressed()
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);
@@ -162,8 +172,17 @@ void Signal::on_name_changed(const QString &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