AnalogSignal: Implement converted logic trace painting

[pulseview.git] / pv / view / logicsignal.hpp

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 8274b618a541b565126aa4c67562292957e29cd8..274fd6cd23437d95d8d0f0ce6ee470e4ea80a6bd 100644 (file)
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.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 <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
 
 #include <QCache>
 
@@ -27,6 +26,10 @@
 
 #include <memory>
 
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
 class QIcon;
 class QToolBar;
 
@@ -44,18 +47,20 @@ namespace data {
 class Logic;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class LogicSignal : public Signal
 {
        Q_OBJECT
 
-private:
+public:
        static const float Oversampling;
 
        static const QColor EdgeColour;
        static const QColor HighColour;
        static const QColor LowColour;
+       static const QColor SamplingPointColour;
 
        static const QColor SignalColours[10];
 
@@ -63,22 +68,21 @@ private:
        static const int TriggerMarkerPadding;
        static const char* TriggerMarkerIcons[8];
 
-public:
        LogicSignal(pv::Session &session,
-               std::shared_ptr<devices::Device> device,
-               std::shared_ptr<data::SignalBase> base);
+               shared_ptr<devices::Device> device,
+               shared_ptr<data::SignalBase> base);
 
        virtual ~LogicSignal() = default;
 
-       std::shared_ptr<pv::data::SignalData> data() const;
+       shared_ptr<pv::data::SignalData> data() const;
 
-       std::shared_ptr<pv::data::Logic> logic_data() const;
+       shared_ptr<pv::data::Logic> logic_data() const;
 
        /**
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.
         */
-       std::pair<int, int> v_extents() const;
+       pair<int, int> v_extents() const;
 
        /**
         * Returns the offset to show the drag handle.
@@ -107,13 +111,13 @@ public:
 
 private:
        void paint_caps(QPainter &p, QLineF *const lines,
-               std::vector< std::pair<int64_t, bool> > &edges,
+               vector< pair<int64_t, bool> > &edges,
                bool level, double samples_per_pixel, double pixels_offset,
                float x_offset, float y_offset);
 
        void init_trigger_actions(QWidget *parent);
 
-       const std::vector<int32_t> get_trigger_types() const;
+       const vector<int32_t> get_trigger_types() const;
        QAction* action_from_trigger_type(
                const sigrok::TriggerMatchType *type);
        const sigrok::TriggerMatchType* trigger_type_from_action(
@@ -130,7 +134,7 @@ private Q_SLOTS:
 private:
        int signal_height_;
 
-       std::shared_ptr<pv::devices::Device> device_;
+       shared_ptr<pv::devices::Device> device_;
 
        const sigrok::TriggerMatchType *trigger_match_;
        QToolBar *trigger_bar_;
@@ -145,7 +149,8 @@ private:
        static QCache<QString, const QPixmap> pixmap_cache_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP