Remove unused "using" declarations.

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

diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 56433752889987d01becd4b92eb5c27cd86917cb..31f4cb8331927133bca9073a34d16b24ac9fecbb 100644 (file)
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.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 <cassert>
@@ -24,25 +23,25 @@
 #include "tracetreeitemowner.hpp"
 #include "trace.hpp"
 
-using std::dynamic_pointer_cast;
-using std::max;
+using std::find;
 using std::make_pair;
+using std::max;
 using std::min;
 using std::pair;
-using std::set;
 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_;
 }
 
-vector< std::shared_ptr<TraceTreeItem> >
+vector< shared_ptr<TraceTreeItem> >
 TraceTreeItemOwner::trace_tree_child_items() const
 {
        vector< shared_ptr<TraceTreeItem> > items;
@@ -65,7 +64,7 @@ void TraceTreeItemOwner::clear_child_items()
        items_.clear();
 }
 
-void TraceTreeItemOwner::add_child_item(std::shared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::add_child_item(shared_ptr<TraceTreeItem> item)
 {
        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);
 }
 
-void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
+void TraceTreeItemOwner::remove_child_item(shared_ptr<TraceTreeItem> item)
 {
        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);
 
@@ -87,13 +86,16 @@ void TraceTreeItemOwner::remove_child_item(std::shared_ptr<TraceTreeItem> item)
 
 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;
 
+               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,
@@ -102,12 +104,33 @@ pair<int, int> TraceTreeItemOwner::v_extents() const
                        extents.second);
        }
 
+       if (!has_children)
+               extents = make_pair(0, 0);
+
        return extents;
 }
 
+bool TraceTreeItemOwner::reassign_bgcolour_states(bool next_bgcolour_state)
+{
+       vector< shared_ptr<TraceTreeItem> > items = trace_tree_child_items();
+
+       // Sort items according to vertical position
+       sort(items.begin(), items.end(),
+               [](const shared_ptr<TraceTreeItem> a, const shared_ptr<TraceTreeItem> b) {
+               return a->layout_v_offset() > b->layout_v_offset(); });
+
+       for (const shared_ptr<TraceTreeItem> item : items) {
+               item->set_bgcolour_state(next_bgcolour_state);
+               next_bgcolour_state = !next_bgcolour_state;
+       }
+
+       return next_bgcolour_state;
+}
+
 void TraceTreeItemOwner::restack_items()
 {
 }
 
-} // view
-} // pv
+} // namespace TraceView
+} // namespace views
+} // namespace pv