X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.hpp;h=882c2d7089d7ea90f59c752a24e8b75a7d919705;hp=0a6735f59d0787539fec1ef1cdac4e5eb91c645c;hb=489953884c0d7692fa20748314751e114ae54cf2;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da
diff --git a/pv/view/trace.hpp b/pv/view/trace.hpp
index 0a6735f5..882c2d70 100644
--- a/pv/view/trace.hpp
+++ b/pv/view/trace.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_TRACE_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
#include
#include
@@ -27,12 +26,14 @@
#include
#include
-#include
+#include
#include "tracetreeitem.hpp"
#include "pv/data/signalbase.hpp"
+using std::shared_ptr;
+
class QFormLayout;
namespace pv {
@@ -41,7 +42,8 @@ namespace widgets {
class Popup;
}
-namespace view {
+namespace views {
+namespace TraceView {
class Trace : public TraceTreeItem
{
@@ -55,7 +57,7 @@ private:
static const QColor DarkGrayBGColour;
protected:
- Trace(std::shared_ptr channel);
+ Trace(shared_ptr channel);
public:
/**
@@ -68,11 +70,6 @@ public:
*/
virtual void set_colour(QColor colour);
- /**
- * Enables or disables the coloured background for this trace.
- */
- void set_coloured_bg(bool state);
-
/**
* Paints the signal label.
* @param p the QPainter to paint into.
@@ -127,15 +124,16 @@ private Q_SLOTS:
void on_colouredit_changed(const QColor &colour);
protected:
- std::shared_ptr base_;
- bool coloured_bg_, coloured_bg_state_;
+ shared_ptr base_;
+ bool coloured_bg_state_;
private:
pv::widgets::Popup *popup_;
QFormLayout *popup_form_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP