X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fanalogsignal.hpp;h=5ea24039108908c6b2425146854b7488bfe8fd9a;hb=fdfd5b3e246a4d4a8bcf7dbb25a6179cc86c9569;hp=47a9980c0ff9dc8272aad16b391f96a8e361799d;hpb=03cc651d78a85308107e0ef3e5e514503d7c723c;p=pulseview.git
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 47a9980..5ea2403 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"
@@ -27,14 +26,19 @@
#include
+using std::pair;
+using std::shared_ptr;
+
namespace pv {
namespace data {
class Analog;
class AnalogSegment;
+class SignalBase;
}
-namespace view {
+namespace views {
+namespace TraceView {
class AnalogSignal : public Signal
{
@@ -43,29 +47,37 @@ class AnalogSignal : public Signal
private:
static const QColor SignalColours[4];
static const QColor GridMajorColor, GridMinorColor;
+ static const QColor SamplingPointColour;
+ static const int64_t TracePaintBlockSize;
static const float EnvelopeThreshold;
static const int MaximumVDivs;
static const int MaxScaleIndex, MinScaleIndex;
static const int InfoTextMarginRight, InfoTextMarginBottom;
+ enum DisplayType {
+ DisplayAnalog = 0,
+ DisplayConverted = 1,
+ DisplayBoth = 2
+ };
+
public:
- AnalogSignal(pv::Session &session,
- std::shared_ptr channel,
- std::shared_ptr data);
+ AnalogSignal(pv::Session &session, shared_ptr base);
virtual ~AnalogSignal() = default;
- std::shared_ptr data() const;
+ 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.
* @return A pair containing the minimum and maximum y-values.
*/
- std::pair v_extents() const;
+ pair v_extents() const;
/**
* Returns the offset to show the drag handle.
@@ -108,15 +120,22 @@ private:
void paint_grid(QPainter &p, int y, int left, int right);
void paint_trace(QPainter &p,
- const std::shared_ptr &segment,
+ const shared_ptr &segment,
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel);
void paint_envelope(QPainter &p,
- const std::shared_ptr &segment,
+ const shared_ptr &segment,
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel);
+ void paint_logic_mid(QPainter &p, const ViewItemPaintParams &pp);
+
+ void paint_logic_caps(QPainter &p, QLineF *const lines,
+ vector< pair > &edges,
+ bool level, double samples_per_pixel, double pixels_offset,
+ float x_offset, float y_offset);
+
/**
* Computes the scale factor from the scale index and vdiv settings.
*/
@@ -124,29 +143,45 @@ private:
void update_scale();
+ void update_conversion_type();
+
+ 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);
+
+ void on_conversion_changed(int index);
- QComboBox *resolution_cb_;
+ void on_display_type_changed(int index);
+
+private:
+ QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
float scale_;
int scale_index_;
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
+
+ data::SignalBase::ConversionType conversion_type_;
+ DisplayType display_type_;
+ bool autoranging_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP