Random simplifications, cosmetics/whitespace/consistency fixes.

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

diff --git a/pv/data/logic.cpp b/pv/data/logic.cpp
index 3d7f27422a024d54e7970837c87d56c8a8bf3e2d..ac47c29d6ac12d004f44c23ccc80b6678e44e78b 100644 (file)
--- a/pv/data/logic.cpp
+++ b/pv/data/logic.cpp
@@ -14,8 +14,7 @@
  * 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>
@@ -43,8 +42,7 @@ unsigned int Logic::num_channels() const
        return num_channels_;
 }
 
-void Logic::push_segment(
-       shared_ptr<LogicSegment> &segment)
+void Logic::push_segment(shared_ptr<LogicSegment> &segment)
 {
        segments_.push_front(segment);
 }
@@ -56,24 +54,31 @@ const deque< shared_ptr<LogicSegment> >& Logic::logic_segments() const
 
 vector< shared_ptr<Segment> > Logic::segments() const
 {
-       return vector< shared_ptr<Segment> >(
-               segments_.begin(), segments_.end());
+       return vector< shared_ptr<Segment> >(segments_.begin(), segments_.end());
 }
 
 void Logic::clear()
 {
        segments_.clear();
+
+       samples_cleared();
 }
 
-uint64_t Logic::get_max_sample_count() const
+uint64_t Logic::max_sample_count() const
 {
        uint64_t l = 0;
-       for (std::shared_ptr<LogicSegment> s : segments_) {
+       for (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