X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=960cefa6b20b6c3d4e027f57751eb361ed3e26fb;hb=e1e2666e31d80016612762940605fc5bdbc63971;hp=ffe4f67dc9c4cf14cff9e8573b6cce69d6fe669a;hpb=a45b9b9ee6f15da272c2e743122097e6696fc7b5;p=pulseview.git
diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index ffe4f67..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,7 +60,7 @@ 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)),
@@ -91,12 +91,22 @@ 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, const ViewItemPaintParams &pp)
+void Signal::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
if (base_->enabled())
Trace::paint_back(p, pp);
@@ -149,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);
@@ -168,5 +183,6 @@ void Signal::on_enabled_changed(bool enabled)
owner_->extents_changed(true, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv