AnalogSignal: Allow separate vdiv counts for pos/neg

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

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 47a9980c0ff9dc8272aad16b391f96a8e361799d..7f0a2568fba3deea455f54bdc738cb46e1dd5ee9 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"
 
@@ -32,9 +31,11 @@ namespace pv {
 namespace data {
 class Analog;
 class AnalogSegment;
+class SignalBase;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class AnalogSignal : public Signal
 {
@@ -52,14 +53,15 @@ private:
 
 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;
 
-       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.
@@ -128,13 +130,12 @@ protected:
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private Q_SLOTS:
-       void on_vdivs_changed(int vdivs);
+       void on_pos_vdivs_changed(int vdivs);
+       void on_neg_vdivs_changed(int vdivs);
 
        void on_resolution_changed(int index);
 
 private:
-       std::shared_ptr<pv::data::Analog> data_;
-
        QComboBox *resolution_cb_;
 
        float scale_;
@@ -142,11 +143,12 @@ private:
        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
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP