projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Add missing check for glib.
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index ffe4f67dc9c4cf14cff9e8573b6cce69d6fe669a..960cefa6b20b6c3d4e027f57751eb361ed3e26fb 100644
(file)
--- 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
* 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>
@@
-40,7
+39,8
@@
using std::shared_ptr;
using std::make_shared;
namespace pv {
using std::make_shared;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const char *const ChannelNames[] = {
"CLK",
const char *const ChannelNames[] = {
"CLK",
@@
-60,7
+60,7
@@
const char *const ChannelNames[] = {
};
Signal::Signal(pv::Session &session,
};
Signal::Signal(pv::Session &session,
- s
td::s
hared_ptr<data::SignalBase> channel) :
+ shared_ptr<data::SignalBase> channel) :
Trace(channel),
session_(session),
scale_handle_(make_shared<SignalScaleHandle>(*this)),
Trace(channel),
session_(session),
scale_handle_(make_shared<SignalScaleHandle>(*this)),
@@
-91,12
+91,22
@@
shared_ptr<data::SignalBase> Signal::base() const
return base_;
}
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_;
}
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);
{
if (base_->enabled())
Trace::paint_back(p, pp);
@@
-149,6
+159,11
@@
void Signal::delete_pressed()
void Signal::on_name_changed(const QString &text)
{
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);
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);
}
owner_->extents_changed(true, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv