projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
org.sigrok.PulseView.appdata.xml: Add <mimetype> tag.
[pulseview.git]
/
pv
/
view
/
tracetreeitemowner.cpp
diff --git
a/pv/view/tracetreeitemowner.cpp
b/pv/view/tracetreeitemowner.cpp
index 56433752889987d01becd4b92eb5c27cd86917cb..bff63c762135e2b402941a856118b7097cc77079 100644
(file)
--- a/
pv/view/tracetreeitemowner.cpp
+++ b/
pv/view/tracetreeitemowner.cpp
@@
-14,35
+14,34
@@
* 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 <cassert>
#include "tracetreeitem.hpp"
*/
#include <cassert>
#include "tracetreeitem.hpp"
-#include "tracetreeitemowner.hpp"
#include "trace.hpp"
#include "trace.hpp"
+#include "tracetreeitemowner.hpp"
-using std::dynamic_pointer_cast;
-using std::max;
+using std::find;
using std::make_pair;
using std::make_pair;
+using std::max;
using std::min;
using std::pair;
using std::min;
using std::pair;
-using std::set;
using std::shared_ptr;
using std::static_pointer_cast;
using std::vector;
namespace pv {
using std::shared_ptr;
using std::static_pointer_cast;
using std::vector;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
{
return items_;
}
const ViewItemOwner::item_list& TraceTreeItemOwner::child_items() const
{
return items_;
}
-vector< s
td::s
hared_ptr<TraceTreeItem> >
+vector< shared_ptr<TraceTreeItem> >
TraceTreeItemOwner::trace_tree_child_items() const
{
vector< shared_ptr<TraceTreeItem> > items;
TraceTreeItemOwner::trace_tree_child_items() const
{
vector< shared_ptr<TraceTreeItem> > items;
@@
-65,7
+64,7
@@
void TraceTreeItemOwner::clear_child_items()
items_.clear();
}
items_.clear();
}
-void TraceTreeItemOwner::add_child_item(s
td::s
hared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::add_child_item(shared_ptr<TraceTreeItem> item)
{
assert(!item->owner());
item->set_owner(this);
{
assert(!item->owner());
item->set_owner(this);
@@
-74,11
+73,11
@@
void TraceTreeItemOwner::add_child_item(std::shared_ptr<TraceTreeItem> item)
extents_changed(true, true);
}
extents_changed(true, true);
}
-void TraceTreeItemOwner::remove_child_item(s
td::s
hared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::remove_child_item(shared_ptr<TraceTreeItem> item)
{
assert(item->owner() == this);
item->set_owner(nullptr);
{
assert(item->owner() == this);
item->set_owner(nullptr);
- auto iter =
std::
find(items_.begin(), items_.end(), item);
+ auto iter = find(items_.begin(), items_.end(), item);
assert(iter != items_.end());
items_.erase(iter);
assert(iter != items_.end());
items_.erase(iter);
@@
-87,13
+86,16
@@
void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
pair<int, int> TraceTreeItemOwner::v_extents() const
{
pair<int, int> TraceTreeItemOwner::v_extents() const
{
-
pair<int, int> extents(INT_MAX, INT_MIN)
;
+
bool has_children = false
;
+ pair<int, int> extents(INT_MAX, INT_MIN);
for (const shared_ptr<TraceTreeItem> t : trace_tree_child_items()) {
assert(t);
if (!t->enabled())
continue;
for (const shared_ptr<TraceTreeItem> t : trace_tree_child_items()) {
assert(t);
if (!t->enabled())
continue;
+ has_children = true;
+
const int child_offset = t->layout_v_offset();
const pair<int, int> child_extents = t->v_extents();
extents.first = min(child_extents.first + child_offset,
const int child_offset = t->layout_v_offset();
const pair<int, int> child_extents = t->v_extents();
extents.first = min(child_extents.first + child_offset,
@@
-102,6
+104,9
@@
pair<int, int> TraceTreeItemOwner::v_extents() const
extents.second);
}
extents.second);
}
+ if (!has_children)
+ extents = make_pair(0, 0);
+
return extents;
}
return extents;
}
@@
-109,5
+114,6
@@
void TraceTreeItemOwner::restack_items()
{
}
{
}
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv