* 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> channel,
- shared_ptr<data::Logic> data) :
- Signal(session, channel),
+ 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<Trigger> trigger;
- channel_->set_colour(SignalColours[channel->index() % countof(SignalColours)]);
+ base_->set_colour(SignalColours[base->index() % countof(SignalColours)]);
/* Populate this channel's trigger setting with whatever we
* find in the current session trigger, if anything. */
if ((trigger = session_.session()->trigger()))
for (auto stage : trigger->stages())
for (auto match : stage->matches())
- if (match->channel() == channel_->channel())
+ if (match->channel() == base_->channel())
trigger_match_ = match->type();
}
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(channel_);
- assert(data_);
+ assert(base_);
assert(owner_);
const int y = get_visual_y();
- if (!channel_->enabled())
+ if (!base_->enabled())
return;
const float high_offset = y - signal_height_ + 0.5f;
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;
(int64_t)0), last_sample);
segment->get_subsampled_edges(edges, start_sample, end_sample,
- samples_per_pixel / Oversampling, channel_->index());
+ samples_per_pixel / Oversampling, base_->index());
assert(edges.size() >= 2);
// Paint the edges
void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
// Draw the trigger marker
- if (!trigger_match_ || !channel_->enabled())
+ if (!trigger_match_ || !base_->enabled())
return;
const int y = get_visual_y();
const auto &matches = stage->matches();
if (std::none_of(matches.begin(), matches.end(),
[&](shared_ptr<TriggerMatch> match) {
- return match->channel() != channel_->channel(); }))
+ return match->channel() != base_->channel(); }))
continue;
auto new_stage = new_trigger->add_stage();
for (auto match : stage->matches()) {
- if (match->channel() == channel_->channel())
+ if (match->channel() == base_->channel())
continue;
new_stage->add_match(match->channel(), match->type());
}
if (new_trigger->stages().empty())
new_trigger->add_stage();
- new_trigger->stages().back()->add_match(channel_->channel(),
+ new_trigger->stages().back()->add_match(base_->channel(),
trigger_match_);
}
modify_trigger();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv