X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=fa1058311f08a8f1ab906584ba65be2b75769983;hp=08edda36f0dcc818135747189dc76ff8ada121c2;hb=8de1e1b2fb1bcaaa21f08b7bba412b0839d6c4d2;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp index 08edda36..fa105831 100644 --- a/pv/view/analogsignal.hpp +++ b/pv/view/analogsignal.hpp @@ -14,8 +14,7 @@ * 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 . */ #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP @@ -45,6 +44,7 @@ class AnalogSignal : public Signal private: static const QColor SignalColours[4]; static const QColor GridMajorColor, GridMinorColor; + static const QColor SamplingPointColour; static const float EnvelopeThreshold; @@ -127,14 +127,21 @@ 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); + private: QComboBox *resolution_cb_; @@ -143,8 +150,10 @@ 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 + + bool autoranging_; }; } // namespace TraceView