projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show sampling points in analog traces.
[pulseview.git]
/
pv
/
view
/
analogsignal.hpp
diff --git
a/pv/view/analogsignal.hpp
b/pv/view/analogsignal.hpp
index 47a9980c0ff9dc8272aad16b391f96a8e361799d..fa1058311f08a8f1ab906584ba65be2b75769983 100644
(file)
--- a/
pv/view/analogsignal.hpp
+++ b/
pv/view/analogsignal.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_VIEW_ANALOGSIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_ANALOGSIGNAL_HPP
#include "signal.hpp"
#include "signal.hpp"
@@
-32,9
+31,11
@@
namespace pv {
namespace data {
class Analog;
class AnalogSegment;
namespace data {
class Analog;
class AnalogSegment;
+class SignalBase;
}
}
-namespace view {
+namespace views {
+namespace TraceView {
class AnalogSignal : public Signal
{
class AnalogSignal : public Signal
{
@@
-43,6
+44,7
@@
class AnalogSignal : public Signal
private:
static const QColor SignalColours[4];
static const QColor GridMajorColor, GridMinorColor;
private:
static const QColor SignalColours[4];
static const QColor GridMajorColor, GridMinorColor;
+ static const QColor SamplingPointColour;
static const float EnvelopeThreshold;
static const float EnvelopeThreshold;
@@
-52,14
+54,15
@@
private:
public:
AnalogSignal(pv::Session &session,
public:
AnalogSignal(pv::Session &session,
- std::shared_ptr<sigrok::Channel> channel,
- std::shared_ptr<pv::data::Analog> data);
+ std::shared_ptr<data::SignalBase> base);
virtual ~AnalogSignal() = default;
std::shared_ptr<pv::data::SignalData> data() const;
virtual ~AnalogSignal() = default;
std::shared_ptr<pv::data::SignalData> data() const;
- std::shared_ptr<pv::data::Analog> analog_data() const;
+ virtual void save_settings(QSettings &settings) const;
+
+ virtual void restore_settings(QSettings &settings);
/**
* Computes the vertical extents of the contents of this row item.
/**
* Computes the vertical extents of the contents of this row item.
@@
-124,17
+127,22
@@
private:
void update_scale();
void update_scale();
+ void perform_autoranging(bool force_update = false);
+
protected:
void populate_popup_form(QWidget *parent, QFormLayout *form);
private Q_SLOTS:
protected:
void populate_popup_form(QWidget *parent, QFormLayout *form);
private Q_SLOTS:
- void on_vdivs_changed(int vdivs);
+ void on_samples_added();
+
+ void on_pos_vdivs_changed(int vdivs);
+ void on_neg_vdivs_changed(int vdivs);
void on_resolution_changed(int index);
void on_resolution_changed(int index);
-private:
- std::shared_ptr<pv::data::Analog> data_;
+ void on_autoranging_changed(int state);
+private:
QComboBox *resolution_cb_;
float scale_;
QComboBox *resolution_cb_;
float scale_;
@@
-142,11
+150,14
@@
private:
int scale_index_drag_offset_;
int div_height_;
int scale_index_drag_offset_;
int div_height_;
- int vdivs_; // divs per positive/negative side
+ int
pos_vdivs_, neg_
vdivs_; // divs per positive/negative side
float resolution_; // e.g. 10 for 10 V/div
float resolution_; // e.g. 10 for 10 V/div
+
+ bool autoranging_;
};
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_ANALOGSIGNAL_HPP