X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=fa1058311f08a8f1ab906584ba65be2b75769983;hb=8de1e1b2fb1bcaaa21f08b7bba412b0839d6c4d2;hp=f35fe79f1eb839ee719f452c3ca0183b4c7348ad;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index f35fe79..fa10583 100644
--- 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 .
*/
-#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"
@@ -35,7 +34,8 @@ class AnalogSegment;
class SignalBase;
}
-namespace view {
+namespace views {
+namespace TraceView {
class AnalogSignal : public Signal
{
@@ -44,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;
@@ -53,14 +54,15 @@ private:
public:
AnalogSignal(pv::Session &session,
- std::shared_ptr base,
- std::shared_ptr data);
+ std::shared_ptr base);
virtual ~AnalogSignal() = default;
std::shared_ptr data() const;
- std::shared_ptr 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.
@@ -125,17 +127,22 @@ 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);
-private:
- std::shared_ptr data_;
+ void on_autoranging_changed(int state);
+private:
QComboBox *resolution_cb_;
float scale_;
@@ -143,11 +150,14 @@ 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 view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP