TraceView: Center traces more than once

[pulseview.git] / pv / view / tracegroup.cpp

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 140b85187efef4f2309837db938db75a6de82dce..e33bba4ea7aeb7aaad9d68abf0194ffb3768331c 100644 (file)
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.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 <http://www.gnu.org/licenses/>.
  */
 
 #include <extdef.h>
@@ -33,7 +32,8 @@ using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const int TraceGroup::Padding = 8;
 const int TraceGroup::Width = 12;
@@ -64,13 +64,13 @@ const pv::Session& TraceGroup::session() const
        return owner_->session();
 }
 
-pv::view::View* TraceGroup::view()
+View* TraceGroup::view()
 {
        assert(owner_);
        return owner_->view();
 }
 
-const pv::view::View* TraceGroup::view() const
+const View* TraceGroup::view() const
 {
        assert(owner_);
        return owner_->view();
@@ -164,7 +164,7 @@ void TraceGroup::restack_items()
                [](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
                        const auto aext = a->v_extents();
                        const auto bext = b->v_extents();
-                        return a->layout_v_offset() +
+                       return a->layout_v_offset() +
                                        (aext.first + aext.second) / 2 <
                                b->layout_v_offset() +
                                        (bext.first + bext.second) / 2;
@@ -222,5 +222,6 @@ void TraceGroup::extents_changed(bool horz, bool vert)
                owner_->extents_changed(horz, vert);
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv