X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=a179cef1c6ca572609e12ad10ad3ad2de2eef59e;hb=64a21e782d6c9081f13f8398e6408c13648d1d14;hp=564b331cf99e6157c92f857f8126a80700c5efc4;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 564b331c..a179cef1 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,13 +14,12 @@
  * 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 <algorithm>
 #include <cassert>
 #include <cmath>
-#include <algorithm>
 #include <limits>
 
 #include "signal.hpp"
@@ -38,10 +37,7 @@ using std::abs;
 using std::back_inserter;
 using std::copy;
 using std::dynamic_pointer_cast;
-using std::max;
-using std::min;
-using std::none_of;
-using std::numeric_limits;
+using std::none_of; // Used in assert()s.
 using std::shared_ptr;
 using std::stable_sort;
 using std::vector;
@@ -63,8 +59,7 @@ shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
 	const vector< shared_ptr<ViewItem> > items(this->items());
 	for (auto i = items.rbegin(); i != items.rend(); i++)
-		if ((*i)->enabled() &&
-			(*i)->hit_box_rect(pp).contains(pt))
+		if ((*i)->enabled() && (*i)->hit_box_rect(pp).contains(pt))
 			return *i;
 	return nullptr;
 }
@@ -103,7 +98,7 @@ void Viewport::drag_release()
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
 	vector< shared_ptr<ViewItem> > items;
-	const std::vector< shared_ptr<ViewItem> > view_items(
+	const vector< shared_ptr<ViewItem> > view_items(
 		view_.list_by_type<ViewItem>());
 	copy(view_items.begin(), view_items.end(), back_inserter(items));
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
@@ -158,6 +153,12 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
+	typedef void (ViewItem::*LayerPaintFunc)(
+		QPainter &p, ViewItemPaintParams &pp);
+	LayerPaintFunc layer_paint_funcs[] = {
+		&ViewItem::paint_back, &ViewItem::paint_mid,
+		&ViewItem::paint_fore, nullptr};
+
 	vector< shared_ptr<RowItem> > row_items(view_.list_by_type<RowItem>());
 	assert(none_of(row_items.begin(), row_items.end(),
 		[](const shared_ptr<RowItem> &r) { return !r; }));
@@ -173,24 +174,16 @@ void Viewport::paintEvent(QPaintEvent*)
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
-	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
-
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_back(p, pp);
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_back(p, pp);
-
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_mid(p, pp);
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_mid(p, pp);
+	for (LayerPaintFunc *paint_func = layer_paint_funcs;
+			*paint_func; paint_func++) {
+		ViewItemPaintParams time_pp(rect(), view_.scale(), view_.offset());
+		for (const shared_ptr<TimeItem> t : time_items)
+			(t.get()->*(*paint_func))(p, time_pp);
 
-	for (const shared_ptr<RowItem> r : row_items)
-		r->paint_fore(p, pp);
-
-	p.setRenderHint(QPainter::Antialiasing, false);
-	for (const shared_ptr<TimeItem> t : time_items)
-		t->paint_fore(p, pp);
+		ViewItemPaintParams row_pp(rect(), view_.scale(), view_.offset());
+		for (const shared_ptr<RowItem> r : row_items)
+			(r.get()->*(*paint_func))(p, row_pp);
+	}
 
 	p.end();
 }