* made a bug

git-svn-id: http://wiiqt.googlecode.com/svn/trunk@33 389f4c8b-5dfe-645f-db0e-df882bc27289
This commit is contained in:
giantpune@gmail.com 2010-12-29 04:12:20 +00:00
parent 271429a006
commit 7570278999

View File

@ -151,21 +151,21 @@ void MainWindow::on_actionLoad_triggered()
// SHOW TPL ON SCREEN // SHOW TPL ON SCREEN
//if you have a format that uses palette data, you need to add that to the last arg here //if you have a format that uses palette data, you need to add that to the last arg here
QImage img = ConvertTextureToImage( pic_data, pic_head.width, pic_head.height, pic_head.format ); QImage img = ConvertTextureToImage( pic_data, pic_head.width, pic_head.height, pic_head.format );
if( img.isNull() )//error converting if( !img.isNull() )//error converting
continue;
QGraphicsPixmapItem *item = new QGraphicsPixmapItem( QPixmap::fromImage( img ) );
if( x + img.width() + spacing >= (quint32)gv->width() )//this row is filled up, skip down and start a new row
{ {
x = spacing; QGraphicsPixmapItem *item = new QGraphicsPixmapItem( QPixmap::fromImage( img ) );
y += spacing + rowHeight; if( x + img.width() + spacing >= (quint32)gv->width() )//this row is filled up, skip down and start a new row
rowHeight = 0; {
x = spacing;
y += spacing + rowHeight;
rowHeight = 0;
}
rowHeight = MAX( rowHeight, ((quint32)img.height()) );
//qDebug() << "setting image" << ii << "at" << x << y;
item->setPos( x, y );
gs.addItem( item );
x += img.width() + spacing;
} }
rowHeight = MAX( rowHeight, ((quint32)img.height()) );
//qDebug() << "setting image" << ii << "at" << x << y;
item->setPos( x, y );
gs.addItem( item );
x += img.width() + spacing;
// SAVE TPL TO FILE // SAVE TPL TO FILE
#if 0 #if 0