Fix random clazy warnings

[pulseview.git] / pv / data / logic.cpp

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 6addea3b10a4440ec84357dd2d3fe47bc5ff1590..516060a0aec9013c139f8597dc0bf9bfd70de6aa 100644 (file)
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -14,59 +14,84 @@
  * 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.h"
-#include "logicsnapshot.h"
+#include "logic.hpp"
+#include "logicsegment.hpp"
 
 using std::deque;
 using std::max;
 using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace data {
 
-Logic::Logic(unsigned int num_probes) :
+Logic::Logic(unsigned int num_channels) :
        SignalData(),
-       _num_probes(num_probes)
+       num_channels_(num_channels)
 {
-       assert(_num_probes > 0);
+       assert(num_channels_ > 0);
 }
 
-int Logic::get_num_probes() const
+unsigned int Logic::num_channels() const
 {
-       return _num_probes;
+       return num_channels_;
 }
 
-void Logic::push_snapshot(
-       shared_ptr<LogicSnapshot> &snapshot)
+void Logic::push_segment(shared_ptr<LogicSegment> &segment)
 {
-       _snapshots.push_front(snapshot);
+       segments_.push_back(segment);
 }
 
-deque< shared_ptr<LogicSnapshot> >& Logic::get_snapshots()
+const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
 {
-       return _snapshots;
+       return segments_;
+}
+
+vector< shared_ptr<Segment> > Logic::segments() const
+{
+       return vector< shared_ptr<Segment> >(segments_.begin(), segments_.end());
+}
+
+uint32_t Logic::get_segment_count() const
+{
+       return (uint32_t)segments_.size();
 }
 
 void Logic::clear()
 {
-       _snapshots.clear();
+       segments_.clear();
+
+       samples_cleared();
+}
+
+double Logic::get_samplerate() const
+{
+       if (segments_.empty())
+               return 1.0;
+
+       return segments_.front()->samplerate();
 }
 
-uint64_t Logic::get_max_sample_count() const
+uint64_t Logic::max_sample_count() const
 {
        uint64_t l = 0;
-       for (std::shared_ptr<LogicSnapshot> s : _snapshots) {
+       for (const shared_ptr<LogicSegment>& s : segments_) {
                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