X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Flogicsignal.hpp;h=e000a3cdf9b676536b451f25874833b1d776c9aa;hb=bcd64b9b7ae8187a9519c374e2552f6a00904251;hp=d7c4cb645b21eefc446a45acc1aae12228cc06ba;hpb=223d0c3748033130e9f11ff9af3dc29661f380e9;p=pulseview.git
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index d7c4cb6..e000a3c 100644
--- 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 .
*/
-#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
@@ -44,7 +43,8 @@ namespace data {
class Logic;
}
-namespace view {
+namespace views {
+namespace TraceView {
class LogicSignal : public Signal
{
@@ -66,17 +66,14 @@ private:
public:
LogicSignal(pv::Session &session,
std::shared_ptr device,
- std::shared_ptr channel,
- std::shared_ptr data);
+ std::shared_ptr base);
- virtual ~LogicSignal();
+ virtual ~LogicSignal() = default;
std::shared_ptr data() const;
std::shared_ptr logic_data() const;
- void set_logic_data(std::shared_ptr data);
-
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
@@ -94,13 +91,6 @@ public:
*/
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.
@@ -125,7 +115,7 @@ private:
const std::vector get_trigger_types() const;
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);
@@ -141,7 +131,6 @@ private:
int signal_height_;
std::shared_ptr device_;
- std::shared_ptr data_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
@@ -156,7 +145,8 @@ private:
static QCache pixmap_cache_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_LOGICSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP