X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fanalogsignal.hpp;h=9ec566b682945e7f290f4755ae16eed394942e04;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hp=06867a557db644f82fe5d01a7a16634a3420c10d;hpb=c6246dc56ed01d7e99aa65ab88b8c191300b1ebd;p=pulseview.git
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 06867a5..9ec566b 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -14,44 +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_HPP
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#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() = 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.
@@ -89,7 +99,16 @@ public:
*/
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,
@@ -101,18 +120,34 @@ private:
const double pixels_offset, const double samples_per_pixel);
/**
- * Computes the scale factor from the scale index.
+ * Computes the scale factor from the scale index and vdiv settings.
*/
- float scale() const;
+ float get_resolution(int scale_index);
+
+ void update_scale();
+
+protected:
+ void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+private Q_SLOTS:
+ void on_vdivs_changed(int vdivs);
+
+ void on_resolution_changed(int index);
private:
- std::shared_ptr data_;
+ QComboBox *resolution_cb_;
+ float scale_;
int scale_index_;
int scale_index_drag_offset_;
+
+ int div_height_;
+ int 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