projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LogicSegment: Remove constructor requiring sigrok::Logic
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index dba99253eeb7a77f559f537cf7cf03b652adcbab..854dae3e68eaaec8d71212219365323abcefbbe8 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-14,18
+14,18
@@
* 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 <cassert>
#include "analog.hpp"
*/
#include <cassert>
#include "analog.hpp"
-#include "analogs
napsho
t.hpp"
+#include "analogs
egmen
t.hpp"
using std::deque;
using std::max;
using std::shared_ptr;
using std::deque;
using std::max;
using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-35,30
+35,44
@@
Analog::Analog() :
{
}
{
}
-void Analog::push_s
napshot(shared_ptr<AnalogSnapshot> &snapsho
t)
+void Analog::push_s
egment(shared_ptr<AnalogSegment> &segmen
t)
{
{
- s
napshots_.push_front(snapsho
t);
+ s
egments_.push_front(segmen
t);
}
}
-const deque< shared_ptr<AnalogS
napshot> >& Analog::analog_snapsho
ts() const
+const deque< shared_ptr<AnalogS
egment> >& Analog::analog_segmen
ts() const
{
{
- return snapshots_;
+ return segments_;
+}
+
+vector< shared_ptr<Segment> > Analog::segments() const
+{
+ return vector< shared_ptr<Segment> >(
+ segments_.begin(), segments_.end());
}
void Analog::clear()
{
}
void Analog::clear()
{
- snapshots_.clear();
+ segments_.clear();
+
+ samples_cleared();
}
}
-uint64_t Analog::
get_
max_sample_count() const
+uint64_t Analog::max_sample_count() const
{
uint64_t l = 0;
{
uint64_t l = 0;
- for (const s
td::shared_ptr<AnalogSnapshot> s : snapsho
ts_) {
+ for (const s
hared_ptr<AnalogSegment> s : segmen
ts_) {
assert(s);
l = max(l, s->get_sample_count());
}
return l;
}
assert(s);
l = max(l, s->get_sample_count());
}
return l;
}
+void Analog::notify_samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample)
+{
+ samples_added(segment, start_sample, end_sample);
+}
+
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv