[patch] raw converter patch

rawconverter.patch (text/plain), 19.83 KB, created by Chris Smith on 2005-04-20 09:10:52 UTC

diff -Nuar kipi-plugins/rawconverter.org/batchdialog.cpp kipi-plugins/rawconverter/batchdialog.cpp
--- kipi-plugins/rawconverter.org/batchdialog.cpp	2005-01-13 07:48:02.000000000 -0500
+++ kipi-plugins/rawconverter/batchdialog.cpp	2005-04-17 14:37:23.000000000 -0400
@@ -155,17 +155,6 @@
 
     // ---------------------------------------------------------------
 
-    hboxLayout = new QHBoxLayout(0,0,6,"layout1");
-    gammaSpinBox_ = new CSpinBox(settingsBox);
-    gammaSpinBox_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-    hboxLayout->addWidget(gammaSpinBox_);
-    hboxLayout->addWidget(new QLabel(i18n("Gamma"), settingsBox));
-    QToolTip::add(gammaSpinBox_,
-                    i18n("Specify the gamma value"));
-    settingsBoxLayout->addLayout(hboxLayout);
-
-    // ---------------------------------------------------------------
 
     hboxLayout = new QHBoxLayout(0,0,6,"layout2");
     brightnessSpinBox_ = new CSpinBox(settingsBox);
@@ -208,22 +197,21 @@
     saveButtonGroup_ = new QVButtonGroup(i18n("Save Format"),this);
     saveButtonGroup_->setRadioButtonExclusive(true);
 
