X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fdecodetrace.cpp;h=c5fa6e91611f0c062fe08754762ccf012048a094;hb=bcd64b9b7ae8187a9519c374e2552f6a00904251;hp=832b249d4caf00f0366b2f0024aae77f05f9a85a;hpb=bb7dd726eb7159ddd80d94ede791f2e2a9eaef0f;p=pulseview.git
diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 832b249..c5fa6e9 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -14,8 +14,7 @@
* 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 .
*/
extern "C" {
@@ -72,7 +71,8 @@ using std::unordered_set;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const QColor DecodeTrace::DecodeColours[4] = {
QColor(0xEF, 0x29, 0x29), // Red
@@ -131,21 +131,20 @@ DecodeTrace::DecodeTrace(pv::Session &session,
shared_ptr signalbase, int index) :
Trace(signalbase),
session_(session),
- signalbase_(signalbase),
row_height_(0),
max_visible_rows_(0),
delete_mapper_(this),
show_hide_mapper_(this)
{
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
// Determine shortest string we want to see displayed in full
QFontMetrics m(QApplication::font());
min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
- signalbase_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name));
- signalbase_->set_colour(DecodeColours[index % countof(DecodeColours)]);
+ base_->set_name(QString::fromUtf8(decoder_stack->stack().front()->decoder()->name));
+ base_->set_colour(DecodeColours[index % countof(DecodeColours)]);
connect(decoder_stack.get(), SIGNAL(new_decode_data()),
this, SLOT(on_new_decode_data()));
@@ -186,7 +185,7 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
using namespace pv::data::decode;
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
const int text_height = ViewItemPaintParams::text_height();
row_height_ = (text_height * 6) / 4;
@@ -299,7 +298,7 @@ void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
using pv::data::decode::Decoder;
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
assert(form);
assert(parent);
@@ -605,7 +604,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
double samples_per_pixel, pixels_offset;
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
assert(decoder_stack);
@@ -660,7 +659,7 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
pair DecodeTrace::get_pixels_offset_samples_per_pixel() const
{
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
assert(owner_);
assert(decoder_stack);
@@ -733,7 +732,7 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
vector annotations;
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
assert(decoder_stack);
decoder_stack->get_annotation_subset(annotations, visible_rows_[row],
@@ -842,7 +841,7 @@ void DecodeTrace::create_decoder_form(int index,
}
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
// Add the options
shared_ptr binding(
@@ -925,7 +924,7 @@ void DecodeTrace::commit_decoder_channels(shared_ptr &dec
void DecodeTrace::commit_channels()
{
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
assert(decoder_stack);
for (shared_ptr dec : decoder_stack->stack())
@@ -958,7 +957,7 @@ void DecodeTrace::on_channel_selected(int)
void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
{
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
assert(decoder);
assert(decoder_stack);
@@ -972,7 +971,7 @@ void DecodeTrace::on_stack_decoder(srd_decoder *decoder)
void DecodeTrace::on_delete_decoder(int index)
{
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
decoder_stack->remove(index);
@@ -987,7 +986,7 @@ void DecodeTrace::on_show_hide_decoder(int index)
using pv::data::decode::Decoder;
std::shared_ptr decoder_stack =
- signalbase_->decoder_stack();
+ base_->decoder_stack();
const list< shared_ptr > stack(decoder_stack->stack());
@@ -1009,5 +1008,6 @@ void DecodeTrace::on_show_hide_decoder(int index)
owner_->row_item_appearance_changed(false, true);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv