X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=109cdd374782a906d34ed558403b8e0a9d00f94b;hp=938d92d5b5c8d7e086fcef406ab66403fbc37b63;hb=430b94aaa74cbbbf805803a013b77a4d1e18daaf;hpb=223d0c3748033130e9f11ff9af3dc29661f380e9

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 938d92d5..109cdd37 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -14,50 +14,71 @@
  * 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_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
 
 #include "signal.hpp"
 
 #include <memory>
 
+#include <QComboBox>
+#include <QSpinBox>
+
+using std::pair;
+using std::shared_ptr;
+
 namespace pv {
 
 namespace data {
 class Analog;
 class AnalogSegment;
+class SignalBase;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class AnalogSignal : public Signal
 {
+	Q_OBJECT
+
 private:
-	static const int NominalHeight;
 	static const QColor SignalColours[4];
+	static const QColor GridMajorColor, GridMinorColor;
+	static const QColor SamplingPointColour;
 
+	static const int64_t TracePaintBlockSize;
 	static const float EnvelopeThreshold;
 
+	static const int MaximumVDivs;
+	static const int MaxScaleIndex, MinScaleIndex;
+	static const int InfoTextMarginRight, InfoTextMarginBottom;
+
+	enum DisplayType {
+		DisplayAnalog = 0,
+		DisplayConverted = 1,
+		DisplayBoth = 2
+	};
+
 public:
-	AnalogSignal(pv::Session &session,
-		std::shared_ptr<sigrok::Channel> channel,
-		std::shared_ptr<pv::data::Analog> data);
+	AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
+
+	virtual ~AnalogSignal() = default;
 
-	virtual ~AnalogSignal();
+	shared_ptr<pv::data::SignalData> data() const;
 
-	std::shared_ptr<pv::data::SignalData> data() const;
+	virtual void save_settings(QSettings &settings) const;
 
-	std::shared_ptr<pv::data::Analog> analog_data() const;
+	virtual void restore_settings(QSettings &settings);
 
 	/**
 	 * Computes the vertical extents of the contents of this row item.
 	 * @return A pair containing the minimum and maximum y-values.
 	 */
-	std::pair<int, int> v_extents() const;
+	pair<int, int> v_extents() const;
 
 	/**
 	 * Returns the offset to show the drag handle.
@@ -80,39 +101,89 @@ public:
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
 	 */
-	void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+	void paint_back(QPainter &p, ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
 	 */
-	void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
+	void paint_mid(QPainter &p, ViewItemPaintParams &pp);
+
+	/**
+	 * Paints the foreground layer of the item with a QPainter
+	 * @param p the QPainter to paint into.
+	 * @param pp the painting parameters object to paint with.
+	 */
+	void paint_fore(QPainter &p, ViewItemPaintParams &pp);
 
 private:
+	void paint_grid(QPainter &p, int y, int left, int right);
+
 	void paint_trace(QPainter &p,
-		const std::shared_ptr<pv::data::AnalogSegment> &segment,
+		const shared_ptr<pv::data::AnalogSegment> &segment,
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
 	void paint_envelope(QPainter &p,
-		const std::shared_ptr<pv::data::AnalogSegment> &segment,
+		const shared_ptr<pv::data::AnalogSegment> &segment,
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
+	void paint_logic_mid(QPainter &p, ViewItemPaintParams &pp);
+
+	void paint_logic_caps(QPainter &p, QLineF *const lines,
+		vector< pair<int64_t, bool> > &edges,
+		bool level, double samples_per_pixel, double pixels_offset,
+		float x_offset, float y_offset);
+
 	/**
-	 * Computes the scale factor from the scale index.
+	 * Computes the scale factor from the scale index and vdiv settings.
 	 */
-	float scale() const;
+	float get_resolution(int scale_index);
+
+	void update_scale();
+
+	void update_conversion_type();
+
+	void perform_autoranging(bool keep_divs, bool force_update);
+
+protected:
+	void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+private Q_SLOTS:
+	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_autoranging_changed(int state);
+
+	void on_conversion_changed(int index);
+
+	void on_display_type_changed(int index);
 
 private:
-	std::shared_ptr<pv::data::Analog> data_;
+	QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
+	QSpinBox *pvdiv_sb_, *nvdiv_sb_;
 
+	float scale_;
 	int scale_index_;
 	int scale_index_drag_offset_;
+
+	int div_height_;
+	int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
+	float resolution_; // e.g. 10 for 10 V/div
+
+	data::SignalBase::ConversionType conversion_type_;
+	DisplayType display_type_;
+	bool autoranging_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP