X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fanalogsignal.hpp;h=5223338ce5c579d08ebb608fae389ec88b1bb777;hb=73e377feaaf01e790c87a4a0c918a36e87a9a6b9;hp=10cbab531810ad7d376da34d500d5276fd7576f8;hpb=5b5fa4da3b7112414b9f51e6626ae7f4bf606f02;p=pulseview.git
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 10cbab5..5223338 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -14,46 +14,54 @@
* 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_H
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
#include "signal.hpp"
#include
+#include
+
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 float EnvelopeThreshold;
+ static const int MaximumVDivs;
+ static const int MaxScaleIndex, MinScaleIndex;
+ static const int InfoTextMarginRight, InfoTextMarginBottom;
+
public:
AnalogSignal(pv::Session &session,
- std::shared_ptr channel,
- std::shared_ptr data);
+ std::shared_ptr base);
- virtual ~AnalogSignal();
+ virtual ~AnalogSignal() = default;
std::shared_ptr data() const;
- std::shared_ptr analog_data() const;
+ virtual void save_settings(QSettings &settings) const;
- void set_scale(float scale);
+ virtual void restore_settings(QSettings &settings);
/**
* Computes the vertical extents of the contents of this row item.
@@ -61,21 +69,46 @@ public:
*/
std::pair v_extents() const;
+ /**
+ * Returns the offset to show the drag handle.
+ */
+ int scale_handle_offset() const;
+
+ /**
+ * Handles the scale handle being dragged to an offset.
+ * @param offset the offset the scale handle was dragged to.
+ */
+ void scale_handle_dragged(int offset);
+
+ /**
+ * @copydoc pv::view::Signal::signal_scale_handle_drag_release()
+ */
+ void scale_handle_drag_release();
+
/**
* Paints the background 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_back(QPainter &p, const 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);
+ /**
+ * 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, const ViewItemPaintParams &pp);
+
private:
+ void paint_grid(QPainter &p, int y, int left, int right);
+
void paint_trace(QPainter &p,
const std::shared_ptr &segment,
int y, int left, const int64_t start, const int64_t end,
@@ -86,12 +119,42 @@ private:
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel);
+ /**
+ * Computes the scale factor from the scale index and vdiv settings.
+ */
+ float get_resolution(int scale_index);
+
+ void update_scale();
+
+ void perform_autoranging(bool force_update = false);
+
+protected:
+ void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+private Q_SLOTS:
+ 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:
- std::shared_ptr data_;
+ QComboBox *resolution_cb_;
+
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
+
+ bool autoranging_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP