* 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>
using sigrok::TriggerMatchType;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const float LogicSignal::Oversampling = 2.0f;
LogicSignal::LogicSignal(
pv::Session &session,
shared_ptr<devices::Device> device,
- shared_ptr<data::SignalBase> base,
- shared_ptr<data::Logic> data) :
+ shared_ptr<data::SignalBase> base) :
Signal(session, base),
signal_height_(QFontMetrics(QApplication::font()).height() * 2),
device_(device),
- data_(data),
trigger_none_(nullptr),
trigger_rising_(nullptr),
trigger_high_(nullptr),
shared_ptr<pv::data::SignalData> LogicSignal::data() const
{
- return data_;
+ return base_->logic_data();
}
shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
- return data_;
-}
-
-void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
-{
- data_ = data;
+ return base_->logic_data();
}
std::pair<int, int> LogicSignal::v_extents() const
vector< pair<int64_t, bool> > edges;
assert(base_);
- assert(data_);
assert(owner_);
const int y = get_visual_y();
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSegment> > &segments =
- data_->logic_segments();
+ base_->logic_data()->logic_segments();
if (segments.empty())
return;
modify_trigger();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv