projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalBase: Implement A2D conversions
[pulseview.git]
/
pv
/
view
/
logicsignal.hpp
diff --git
a/pv/view/logicsignal.hpp
b/pv/view/logicsignal.hpp
index dfc883f505e49ae87e708bb43f1036fed98d5728..417530cb5e08319db34be176ee614545a8b2daad 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
* 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_VIEW
S_TRACEVIEW
_LOGICSIGNAL_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_LOGICSIGNAL_HPP
#include <QCache>
#include <QCache>
@@
-27,6
+26,10
@@
#include <memory>
#include <memory>
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
class QIcon;
class QToolBar;
class QIcon;
class QToolBar;
@@
-44,7
+47,8
@@
namespace data {
class Logic;
}
class Logic;
}
-namespace view {
+namespace views {
+namespace TraceView {
class LogicSignal : public Signal
{
class LogicSignal : public Signal
{
@@
-56,6
+60,7
@@
private:
static const QColor EdgeColour;
static const QColor HighColour;
static const QColor LowColour;
static const QColor EdgeColour;
static const QColor HighColour;
static const QColor LowColour;
+ static const QColor SamplingPointColour;
static const QColor SignalColours[10];
static const QColor SignalColours[10];
@@
-65,23
+70,20
@@
private:
public:
LogicSignal(pv::Session &session,
public:
LogicSignal(pv::Session &session,
- std::shared_ptr<devices::Device> device,
- std::shared_ptr<sigrok::Channel> channel,
- std::shared_ptr<pv::data::Logic> data);
-
- virtual ~LogicSignal();
+ shared_ptr<devices::Device> device,
+ shared_ptr<data::SignalBase> base);
-
std::shared_ptr<pv::data::SignalData> data() cons
t;
+
virtual ~LogicSignal() = defaul
t;
- s
td::shared_ptr<pv::data::Logic> logic_
data() const;
+ s
hared_ptr<pv::data::SignalData>
data() const;
-
void set_logic_data(std::shared_ptr<pv::data::Logic> data)
;
+
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.
*/
/**
* 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.
/**
* Returns the offset to show the drag handle.
@@
-94,38
+96,31
@@
public:
*/
void scale_handle_dragged(int offset);
*/
void scale_handle_dragged(int offset);
- /**
- * 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..
/**
* 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 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 signal with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
- *
*
/
+ */
virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
private:
void paint_caps(QPainter &p, QLineF *const lines,
virtual void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
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);
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(
QAction* action_from_trigger_type(
- const sigrok::TriggerMatchType *
match
);
+ const sigrok::TriggerMatchType *
type
);
const sigrok::TriggerMatchType* trigger_type_from_action(
QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
const sigrok::TriggerMatchType* trigger_type_from_action(
QAction *action);
void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-140,8
+135,7
@@
private Q_SLOTS:
private:
int signal_height_;
private:
int signal_height_;
- std::shared_ptr<pv::devices::Device> device_;
- std::shared_ptr<pv::data::Logic> data_;
+ shared_ptr<pv::devices::Device> device_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
@@
-156,7
+150,8
@@
private:
static QCache<QString, const QPixmap> pixmap_cache_;
};
static QCache<QString, const QPixmap> pixmap_cache_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_LOGICSIGNAL_HPP