projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tie the "sticky scrolling" setting in with the settings mgmt
[pulseview.git]
/
pv
/
view
/
tracegroup.cpp
diff --git
a/pv/view/tracegroup.cpp
b/pv/view/tracegroup.cpp
index 140b85187efef4f2309837db938db75a6de82dce..490f39c5457187a0c808cc32684abb25f8fcb3d9 100644
(file)
--- a/
pv/view/tracegroup.cpp
+++ b/
pv/view/tracegroup.cpp
@@
-14,13
+14,12
@@
* 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/>.
*/
#include <extdef.h>
*/
#include <extdef.h>
-#include <assert.h>
+#include <cassert>
#include <algorithm>
#include <QMenu>
#include <algorithm>
#include <QMenu>
@@
-33,7
+32,8
@@
using std::shared_ptr;
using std::vector;
namespace pv {
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
const int TraceGroup::Padding = 8;
const int TraceGroup::Width = 12;
@@
-64,13
+64,13
@@
const pv::Session& TraceGroup::session() const
return owner_->session();
}
return owner_->session();
}
-
pv::view::
View* TraceGroup::view()
+View* TraceGroup::view()
{
assert(owner_);
return owner_->view();
}
{
assert(owner_);
return owner_->view();
}
-const
pv::view::
View* TraceGroup::view() const
+const View* TraceGroup::view() const
{
assert(owner_);
return owner_->view();
{
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();
[](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;
(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);
}
owner_->extents_changed(horz, vert);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
} // namespace pv