-    QRadioButton *radioButton;
-    radioButton = new QRadioButton("JPEG",saveButtonGroup_);
-    QToolTip::add(radioButton,
+    jpegButton_ = new QRadioButton("JPEG",saveButtonGroup_);
+    QToolTip::add(jpegButton_,
                     i18n("Output the processed images in JPEG Format.\n"
                          "This is a lossy format, but will give\n"
                          "smaller-sized files"));
-    radioButton->setChecked(true);
+    jpegButton_->setChecked(true);
 
-    radioButton = new QRadioButton("TIFF",saveButtonGroup_);
-    QToolTip::add(radioButton,
+    tiffButton_ = new QRadioButton("TIFF",saveButtonGroup_);
+    QToolTip::add(tiffButton_,
                     i18n("Output the processed images in TIFF Format.\n"
                          "This generates large files, without\n"
                          "losing quality"));
 
-    radioButton = new QRadioButton("PPM",saveButtonGroup_);
-    QToolTip::add(radioButton,
+    ppmButton_ = new QRadioButton("PPM",saveButtonGroup_);
+    QToolTip::add(ppmButton_,
                     i18n("Output the processed images in PPM Format.\n"
                          "This generates the largest files, without\n"
                          "losing quality"));
@@ -236,9 +224,9 @@
     conflictButtonGroup_ = new QVButtonGroup(i18n("If Target File Exists"),this);
     conflictButtonGroup_->setRadioButtonExclusive(true);
 
-    radioButton = new QRadioButton(i18n("Overwrite"),conflictButtonGroup_);
-    radioButton->setChecked(true);
-    radioButton = new QRadioButton(i18n("Open file dialog"),conflictButtonGroup_);
+    overwriteButton_ = new QRadioButton(i18n("Overwrite"),conflictButtonGroup_);
+    overwriteButton_->setChecked(true);
+    promptButton_ = new QRadioButton(i18n("Open file dialog"),conflictButtonGroup_);
 
     // ---------------------------------------------------------------
 
@@ -286,7 +274,8 @@
 
     KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
     helpMenu->menu()->removeItemAt(0);
-    helpMenu->menu()->insertItem(i18n("RAW Images Batch Converter Handbook"), this, SLOT(slotHelp()), 0, -1, 0);
+    helpMenu->menu()->insertItem(i18n("RAW Images Batch Converter Handbook"),
+                                 this, SLOT(slotHelp()), 0, -1, 0);
     helpButton_->setPopup( helpMenu->menu() );
 
     // ---------------------------------------------------------------
@@ -356,8 +345,12 @@
 {
     QString ext;
 
-    QButton *btn = saveButtonGroup_->selected();
-    if (btn) ext = btn->text().lower();
+    if (saveButtonGroup_->selected() == jpegButton_)
+        ext  = "JPEG";
+    else if (saveButtonGroup_->selected() == tiffButton_)
+        ext  = "TIFF";
+    else
+        ext  = "PPM";
 
     KURL::List urlList;
 
@@ -393,7 +386,6 @@
 
     config->setGroup("RawConverter Settings");
 
-    gammaSpinBox_->setValue(config->readNumEntry("Gamma", 8));
     brightnessSpinBox_->setValue(config->readNumEntry("Brightness",10));
 
     redSpinBox_->setValue(config->readNumEntry("Red Scale",10));
@@ -412,7 +404,6 @@
 
     config->setGroup("RawConverter Settings");
 
-    config->writeEntry("Gamma", gammaSpinBox_->value());
     config->writeEntry("Brightness", brightnessSpinBox_->value());
 
     config->writeEntry("Red Scale", redSpinBox_->value());
@@ -431,9 +422,15 @@
 
 void BatchDialog::slotSaveFormatChanged()
 {
-    QString ext = saveButtonGroup_->selected()->text().lower();
-    if (ext.isEmpty()) return;
+    QString ext;
 
+    if (saveButtonGroup_->selected() == jpegButton_)
+        ext  = "JPEG";
+    else if (saveButtonGroup_->selected() == tiffButton_)
+        ext  = "TIFF";
+    else
+        ext  = "PPM";
+    
     QListViewItemIterator it( listView_ );
     while ( it.current() ) {
         CListViewItem *item = (CListViewItem*) it.current();
@@ -470,11 +467,15 @@
     Settings& s      = controller_->settings;
     s.cameraWB       = cameraWBCheckBox_->isChecked();
     s.fourColorRGB   = fourColorCheckBox_->isChecked();
-    s.gamma          = gammaSpinBox_->value()/10.0;
     s.brightness     = brightnessSpinBox_->value()/10.0;
     s.redMultiplier  = redSpinBox_->value()/10.0;
     s.blueMultiplier = blueSpinBox_->value()/10.0;
-    s.outputFormat   = saveButtonGroup_->selected()->text();
+    if (saveButtonGroup_->selected() == jpegButton_)
+        s.outputFormat  = "JPEG";
+    else if (saveButtonGroup_->selected() == tiffButton_)
+        s.outputFormat  = "TIFF";
+    else
+        s.outputFormat  = "PPM";
 
     processOne();
 }
@@ -509,7 +510,6 @@
     conflictButtonGroup_->setEnabled(!busy);
     cameraWBCheckBox_->setEnabled(!busy);
     fourColorCheckBox_->setEnabled(!busy);
-    gammaSpinBox_->setEnabled(!busy);
     brightnessSpinBox_->setEnabled(!busy);
     redSpinBox_->setEnabled(!busy);
     blueSpinBox_->setEnabled(!busy);
@@ -577,15 +577,13 @@
     QString destFile(rawItem->directory + QString("/") +
                      rawItem->dest);
 
-    if (conflictButtonGroup_->selected()->text() != i18n("Overwrite"))
+    if (conflictButtonGroup_->selected() != overwriteButton_)
     {
         struct stat statBuf;
         if (::stat(QFile::encodeName(destFile), &statBuf) == 0) {
-            QString filter("*.");
-            filter += saveButtonGroup_->selected()->text().lower();
             destFile = KFileDialog::
-                       getSaveFileName(rawItem->directory,
-                                       filter, this,
+                       getSaveFileName(rawItem->directory, QString(),
+                                       this,
                                        i18n("Save Raw Image converted "
                                             "from '%1' as").arg(rawItem->src));
         }
diff -Nuar kipi-plugins/rawconverter.org/batchdialog.h kipi-plugins/rawconverter/batchdialog.h
--- kipi-plugins/rawconverter.org/batchdialog.h	2004-12-16 18:46:30.000000000 -0500
+++ kipi-plugins/rawconverter/batchdialog.h	2005-04-17 14:37:43.000000000 -0400
@@ -31,6 +31,7 @@
 class QListViewItem;
 class QCheckBox;
 class QPushButton;
+class QRadioButton;
 class QVButtonGroup;
 class QLabel;
 class QPixmap;
@@ -80,7 +81,6 @@
     KListView*     listView_;
     QCheckBox*     cameraWBCheckBox_;
     QCheckBox*     fourColorCheckBox_;
-    CSpinBox*      gammaSpinBox_;
     CSpinBox*      brightnessSpinBox_;
     CSpinBox*      redSpinBox_;
     CSpinBox*      blueSpinBox_;
@@ -95,6 +95,13 @@
     QPushButton*   closeButton_;
     QPushButton*   abortButton_;
 
+    QRadioButton*  jpegButton_;
+    QRadioButton*  tiffButton_;
+    QRadioButton*  ppmButton_;
+
+    QRadioButton*  overwriteButton_;
+    QRadioButton*  promptButton_;
+    
     QDict<RawItem>         itemDict_;
     ProcessController     *controller_;
     bool                   busy_;
diff -Nuar kipi-plugins/rawconverter.org/dcrawprocess.cpp kipi-plugins/rawconverter/dcrawprocess.cpp
--- kipi-plugins/rawconverter.org/dcrawprocess.cpp	2004-11-08 15:27:09.000000000 -0500
+++ kipi-plugins/rawconverter/dcrawprocess.cpp	2005-04-17 14:38:16.000000000 -0400
@@ -47,7 +47,6 @@
     bool        quick;
     std::string red;
     std::string blue;
-    std::string gamma;
     std::string brightness;
     bool        jpeg;
     bool        tiff;
@@ -121,10 +120,8 @@
                 argl[index++] = "-d";
             
             if (dcParams.quick)
-                argl[index++] = "-q";
+                argl[index++] = "-h";
 
-            argl[index++] = "-g";
-            argl[index++] = dcParams.gamma.c_str();
             argl[index++] = "-b";
             argl[index++] = dcParams.brightness.c_str();
             argl[index++] = "-r";
@@ -136,8 +133,7 @@
         argl[index++]  = dcParams.inFile.c_str();
         argl[index] = 0;
 
-
-         if (execvp("dcraw", (char* const*) argl) == -1) {
+        if (execvp("dcraw", (char* const*) argl) == -1) {
             std::cerr << "Failed to start dcraw process" << std::endl;
             exit(EXIT_FAILURE);
         }
@@ -165,7 +161,6 @@
     dcParams.cameraWB  = false;
     dcParams.documentMode = false;
     dcParams.quick = false;
-    dcParams.gamma = "0.8";
     dcParams.brightness = "1.0";
     dcParams.red  = "1.0";
     dcParams.blue = "1.0";
@@ -176,7 +171,7 @@
 
     int c;
 
-    while ((c = getopt(argc, argv, "ifwdqg:b:r:l:o:F:Q:D:")) != -1) {
+    while ((c = getopt(argc, argv, "ifwdhg:b:r:l:o:F:Q:D:")) != -1) {
         switch (c) {
 
         case 'i': {
@@ -199,15 +194,11 @@
             break;
         }
 
-        case 'q': {
+        case 'h': {
             dcParams.quick = true;
             break;
         }
 
-        case 'g': {
-            dcParams.gamma = optarg;
-            break;
-        }
     
         case 'b': {
             dcParams.brightness = optarg;
@@ -236,7 +227,10 @@
             else if (format == "TIFF")
                 dcParams.tiff = true;
             else if (format != "PPM")
+            {
+                std::cerr << "Exiting: wrong format: " << format << std::endl;
                 printUsage();
+            }
             break;
         }
 
@@ -251,6 +245,7 @@
         }
             
         default: {
+            std::cerr << "Exiting: Unknown option: " << c  << std::endl;
             printUsage();
             break;
         }
diff -Nuar kipi-plugins/rawconverter.org/kipiplugin_rawconverter.desktop kipi-plugins/rawconverter/kipiplugin_rawconverter.desktop
--- kipi-plugins/rawconverter.org/kipiplugin_rawconverter.desktop	2005-02-03 00:08:38.000000000 -0500
+++ kipi-plugins/rawconverter/kipiplugin_rawconverter.desktop	2005-04-17 14:39:17.000000000 -0400
@@ -4,8 +4,10 @@
 Name[da]=RAW-konvertering
 Name[et]=Toorpiltide teisendaja
 Name[it]=ConvertitoreGrezzo
+Name[nb]=RAW-konvertering
 Name[nl]=Ruw-conversie
 Name[pt]=ConversorEmBruto
+Name[pt_BR]=Conversor Em Bruto
 Name[sv]=Konvertering av obehandlade bilder
 Name[ta]=முதல் மாற்றி
 Name[tr]=RawDönüştürücü
@@ -13,12 +15,15 @@
 Comment=KIPI Raw Image Converter
 Comment[da]=KIPI RAW-billedekonvertering
 Comment[de]=Ein KIPI Plugin um RAW Bilder zu konvertieren
+Comment[es]=Un conversor de imágenes en bruto de KIPI
 Comment[et]=KIPI toorpiltide teisendaja
 Comment[fr]=Module externe Kipi pour convertir des fichiers RAW
 Comment[it]=Convertitore di immagini grezze di KIPI
 Comment[mt]=KIPI Konvertitur Ta' L-Istampi
+Comment[nb]=KIPI RAW bildekonvertering
 Comment[nl]=Kipi-plugin voor het converteren van ruwe afbeeldingen
 Comment[pt]=Um Conversor de Imagens em Bruto do KIPI
+Comment[pt_BR]=Um Conversor de Imagens em Bruto do KIPI
 Comment[sv]=KIPI-insticksprogram: Konvertering av obehandlade bilder
 Comment[ta]=கிபி முதல் பிம்ப மாற்றி
 Comment[tr]=KIPI Raw Resim Dönüştürücü
diff -Nuar kipi-plugins/rawconverter.org/processcontroller.cpp kipi-plugins/rawconverter/processcontroller.cpp
--- kipi-plugins/rawconverter.org/processcontroller.cpp	2004-12-21 13:25:03.000000000 -0500
+++ kipi-plugins/rawconverter/processcontroller.cpp	2005-04-17 14:40:02.000000000 -0400
@@ -22,6 +22,7 @@
 #include <qprocess.h>
 #include <qtimer.h>
 #include <qfile.h>
+#include <kdebug.h>
 
 extern "C"
 {
@@ -40,6 +41,8 @@
     dcProcess_ = new QProcess(this);
     connect(dcProcess_, SIGNAL(processExited()),
             SLOT(slotProcessFinished()));
+    connect(dcProcess_, SIGNAL(readyReadStderr()),
+            SLOT(slotProcessStdErr()));
 
     currTime_ = QString::number(::time(0));
 
@@ -85,8 +88,6 @@
         dcProcess_->addArgument("-w");
     if (settings.fourColorRGB)
         dcProcess_->addArgument("-f");
-    dcProcess_->addArgument("-g");
-    dcProcess_->addArgument(QString::number(settings.gamma));
     dcProcess_->addArgument("-b");
     dcProcess_->addArgument(QString::number(settings.brightness));
     dcProcess_->addArgument("-r");
@@ -119,7 +120,7 @@
     dcProcess_->clearArguments();
 
     dcProcess_->addArgument("kipidcrawclient");
-    dcProcess_->addArgument("-q");
+    dcProcess_->addArgument("-h");
     dcProcess_->addArgument("-o");
     dcProcess_->addArgument(tmpFile_);
 
@@ -127,14 +128,14 @@
         dcProcess_->addArgument("-w");
     if (settings.fourColorRGB)
         dcProcess_->addArgument("-f");
-    dcProcess_->addArgument("-g");
-    dcProcess_->addArgument(QString::number(settings.gamma));
     dcProcess_->addArgument("-b");
     dcProcess_->addArgument(QString::number(settings.brightness));
     dcProcess_->addArgument("-r");
     dcProcess_->addArgument(QString::number(settings.redMultiplier));
     dcProcess_->addArgument("-l");
     dcProcess_->addArgument(QString::number(settings.blueMultiplier));
+    dcProcess_->addArgument("-F");
+    dcProcess_->addArgument(settings.outputFormat);
     dcProcess_->addArgument(fileCurrent_);
     dcProcess_->start();
 
@@ -216,6 +217,15 @@
     }
 }
 
+void ProcessController::slotProcessStdErr()
+{
+    QByteArray ba = dcProcess_->readStderr();
+    if (!ba.isEmpty())
+    {
+        kdWarning() << "ProcessController: stderr: " << ba << endl;
+    }
+}
+
 } // NameSpace KIPIRawConverterPlugin
 
 #include "processcontroller.moc"
diff -Nuar kipi-plugins/rawconverter.org/processcontroller.h kipi-plugins/rawconverter/processcontroller.h
--- kipi-plugins/rawconverter.org/processcontroller.h	2004-11-08 15:27:09.000000000 -0500
+++ kipi-plugins/rawconverter/processcontroller.h	2005-04-17 14:40:20.000000000 -0400
@@ -34,7 +34,6 @@
 {
     bool    cameraWB;
     bool    fourColorRGB;
-    float   gamma;
     float   brightness;
     float   redMultiplier;
     float   blueMultiplier;
@@ -94,6 +93,7 @@
 private slots:
 
     void slotProcessFinished();
+    void slotProcessStdErr();
 };
 
 } // NameSpace KIPIRawConverterPlugin
diff -Nuar kipi-plugins/rawconverter.org/singledialog.cpp kipi-plugins/rawconverter/singledialog.cpp
--- kipi-plugins/rawconverter.org/singledialog.cpp	2005-01-13 07:48:02.000000000 -0500
+++ kipi-plugins/rawconverter/singledialog.cpp	2005-04-17 14:40:37.000000000 -0400
@@ -151,17 +151,6 @@
 
     QHBoxLayout *hboxLayout;
 
-    // ---------------------------------------------------------------
-
-    hboxLayout = new QHBoxLayout(0,0,6,"layout1");
-    gammaSpinBox_ = new CSpinBox(settingsBox);
-    gammaSpinBox_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-    hboxLayout->addWidget(gammaSpinBox_);
-    hboxLayout->addWidget(new QLabel(i18n("Gamma"), settingsBox));
-    QToolTip::add(gammaSpinBox_,
-                  i18n("Specify the gamma value"));
-    settingsBoxLayout->addLayout(hboxLayout);
 
     // ---------------------------------------------------------------
 
@@ -206,22 +195,21 @@
     saveButtonGroup_ = new QVButtonGroup(i18n("Save Format"),this);
     saveButtonGroup_->setRadioButtonExclusive(true);
 
-    QRadioButton *radioButton;
-    radioButton = new QRadioButton("JPEG",saveButtonGroup_);
-    QToolTip::add(radioButton,
+    jpegButton_ = new QRadioButton("JPEG",saveButtonGroup_);
+    QToolTip::add(jpegButton_,
                   i18n("Output the processed image in JPEG Format.\n"
                        "This is a lossy format, but will give\n"
                        "smaller-sized files"));
-    radioButton->setChecked(true);
+    jpegButton_->setChecked(true);
 
-    radioButton = new QRadioButton("TIFF",saveButtonGroup_);
-    QToolTip::add(radioButton,
+    tiffButton_ = new QRadioButton("TIFF",saveButtonGroup_);
+    QToolTip::add(tiffButton_,
                   i18n("Output the processed image in TIFF Format.\n"
                        "This generates larges, without\n"
                        "losing quality"));
 
-    radioButton = new QRadioButton("PPM",saveButtonGroup_);
-    QToolTip::add(radioButton,
+    ppmButton_ = new QRadioButton("PPM",saveButtonGroup_);
+    QToolTip::add(ppmButton_,
                   i18n("Output the processed image in PPM Format.\n"
                        "This generates the largest files, without\n"
                        "losing quality"));
@@ -372,7 +360,6 @@
 
     config->setGroup("RawConverter Settings");
 
-    gammaSpinBox_->setValue(config->readNumEntry("Gamma", 8));
     brightnessSpinBox_->setValue(config->readNumEntry("Brightness",10));
 
     redSpinBox_->setValue(config->readNumEntry("Red Scale",10));
@@ -390,7 +377,6 @@
 
     config->setGroup("RawConverter Settings");
 
-    config->writeEntry("Gamma", gammaSpinBox_->value());
     config->writeEntry("Brightness", brightnessSpinBox_->value());
 
     config->writeEntry("Red Scale", redSpinBox_->value());
@@ -416,11 +402,10 @@
     Settings& s      = controller_->settings;
     s.cameraWB       = cameraWBCheckBox_->isChecked();
     s.fourColorRGB   = fourColorCheckBox_->isChecked();
-    s.gamma          = gammaSpinBox_->value()/10.0;
     s.brightness     = brightnessSpinBox_->value()/10.0;
     s.redMultiplier  = redSpinBox_->value()/10.0;
     s.blueMultiplier = blueSpinBox_->value()/10.0;
-    s.outputFormat   = saveButtonGroup_->selected()->text();
+    s.outputFormat   = "PPM";
 
     controller_->preview(inputFile_);
 }
@@ -430,11 +415,15 @@
     Settings& s      = controller_->settings;
     s.cameraWB       = cameraWBCheckBox_->isChecked();
     s.fourColorRGB   = fourColorCheckBox_->isChecked();
-    s.gamma          = gammaSpinBox_->value()/10.0;
     s.brightness     = brightnessSpinBox_->value()/10.0;
     s.redMultiplier  = redSpinBox_->value()/10.0;
     s.blueMultiplier = blueSpinBox_->value()/10.0;
-    s.outputFormat   = saveButtonGroup_->selected()->text();
+    if (saveButtonGroup_->selected() == jpegButton_)
+        s.outputFormat  = "JPEG";
+    else if (saveButtonGroup_->selected() == tiffButton_)
+        s.outputFormat  = "TIFF";
+    else
+        s.outputFormat  = "PPM";
 
     controller_->process(inputFile_);
 }
@@ -497,11 +486,9 @@
 void SingleDialog::slotProcessed(const QString&, const QString& tmpFile_)
 {
     previewWidget_->load(tmpFile_);
-    QString filter("*.");
-    filter += saveButtonGroup_->selected()->text().lower();
     QString saveFile =
         KFileDialog::getSaveFileName(QFileInfo(inputFile_).dirPath(true),
-                                     filter, this);
+                                     QString(), this);
 
     if (saveFile.isEmpty()) return;
 
diff -Nuar kipi-plugins/rawconverter.org/singledialog.h kipi-plugins/rawconverter/singledialog.h
--- kipi-plugins/rawconverter.org/singledialog.h	2004-12-16 18:46:30.000000000 -0500
+++ kipi-plugins/rawconverter/singledialog.h	2005-04-17 14:40:48.000000000 -0400
@@ -29,6 +29,7 @@
 class QCheckBox;
 class QPushButton;
 class QVButtonGroup;
+class QRadioButton;
 class QCloseEvent;
 
 namespace KIPIRawConverterPlugin
@@ -61,7 +62,6 @@
     QCheckBox*     cameraWBCheckBox_;
     QCheckBox*     fourColorCheckBox_;
     
-    CSpinBox*      gammaSpinBox_;
     CSpinBox*      brightnessSpinBox_;
     CSpinBox*      redSpinBox_;
     CSpinBox*      blueSpinBox_;
@@ -71,6 +71,10 @@
     QPushButton*   processButton_;
     QPushButton*   closeButton_;
     QPushButton*   abortButton_;
+
+    QRadioButton*  jpegButton_;
+    QRadioButton*  tiffButton_;
+    QRadioButton*  ppmButton_;
     
     QVButtonGroup* saveButtonGroup_;