projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9aa2602
)
SignalData: Renamed get_max_sample_count
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 28 Mar 2015 12:35:50 +0000
(12:35 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Thu, 28 May 2015 14:59:04 +0000
(15:59 +0100)
pv/data/analog.cpp
patch
|
blob
|
history
pv/data/analog.hpp
patch
|
blob
|
history
pv/data/decoderstack.cpp
patch
|
blob
|
history
pv/data/decoderstack.hpp
patch
|
blob
|
history
pv/data/logic.cpp
patch
|
blob
|
history
pv/data/logic.hpp
patch
|
blob
|
history
pv/data/signaldata.hpp
patch
|
blob
|
history
pv/view/view.cpp
patch
|
blob
|
history
diff --git
a/pv/data/analog.cpp
b/pv/data/analog.cpp
index c95fffaf247518454b065ef9775cb5dcab8a2447..ca2659b175815aa02e05711f4d22b5724bf768bd 100644
(file)
--- a/
pv/data/analog.cpp
+++ b/
pv/data/analog.cpp
@@
-57,7
+57,7
@@
void Analog::clear()
segments_.clear();
}
segments_.clear();
}
-uint64_t Analog::
get_
max_sample_count() const
+uint64_t Analog::max_sample_count() const
{
uint64_t l = 0;
for (const std::shared_ptr<AnalogSegment> s : segments_) {
{
uint64_t l = 0;
for (const std::shared_ptr<AnalogSegment> s : segments_) {
diff --git
a/pv/data/analog.hpp
b/pv/data/analog.hpp
index 777deb6d01b4e161905bb8830f184c1a0d164624..58f5f3f70cda9545a7f0706e96d6f60b6adbbffe 100644
(file)
--- a/
pv/data/analog.hpp
+++ b/
pv/data/analog.hpp
@@
-46,7
+46,7
@@
public:
void clear();
void clear();
- uint64_t
get_
max_sample_count() const;
+ uint64_t max_sample_count() const;
private:
std::deque< std::shared_ptr<AnalogSegment> > segments_;
private:
std::deque< std::shared_ptr<AnalogSegment> > segments_;
diff --git
a/pv/data/decoderstack.cpp
b/pv/data/decoderstack.cpp
index e9876d21bc268299eeab4c1fd9d835a237001fd7..912d98c7bc4cda8fc364aaf76e75f9ca23584193 100644
(file)
--- a/
pv/data/decoderstack.cpp
+++ b/
pv/data/decoderstack.cpp
@@
-272,7
+272,7
@@
void DecoderStack::begin_decode()
decode_thread_ = std::thread(&DecoderStack::decode_proc, this);
}
decode_thread_ = std::thread(&DecoderStack::decode_proc, this);
}
-uint64_t DecoderStack::
get_
max_sample_count() const
+uint64_t DecoderStack::max_sample_count() const
{
uint64_t max_sample_count = 0;
{
uint64_t max_sample_count = 0;
diff --git
a/pv/data/decoderstack.hpp
b/pv/data/decoderstack.hpp
index cd380dfbec22a97e3ebfc737a1fe762adff10fc2..99df3887ce422a5a88f718d5c223c108023f65e3 100644
(file)
--- a/
pv/data/decoderstack.hpp
+++ b/
pv/data/decoderstack.hpp
@@
-107,7
+107,7
@@
public:
void clear();
void clear();
- uint64_t
get_
max_sample_count() const;
+ uint64_t max_sample_count() const;
void begin_decode();
void begin_decode();
diff --git
a/pv/data/logic.cpp
b/pv/data/logic.cpp
index 3d7f27422a024d54e7970837c87d56c8a8bf3e2d..b34635319c934c1618a81bfd0bf961c82044df8b 100644
(file)
--- a/
pv/data/logic.cpp
+++ b/
pv/data/logic.cpp
@@
-65,7
+65,7
@@
void Logic::clear()
segments_.clear();
}
segments_.clear();
}
-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_) {
{
uint64_t l = 0;
for (std::shared_ptr<LogicSegment> s : segments_) {
diff --git
a/pv/data/logic.hpp
b/pv/data/logic.hpp
index 990ad3ff9b0c3cf70c640283c2a2a319bad84941..a597027f85f7f3d4cc310bf4ad2d5e2bb334e829 100644
(file)
--- a/
pv/data/logic.hpp
+++ b/
pv/data/logic.hpp
@@
-47,7
+47,7
@@
public:
void clear();
void clear();
- uint64_t
get_
max_sample_count() const;
+ uint64_t max_sample_count() const;
private:
const unsigned int num_channels_;
private:
const unsigned int num_channels_;
diff --git
a/pv/data/signaldata.hpp
b/pv/data/signaldata.hpp
index 11768f69beab1e96d05fdcf02f7cd9a5f03eb2e9..ff30cf1a0eee15a33e2c9ca269f89d5e729755c9 100644
(file)
--- a/
pv/data/signaldata.hpp
+++ b/
pv/data/signaldata.hpp
@@
-41,7
+41,7
@@
public:
virtual void clear() = 0;
virtual void clear() = 0;
- virtual uint64_t
get_
max_sample_count() const = 0;
+ virtual uint64_t max_sample_count() const = 0;
};
} // namespace data
};
} // namespace data
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index f6c418433021d9007400b7a407cfe6e7289a6487..a05ac207beaaf734de8803f015479267ccd6d65d 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-323,7
+323,7
@@
pair<double, double> View::get_time_extents() const
const double start_time = s->start_time();
left_time = min(left_time, start_time);
right_time = max(right_time, start_time +
const double start_time = s->start_time();
left_time = min(left_time, start_time);
right_time = max(right_time, start_time +
- d->
get_
max_sample_count() / samplerate);
+ d->max_sample_count() / samplerate);
}
}
}
}