diff -r b21da6f583be -r a022701d47f5 src/EditProductTab13.cpp --- a/src/EditProductTab13.cpp Sat Jan 21 14:27:10 2023 +0100 +++ b/src/EditProductTab13.cpp Sat Jan 21 16:18:37 2023 +0100 @@ -41,7 +41,7 @@ QSqlQuery query; qDebug() << " loading data"; - query.prepare("SELECT * FROM products_pics WHERE uuid=:uuid"); + query.prepare("SELECT * FROM products_pics WHERE uuid=:uuid ORDER BY record"); query.bindValue(":uuid", product->uuid); query.exec(); @@ -77,7 +77,6 @@ } images_Main(product->images_current); - // If any, show picture 1 // Stop spinner } @@ -97,8 +96,8 @@ QPixmap outPixmap = QPixmap(); outPixmap.loadFromData(product->images_list.at(i).pic_data); - qDebug() << " " << outPixmap.width() << "x" << outPixmap.height() << "size" << outPixmap.size() << product->images_list.at(i).filename; - qDebug() << " " << ui->filmStrip->iconSize(); +// qDebug() << " " << outPixmap.width() << "x" << outPixmap.height() << "size" << outPixmap.size() << product->images_list.at(i).filename; +// qDebug() << " " << ui->filmStrip->iconSize(); if (outPixmap.width() > 240 || outPixmap.height() > 180) newItem->setIcon(QIcon(outPixmap.scaled(240, 180, Qt::KeepAspectRatio, Qt::SmoothTransformation))); else @@ -119,6 +118,8 @@ ui->printImage->setEnabled((product->images_count > 0) ? true:false); ui->delImage->setEnabled((product->images_count > 0) ? true:false); + const QSignalBlocker blocker1(ui->image_typeEdit); + if (product->images_count < 1) { ui->image_filenameEdit->setText(""); ui->image_timestampEdit->setText(""); @@ -341,3 +342,50 @@ } } + +void EditProduct::pictype_changed(int val) +{ + qDebug() << "pictype_changed" << val; + + product->images_list[ui->filmStrip->currentRow()].pic_type = val; + + QSqlQuery query; + query.prepare("UPDATE products_pics SET pic_type=:pic_type WHERE record=:record"); + query.bindValue(":pic_type", val); + query.bindValue(":record", product->images_list.at(ui->filmStrip->currentRow()).record); + query.exec(); + + if (query.lastError().isValid()) { + qWarning() << "pictype_changed()" << query.lastError(); + QMessageBox::warning(this, tr("Database error"), tr("MySQL error: %1\n%2\n%3") + .arg(query.lastError().nativeErrorCode()).arg(query.lastError().driverText()).arg(query.lastError().databaseText())); + } + + images_Thumbnails(); +} + + +void EditProduct::piccomment_changed() +{ + qDebug() << "piccomment_changed" << ui->image_commentEdit->text(); + + product->images_list[ui->filmStrip->currentRow()].pic_comment = ui->image_commentEdit->text(); + + QSqlQuery query; + qDebug() << "piccomment_changed 0"; + query.prepare("UPDATE products_pics SET pic_comment=:pic_comment WHERE record=:record"); + query.bindValue(":pic_comment", ui->image_commentEdit->text()); + query.bindValue(":record", product->images_list.at(ui->filmStrip->currentRow()).record); + qDebug() << "piccomment_changed 1"; + query.exec(); + qDebug() << "piccomment_changed 2"; + + if (query.lastError().isValid()) { + qWarning() << "pictype_changed()" << query.lastError(); + QMessageBox::warning(this, tr("Database error"), tr("MySQL error: %1\n%2\n%3") + .arg(query.lastError().nativeErrorCode()).arg(query.lastError().driverText()).arg(query.lastError().databaseText())); + } + qDebug() << "piccomment_changed 3"; +} + +