Skip to content

Commit

Permalink
Fix creation of Text & Bitmap shape for undo stack.
Browse files Browse the repository at this point in the history
  • Loading branch information
adeas31 committed Oct 22, 2015
1 parent 49a4408 commit 52fdcec
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 331 deletions.
4 changes: 3 additions & 1 deletion OMEdit/OMEditGUI/Annotations/BitmapAnnotation.cpp
Expand Up @@ -101,8 +101,10 @@ void BitmapAnnotation::parseShapeAnnotation(QString annotation)
}
if (!mImageSource.isEmpty()) {
mImage.loadFromData(QByteArray::fromBase64(mImageSource.toLatin1()));
} else {
} else if (!mFileName.isEmpty()) {
mImage.load(mFileName);
} else {
mImage = QImage(":/Resources/icons/bitmap-shape.svg");
}
}

Expand Down

0 comments on commit 52fdcec

Please sign in to comment.