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
/
trace.hpp
diff --git
a/pv/view/trace.hpp
b/pv/view/trace.hpp
index 397ec7c0d108380719d13313114eb6d9553dafd8..ac4540c91c1c3528aed7d5fa25a93cde30f8acf2 100644
(file)
--- 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
* 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_TRACE_HPP
-#define PULSEVIEW_PV_VIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP
#include <QColor>
#include <QPainter>
#include <QColor>
#include <QPainter>
@@
-33,6
+32,8
@@
#include "pv/data/signalbase.hpp"
#include "pv/data/signalbase.hpp"
+using std::shared_ptr;
+
class QFormLayout;
namespace pv {
class QFormLayout;
namespace pv {
@@
-41,7
+42,8
@@
namespace widgets {
class Popup;
}
class Popup;
}
-namespace view {
+namespace views {
+namespace TraceView {
class Trace : public TraceTreeItem
{
class Trace : public TraceTreeItem
{
@@
-55,7
+57,7
@@
private:
static const QColor DarkGrayBGColour;
protected:
static const QColor DarkGrayBGColour;
protected:
- Trace(s
td::s
hared_ptr<data::SignalBase> channel);
+ Trace(shared_ptr<data::SignalBase> channel);
public:
/**
public:
/**
@@
-127,7
+129,7
@@
private Q_SLOTS:
void on_colouredit_changed(const QColor &colour);
protected:
void on_colouredit_changed(const QColor &colour);
protected:
- s
td::shared_ptr<data::SignalBase> channel
_;
+ s
hared_ptr<data::SignalBase> base
_;
bool coloured_bg_, coloured_bg_state_;
private:
bool coloured_bg_, coloured_bg_state_;
private:
@@
-135,7
+137,8
@@
private:
QFormLayout *popup_form_;
};
QFormLayout *popup_form_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACE_HPP