Reworked RawImage class to use OpenCV
This commit is contained in:
+9
-2
@@ -27,7 +27,7 @@ int MainWindow::socketPair[2] = {0, 0};
|
||||
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
|
||||
{
|
||||
qRegisterMetaType<ImageInfoData>("ImageInfoData");
|
||||
qRegisterMetaType<RawImageAbs*>("RawImageAbs");
|
||||
qRegisterMetaType<RawImage*>("RawImage");
|
||||
|
||||
m_info = new ImageInfo(this);
|
||||
QDockWidget *infoDock = new QDockWidget(tr("Image info"), this);
|
||||
@@ -206,7 +206,14 @@ void MainWindow::socketNotify()
|
||||
void MainWindow::pixmapLoaded(Image *image)
|
||||
{
|
||||
m_image->setImage(image->pixmap());
|
||||
m_imageGL->setImage(image->rawImage());
|
||||
if(image->rawImage())
|
||||
{
|
||||
m_imageGL->setImage(image->rawImage());
|
||||
}
|
||||
else
|
||||
{
|
||||
m_imageGL->setImage(image->pixmap());
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::openFile()
|
||||
|
||||
Reference in New Issue
Block a user