projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop unused boost-thread dependency.
[pulseview.git]
/
pv
/
data
/
analog.cpp
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index c8497027c5c2d68c5935cbe5295c561352a9e9f4..854dae3e68eaaec8d71212219365323abcefbbe8 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-14,32
+14,64
@@
* 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 "analog.h"
-#include "analogsnapshot.h"
+#include <cassert>
-using namespace boost;
-using namespace std;
+#include "analog.hpp"
+#include "analogsegment.hpp"
+
+using std::deque;
+using std::max;
+using std::shared_ptr;
+using std::vector;
namespace pv {
namespace data {
namespace pv {
namespace data {
-Analog::Analog(uint64_t samplerate) :
- SignalData(samplerate)
+Analog::Analog() :
+ SignalData()
+{
+}
+
+void Analog::push_segment(shared_ptr<AnalogSegment> &segment)
+{
+ segments_.push_front(segment);
+}
+
+const deque< shared_ptr<AnalogSegment> >& Analog::analog_segments() const
{
{
+ return segments_;
+}
+
+vector< shared_ptr<Segment> > Analog::segments() const
+{
+ return vector< shared_ptr<Segment> >(
+ segments_.begin(), segments_.end());
+}
+
+void Analog::clear()
+{
+ segments_.clear();
+
+ samples_cleared();
}
}
-void Analog::push_snapshot(shared_ptr<AnalogSnapshot> &snapshot)
+uint64_t Analog::max_sample_count() const
{
{
- _snapshots.push_front(snapshot);
+ uint64_t l = 0;
+ for (const shared_ptr<AnalogSegment> s : segments_) {
+ assert(s);
+ l = max(l, s->get_sample_count());
+ }
+ return l;
}
}
-deque< shared_ptr<AnalogSnapshot> >& Analog::get_snapshots()
+void Analog::notify_samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample)
{
{
-
return _snapshots
;
+
samples_added(segment, start_sample, end_sample)
;
}
} // namespace data
}
} // namespace data