summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--FTNoIR_Tracker_PT/pt_video_widget.cpp2
-rw-r--r--FTNoIR_Tracker_PT/pt_video_widget.h4
-rw-r--r--ftnoir_posewidget/glwidget.cpp4
-rw-r--r--ftnoir_posewidget/glwidget.h2
-rw-r--r--ftnoir_tracker_aruco/ar_video_widget.cpp2
-rw-r--r--ftnoir_tracker_aruco/ar_video_widget.h4
-rw-r--r--ftnoir_tracker_ht/ht_video_widget.cpp2
-rw-r--r--ftnoir_tracker_ht/ht_video_widget.h4
8 files changed, 12 insertions, 12 deletions
diff --git a/FTNoIR_Tracker_PT/pt_video_widget.cpp b/FTNoIR_Tracker_PT/pt_video_widget.cpp
index d0fc8d42..5ac002f4 100644
--- a/FTNoIR_Tracker_PT/pt_video_widget.cpp
+++ b/FTNoIR_Tracker_PT/pt_video_widget.cpp
@@ -57,6 +57,6 @@ void PTVideoWidget::update_and_repaint()
data[y * pitch + x * 3 + 2] = elt2.val[0];
}
qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);
- pixmap = QPixmap::fromImage(qframe);
+ texture = qframe;
update();
}
diff --git a/FTNoIR_Tracker_PT/pt_video_widget.h b/FTNoIR_Tracker_PT/pt_video_widget.h
index f5663e47..acff43fb 100644
--- a/FTNoIR_Tracker_PT/pt_video_widget.h
+++ b/FTNoIR_Tracker_PT/pt_video_widget.h
@@ -40,12 +40,12 @@ protected slots:
void paintEvent( QPaintEvent* e ) {
QMutexLocker foo(&mtx);
QPainter painter(this);
- painter.drawPixmap(e->rect(), pixmap, e->rect());
+ painter.drawImage(e->rect(), texture);
}
void update_and_repaint();
private:
QMutex mtx;
- QPixmap pixmap;
+ QImage texture;
QTimer timer;
cv::Mat _frame;
};
diff --git a/ftnoir_posewidget/glwidget.cpp b/ftnoir_posewidget/glwidget.cpp
index 71af8a08..93c98c9c 100644
--- a/ftnoir_posewidget/glwidget.cpp
+++ b/ftnoir_posewidget/glwidget.cpp
@@ -26,7 +26,7 @@ void GLWidget::paintEvent ( QPaintEvent * event ) {
QWidget::paintEvent(event);
QPainter p(this);
project_quad_texture();
- p.drawPixmap(event->rect(), pixmap, event->rect());
+ p.drawImage(event->rect(), texture);
}
void GLWidget::rotateBy(double xAngle, double yAngle, double zAngle)
@@ -226,5 +226,5 @@ void GLWidget::project_quad_texture() {
}
}
}
- pixmap = QPixmap::fromImage(texture);
+ this->texture = texture;
}
diff --git a/ftnoir_posewidget/glwidget.h b/ftnoir_posewidget/glwidget.h
index 0bb693c8..c4b2e09d 100644
--- a/ftnoir_posewidget/glwidget.h
+++ b/ftnoir_posewidget/glwidget.h
@@ -91,7 +91,7 @@ private:
double matrix[9];
QImage front;
QImage back;
- QPixmap pixmap;
+ QImage texture;
};
#endif
diff --git a/ftnoir_tracker_aruco/ar_video_widget.cpp b/ftnoir_tracker_aruco/ar_video_widget.cpp
index c452a638..9a089213 100644
--- a/ftnoir_tracker_aruco/ar_video_widget.cpp
+++ b/ftnoir_tracker_aruco/ar_video_widget.cpp
@@ -37,6 +37,6 @@ void ArucoVideoWidget::update_and_repaint()
}
}
auto qframe2 = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);
- pixmap = QPixmap::fromImage(qframe2);
+ texture = qframe2;
update();
}
diff --git a/ftnoir_tracker_aruco/ar_video_widget.h b/ftnoir_tracker_aruco/ar_video_widget.h
index b95d1873..e2cf4d9f 100644
--- a/ftnoir_tracker_aruco/ar_video_widget.h
+++ b/ftnoir_tracker_aruco/ar_video_widget.h
@@ -33,13 +33,13 @@ protected slots:
void paintEvent( QPaintEvent* e ) {
QMutexLocker foo(&mtx);
QPainter painter(this);
- painter.drawPixmap(e->rect(), pixmap, e->rect());
+ painter.drawImage(e->rect(), texture);
}
void update_and_repaint();
private:
QMutex mtx;
- QPixmap pixmap;
+ QImage texture;
QTimer timer;
cv::Mat _frame;
};
diff --git a/ftnoir_tracker_ht/ht_video_widget.cpp b/ftnoir_tracker_ht/ht_video_widget.cpp
index 8ccec997..c6d59b34 100644
--- a/ftnoir_tracker_ht/ht_video_widget.cpp
+++ b/ftnoir_tracker_ht/ht_video_widget.cpp
@@ -39,6 +39,6 @@ void HTVideoWidget::update_and_repaint()
}
}
auto qframe2 = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);
- pixmap = QPixmap::fromImage(qframe2);
+ texture = qframe2;
update();
}
diff --git a/ftnoir_tracker_ht/ht_video_widget.h b/ftnoir_tracker_ht/ht_video_widget.h
index 3fff395e..cbfe6ddc 100644
--- a/ftnoir_tracker_ht/ht_video_widget.h
+++ b/ftnoir_tracker_ht/ht_video_widget.h
@@ -32,13 +32,13 @@ protected slots:
void paintEvent( QPaintEvent* e ) {
QMutexLocker foo(&mtx);
QPainter painter(this);
- painter.drawPixmap(e->rect(), pixmap, e->rect());
+ painter.drawImage(e->rect(), texture);
}
void update_and_repaint();
private:
QMutex mtx;
- QPixmap pixmap;
+ QImage texture;
QTimer timer;
char fb[2048*2048*3];
int width,height;