X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Flogicsignal.cpp;h=cb170fe0b45a1a7da62aa7c8d0a559e3ad74c735;hb=e3ac35531f1e76a31669e821e14dbeb95a5cba63;hp=52a2d22dab76050dfdf4345801dd74724dcf198b;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git
diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 52a2d22..cb170fe 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -14,8 +14,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
@@ -59,7 +58,8 @@ using sigrok::TriggerMatch;
using sigrok::TriggerMatchType;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const float LogicSignal::Oversampling = 2.0f;
@@ -99,12 +99,10 @@ QCache LogicSignal::pixmap_cache_;
LogicSignal::LogicSignal(
pv::Session &session,
shared_ptr device,
- shared_ptr base,
- shared_ptr data) :
+ shared_ptr base) :
Signal(session, base),
signal_height_(QFontMetrics(QApplication::font()).height() * 2),
device_(device),
- data_(data),
trigger_none_(nullptr),
trigger_rising_(nullptr),
trigger_high_(nullptr),
@@ -128,17 +126,12 @@ LogicSignal::LogicSignal(
shared_ptr LogicSignal::data() const
{
- return data_;
+ return base_->logic_data();
}
shared_ptr LogicSignal::logic_data() const
{
- return data_;
-}
-
-void LogicSignal::set_logic_data(std::shared_ptr data)
-{
- data_ = data;
+ return base_->logic_data();
}
std::pair LogicSignal::v_extents() const
@@ -167,7 +160,6 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
vector< pair > edges;
assert(base_);
- assert(data_);
assert(owner_);
const int y = get_visual_y();
@@ -179,7 +171,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
const float low_offset = y + 0.5f;
const deque< shared_ptr > &segments =
- data_->logic_segments();
+ base_->logic_data()->logic_segments();
if (segments.empty())
return;
@@ -493,5 +485,6 @@ void LogicSignal::on_trigger()
modify_trigger();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv