projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch segment storage from single vector to vector of arrays
[pulseview.git]
/
pv
/
view
/
decodetrace.hpp
diff --git
a/pv/view/decodetrace.hpp
b/pv/view/decodetrace.hpp
index f56953209293532716cad294997482b4348dfa65..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"
@@
-58,7
+57,8
@@
namespace widgets {
class DecoderGroupBox;
}
class DecoderGroupBox;
}
-namespace view {
+namespace views {
+namespace TraceView {
class DecodeTrace : public Trace
{
class DecodeTrace : public Trace
{
@@
-199,7
+199,6
@@
private Q_SLOTS:
private:
pv::Session &session_;
private:
pv::Session &session_;
- std::shared_ptr<data::SignalBase> signalbase_;
std::vector<data::decode::Row> visible_rows_;
uint64_t decode_start_, decode_end_;
std::vector<data::decode::Row> visible_rows_;
uint64_t decode_start_, decode_end_;
@@
-218,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