projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a tooltip for the "Show/hide decoder trace" icon.
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index a8de4d504aaa36b0fdb9960fb4f5b72c5b2391ae..065715aa7a996fd0c01f7aaf3763788a95f0658e 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)),
@@
-68,6
+68,9
@@
Signal::Signal(pv::Session &session,
name_widget_(nullptr)
{
assert(base_);
name_widget_(nullptr)
{
assert(base_);
+
+ connect(base_.get(), SIGNAL(enabled_changed(bool)),
+ this, SLOT(on_enabled_changed(bool)));
}
void Signal::set_name(QString name)
}
void Signal::set_name(QString name)
@@
-83,17
+86,19
@@
bool Signal::enabled() const
return base_->enabled();
}
return base_->enabled();
}
-void Signal::enable(bool enable)
+shared_ptr<data::SignalBase> Signal::base() const
{
{
- base_->set_enabled(enable);
+ return base_;
+}
- if (owner_)
- owner_->extents_changed(true, true);
+void Signal::save_settings(QSettings &settings) const
+{
+ (void)settings;
}
}
-shared_ptr<data::SignalBase> Signal::base() const
+void Signal::restore_settings(QSettings &settings)
{
{
-
return base_
;
+
(void)settings
;
}
const ViewItemOwner::item_list& Signal::child_items() const
}
const ViewItemOwner::item_list& Signal::child_items() const
@@
-154,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);
@@
-162,8
+172,17
@@
void Signal::on_name_changed(const QString &text)
void Signal::on_disable()
{
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
} // namespace pv