Commit 30a85d2d authored by Jan Möbius's avatar Jan Möbius

Fixed bad snapshot commit

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12366 383ad7c9-94d9-4d36-a494-682f7c89f535
parent daa4a94f
...@@ -687,16 +687,16 @@ void CoreWidget::viewerSnapshot() { ...@@ -687,16 +687,16 @@ void CoreWidget::viewerSnapshot() {
examiner_widgets_[0]->snapshot(img[0]); examiner_widgets_[0]->snapshot(img[0]);
examiner_widgets_[1]->snapshot(img[1]); examiner_widgets_[1]->snapshot(img[1]);
QImage finalImage(img[0].width() + img[1].width() +2, img[0].height(), QImage::Format_ARGB32_Premultiplied); QImage* finalImage = new QImage(img[0].width() + img[1].width() +2, img[0].height(), QImage::Format_ARGB32_Premultiplied);
QPainter painter(&finalImage); QPainter painter(finalImage);
painter.fillRect(0,0,finalImage.width(), finalImage.height(), QBrush(Qt::gray)); painter.fillRect(0,0,finalImage->width(), finalImage->height(), QBrush(Qt::gray));
painter.drawImage(QRectF( 0, 0, img[0].width(), img[0].height()),img[0], painter.drawImage(QRectF( 0, 0, img[0].width(), img[0].height()),img[0],
QRectF( 0, 0, img[0].width(), img[0].height()) ); QRectF( 0, 0, img[0].width(), img[0].height()) );
painter.drawImage(QRectF(img[0].width()+2, 0, img[1].width(), img[1].height()),img[1], painter.drawImage(QRectF(img[0].width()+2, 0, img[1].width(), img[1].height()),img[1],
QRectF( 0, 0, img[1].width(), img[1].height()) ); QRectF( 0, 0, img[1].width(), img[1].height()) );
writeImageAsynchronously(finalImage, suggest); writeImageAsynchronously(finalImage, suggest);
......
...@@ -191,8 +191,8 @@ glViewer* QtGLGraphicsScene::findView (const QPointF &_p, bool _setActive) ...@@ -191,8 +191,8 @@ glViewer* QtGLGraphicsScene::findView (const QPointF &_p, bool _setActive)
{ {
if (_setActive && PluginFunctions::activeExaminer() != i) if (_setActive && PluginFunctions::activeExaminer() != i)
{ {
PluginFunctions::setActiveExaminer (i); PluginFunctions::setActiveExaminer(i);
update(); update();
} }
return views_->at(i); return views_->at(i);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment