projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
license: remove FSF postal address from boiler plate license text
[pulseview.git]
/
pv
/
data
/
analog.hpp
diff --git
a/pv/data/analog.hpp
b/pv/data/analog.hpp
index c0c6bd6f07d82ca2b20ddb7db2e15b83c2110b62..6634728a78e45e6c7ab73fe3661ccf1a80e65f71 100644
(file)
--- a/
pv/data/analog.hpp
+++ b/
pv/data/analog.hpp
@@
-14,12
+14,11
@@
* 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/>.
*/
*/
-#ifndef PULSEVIEW_PV_DATA_ANALOG_H
-#define PULSEVIEW_PV_DATA_ANALOG_H
+#ifndef PULSEVIEW_PV_DATA_ANALOG_H
PP
+#define PULSEVIEW_PV_DATA_ANALOG_H
PP
#include "signaldata.hpp"
#include "signaldata.hpp"
@@
-29,28
+28,30
@@
namespace pv {
namespace data {
namespace pv {
namespace data {
-class AnalogS
napsho
t;
+class AnalogS
egmen
t;
class Analog : public SignalData
{
public:
Analog();
class Analog : public SignalData
{
public:
Analog();
- void push_s
napsho
t(
- std::shared_ptr<AnalogS
napshot> &snapsho
t);
+ void push_s
egmen
t(
+ std::shared_ptr<AnalogS
egment> &segmen
t);
- const std::deque< std::shared_ptr<AnalogSnapshot> >&
- analog_snapshots() const;
+ const std::deque< std::shared_ptr<AnalogSegment> >&
+ analog_segments() const;
+
+ std::vector< std::shared_ptr<Segment> > segments() const;
void clear();
void clear();
- uint64_t
get_
max_sample_count() const;
+ uint64_t max_sample_count() const;
private:
private:
- std::deque< std::shared_ptr<AnalogS
napshot> > snapsho
ts_;
+ std::deque< std::shared_ptr<AnalogS
egment> > segmen
ts_;
};
} // namespace data
} // namespace pv
};
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_ANALOG_H
+#endif // PULSEVIEW_PV_DATA_ANALOG_H
PP