Hochschulprojekte/CG2_Tasks
0
0
Fork 0
Code Issues Pull Requests Activity

[TASK] Restructure code for loading images.

Browse Source
This commit is contained in:
Jan Philipp Timme 2015-11-13 12:43:16 +01:00
parent 5c1e651179
commit c162f76815
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
imageviewer-qt4.cpp
View File

@ -544,19 +544,17 @@ void ImageViewer::open() {
delete image; delete image;
image = NULL; image = NULL;
} }
QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::currentPath());
if(!fileName.isEmpty()) {
image = new QImage(fileName);
if(image->isNull()) {
QMessageBox::information(this, tr("Image Viewer"), tr("Cannot load %1.").arg(fileName));
return;
} else {
if(original_image!=NULL) { if(original_image!=NULL) {
delete original_image; delete original_image;
original_image = NULL; original_image = NULL;
} }
QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), QDir::currentPath());
if(!fileName.isEmpty()) {
image = new QImage(fileName);
original_image = new QImage(fileName); original_image = new QImage(fileName);
if(image->isNull()) {
QMessageBox::information(this, tr("Image Viewer"), tr("Cannot load %1.").arg(fileName));
return;
} }
scaleFactor = 1.0; scaleFactor = 1.0;
updateImageDisplay(); updateImageDisplay();