X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=7f0a2568fba3deea455f54bdc738cb46e1dd5ee9;hb=459db2c5cd2ab084dcf46f9e44c43916cb3ae9cf;hp=9c9c6db8aeffd04321799567935ecf3ba17417ec;hpb=368a37c2d818f9a7122f07e4a13df5416e05a02e;p=pulseview.git
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 9c9c6db..7f0a256 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"
@@ -32,9 +31,11 @@ namespace pv {
namespace data {
class Analog;
class AnalogSegment;
+class SignalBase;
}
-namespace view {
+namespace views {
+namespace TraceView {
class AnalogSignal : public Signal
{
@@ -48,17 +49,19 @@ private:
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.
@@ -96,6 +99,13 @@ 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);
@@ -120,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 data_;
-
QComboBox *resolution_cb_;
float scale_;
@@ -134,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