X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.cpp;h=e29bbe8745352ff84c0257391bf950949683a2bb;hb=04e1acc23e835018c3c13d8f29115cb285035151;hp=d2dd75ab60f684b65a02611a24c6b4b6283baedb;hpb=050b5a6c7d4864cff968d171b6cc4e68ea478835;p=pulseview.git
diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index d2dd75a..e29bbe8 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -15,8 +15,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 "analog.hpp"
@@ -31,15 +30,15 @@ using std::dynamic_pointer_cast;
using std::shared_ptr;
using sigrok::Channel;
-using sigrok::ChannelType;
namespace pv {
namespace data {
const int SignalBase::ColourBGAlpha = 8*256/100;
-SignalBase::SignalBase(shared_ptr channel) :
- channel_(channel)
+SignalBase::SignalBase(shared_ptr channel, ChannelType channel_type) :
+ channel_(channel),
+ channel_type_(channel_type)
{
if (channel_)
internal_name_ = QString::fromStdString(channel_->name());
@@ -83,9 +82,9 @@ void SignalBase::set_enabled(bool value)
}
}
-const ChannelType *SignalBase::type() const
+SignalBase::ChannelType SignalBase::type() const
{
- return (channel_) ? channel_->type() : nullptr;
+ return channel_type_;
}
unsigned int SignalBase::index() const
@@ -120,18 +119,18 @@ void SignalBase::set_data(shared_ptr data)
shared_ptr SignalBase::analog_data() const
{
- if (type() == ChannelType::ANALOG)
+ if (channel_type_ == AnalogChannel)
return dynamic_pointer_cast(data_);
else
- return shared_ptr();
+ return nullptr;
}
shared_ptr SignalBase::logic_data() const
{
- if (type() == ChannelType::LOGIC)
+ if (channel_type_ == LogicChannel)
return dynamic_pointer_cast(data_);
else
- return shared_ptr();
+ return nullptr;
}
#ifdef ENABLE_DECODE
@@ -140,17 +139,32 @@ bool SignalBase::is_decode_signal() const
return (decoder_stack_ != nullptr);
}
-std::shared_ptr SignalBase::decoder_stack() const
+shared_ptr SignalBase::decoder_stack() const
{
return decoder_stack_;
}
-void SignalBase::set_decoder_stack(std::shared_ptr
+void SignalBase::set_decoder_stack(shared_ptr
decoder_stack)
{
decoder_stack_ = decoder_stack;
}
#endif
+void SignalBase::save_settings(QSettings &settings) const
+{
+ settings.setValue("name", name());
+ settings.setValue("enabled", enabled());
+ settings.setValue("colour", colour());
+}
+
+void SignalBase::restore_settings(QSettings &settings)
+{
+ set_name(settings.value("name").toString());
+ set_enabled(settings.value("enabled").toBool());
+ set_colour(settings.value("colour").value());
+}
+
+
} // namespace data
} // namespace pv