projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
binding/prop: Add a description field.
[pulseview.git]
/
pv
/
view
/
tracegroup.hpp
diff --git
a/pv/view/tracegroup.hpp
b/pv/view/tracegroup.hpp
index 5310313ad0f51b4f30755de54b7d80e7ee3b48cd..b00d5bf5a06faf3ed131ecc2805f3ce13ee07736 100644
(file)
--- a/
pv/view/tracegroup.hpp
+++ b/
pv/view/tracegroup.hpp
@@
-14,20
+14,22
@@
* 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_TRACEGROUP_HPP
-#define PULSEVIEW_PV_VIEW_TRACEGROUP_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACEGROUP_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACEGROUP_HPP
-#include "rowitem.hpp"
-#include "rowitemowner.hpp"
+#include "tracetreeitem.hpp"
+#include "tracetreeitemowner.hpp"
+
+using std::pair;
namespace pv {
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-class TraceGroup : public
RowItem, public Row
ItemOwner
+class TraceGroup : public
TraceTreeItem, public TraceTree
ItemOwner
{
Q_OBJECT
{
Q_OBJECT
@@
-61,18
+63,18
@@
public:
/**
* Returns the view of the owner.
*/
/**
* Returns the view of the owner.
*/
- virtual
pv::view::
View* view();
+ virtual View* view();
/**
* Returns the view of the owner.
*/
/**
* Returns the view of the owner.
*/
- virtual const
pv::view::
View* view() const;
+ virtual const View* view() 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;
/**
* Paints the signal label.
/**
* Paints the signal label.
@@
-127,7
+129,8
@@
private Q_SLOTS:
void on_ungroup();
};
void on_ungroup();
};
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_TRACEGROUP_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_TRACEGROUP_HPP