AnalogSignal: Add conversion type and display type

[pulseview.git] / pv / view / analogsignal.hpp

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 81fdf393abb16aab3e633582a5c83060d83df0c7..5283a2c5e569d949ad9112da048432eeb7c87120 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
- * 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"
 
@@ -27,6 +26,9 @@
 
 #include <QComboBox>
 
+using std::pair;
+using std::shared_ptr;
+
 namespace pv {
 
 namespace data {
@@ -35,7 +37,8 @@ class AnalogSegment;
 class SignalBase;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class AnalogSignal : public Signal
 {
@@ -44,6 +47,7 @@ class AnalogSignal : public Signal
 private:
        static const QColor SignalColours[4];
        static const QColor GridMajorColor, GridMinorColor;
+       static const QColor SamplingPointColour;
 
        static const float EnvelopeThreshold;
 
@@ -51,19 +55,28 @@ private:
        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<data::SignalBase> base);
+       AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
        virtual ~AnalogSignal() = default;
 
-       std::shared_ptr<pv::data::SignalData> data() const;
+       shared_ptr<pv::data::SignalData> 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.
         * @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.
@@ -106,12 +119,12 @@ 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);
 
@@ -122,27 +135,41 @@ private:
 
        void update_scale();
 
+       void perform_autoranging(bool force_update = false);
+
 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_autoranging_changed(int state);
+
+       void on_conversion_changed(int index);
+
 private:
-       QComboBox *resolution_cb_;
+       QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
 
        float scale_;
        int scale_index_;
        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
+
+       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