projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Restructure add_view()
[pulseview.git]
/
pv
/
view
/
decodetrace.hpp
diff --git
a/pv/view/decodetrace.hpp
b/pv/view/decodetrace.hpp
index 2705d3cf4a90c2fd3ca8b522900cb5bbc555ca81..6d703ec5fe66906ebe69aebed1c575464a447436 100644
(file)
--- a/
pv/view/decodetrace.hpp
+++ b/
pv/view/decodetrace.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_DECODETRACE_HPP
-#define PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#ifndef PULSEVIEW_PV_VIEW
S_TRACEVIEW
_DECODETRACE_HPP
+#define PULSEVIEW_PV_VIEW
S_TRACEVIEW
_DECODETRACE_HPP
#include "trace.hpp"
#include "trace.hpp"
@@
-31,6
+30,7
@@
#include <QSignalMapper>
#include <pv/binding/decoder.hpp>
#include <QSignalMapper>
#include <pv/binding/decoder.hpp>
+#include <pv/data/signalbase.hpp>
#include <pv/data/decode/row.hpp>
struct srd_channel;
#include <pv/data/decode/row.hpp>
struct srd_channel;
@@
-44,6
+44,7
@@
class Session;
namespace data {
class DecoderStack;
namespace data {
class DecoderStack;
+class SignalBase;
namespace decode {
class Annotation;
namespace decode {
class Annotation;
@@
-56,7
+57,8
@@
namespace widgets {
class DecoderGroupBox;
}
class DecoderGroupBox;
}
-namespace view {
+namespace views {
+namespace TraceView {
class DecodeTrace : public Trace
{
class DecodeTrace : public Trace
{
@@
-84,14
+86,15
@@
private:
static const QColor OutlineColours[16];
public:
static const QColor OutlineColours[16];
public:
- DecodeTrace(pv::Session &session,
- std::shared_ptr<pv::data::DecoderStack> decoder_stack,
+ DecodeTrace(pv::Session &session, std::shared_ptr<data::SignalBase> signalbase,
int index);
bool enabled() const;
const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
int index);
bool enabled() const;
const std::shared_ptr<pv::data::DecoderStack>& decoder() const;
+ std::shared_ptr<data::SignalBase> base() 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.
@@
-196,8
+199,8
@@
private Q_SLOTS:
private:
pv::Session &session_;
private:
pv::Session &session_;
- std::shared_ptr<pv::data::DecoderStack> decoder_stack_;
+ std::vector<data::decode::Row> visible_rows_;
uint64_t decode_start_, decode_end_;
std::list< std::shared_ptr<pv::binding::Decoder> >
uint64_t decode_start_, decode_end_;
std::list< std::shared_ptr<pv::binding::Decoder> >
@@
-206,7
+209,6
@@
private:
std::list<ChannelSelector> channel_selectors_;
std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
std::list<ChannelSelector> channel_selectors_;
std::vector<pv::widgets::DecoderGroupBox*> decoder_forms_;
- std::vector<data::decode::Row> visible_rows_;
std::map<data::decode::Row, int> row_title_widths_;
int row_height_, max_visible_rows_;
std::map<data::decode::Row, int> row_title_widths_;
int row_height_, max_visible_rows_;
@@
-215,7
+217,8
@@
private:
QSignalMapper delete_mapper_, show_hide_mapper_;
};
QSignalMapper delete_mapper_, show_hide_mapper_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_DECODETRACE_HPP
+#endif // PULSEVIEW_PV_VIEW
S_TRACEVIEW
_DECODETRACE_HPP