projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Channels: Make channel enable/disable options symmetric
[pulseview.git]
/
pv
/
data
/
logic.cpp
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index 96f0d1fe7e63afe40bd8a23f8124eae698ab413d..b094a0c828334059029936cd48d40cbd22844dc8 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-14,14
+14,13
@@
* 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 "logic.hpp"
*/
#include <cassert>
#include "logic.hpp"
-#include "logics
napsho
t.hpp"
+#include "logics
egmen
t.hpp"
using std::deque;
using std::max;
using std::deque;
using std::max;
@@
-38,42
+37,61
@@
Logic::Logic(unsigned int num_channels) :
assert(num_channels_ > 0);
}
assert(num_channels_ > 0);
}
-
int Logic::get_
num_channels() const
+
unsigned int Logic::
num_channels() const
{
return num_channels_;
}
{
return num_channels_;
}
-void Logic::push_snapshot(
- shared_ptr<LogicSnapshot> &snapshot)
+void Logic::push_segment(shared_ptr<LogicSegment> &segment)
{
{
- s
napshots_.push_front(snapsho
t);
+ s
egments_.push_back(segmen
t);
}
}
-const deque< shared_ptr<LogicS
napshot> >& Logic::logic_snapsho
ts() const
+const deque< shared_ptr<LogicS
egment> >& Logic::logic_segmen
ts() const
{
{
- return s
napsho
ts_;
+ return s
egmen
ts_;
}
}
-vector< shared_ptr<S
napshot> > Logic::snapsho
ts() const
+vector< shared_ptr<S
egment> > Logic::segmen
ts() const
{
{
- return vector< shared_ptr<Snapshot> >(
- snapshots_.begin(), snapshots_.end());
+ return vector< shared_ptr<Segment> >(segments_.begin(), segments_.end());
+}
+
+uint32_t Logic::get_segment_count() const
+{
+ return (uint32_t)segments_.size();
}
void Logic::clear()
{
}
void Logic::clear()
{
- snapshots_.clear();
+ segments_.clear();
+
+ samples_cleared();
}
}
-uint64_t Logic::get_max_sample_count() const
+double Logic::get_samplerate() const
+{
+ if (segments_.empty())
+ return 1.0;
+
+ return segments_.front()->samplerate();
+}
+
+uint64_t Logic::max_sample_count() const
{
uint64_t l = 0;
{
uint64_t l = 0;
- for (s
td::shared_ptr<LogicSnapshot> s : snapsho
ts_) {
+ for (s
hared_ptr<LogicSegment> 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 Logic::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