From e722dea0dce045513b18de5fa4c7a5896dc5121c Mon Sep 17 00:00:00 2001
From: Austen <stonewareslord@gmail.com>
Date: Sun, 22 Jun 2014 19:51:33 -0400
Subject: [PATCH] "Erase Other Metadata" checkbox added and works correctly

---
 Picture.pro.user |  2 +-
 picture.cpp      | 64 +++++++++++++++++++++++++-----------------------
 picture.ui       | 28 +++++++++++++++++++--
 3 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/Picture.pro.user b/Picture.pro.user
index 6bb30be..4b7332a 100644
--- a/Picture.pro.user
+++ b/Picture.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.1, 2014-06-20T13:04:41. -->
+<!-- Written by QtCreator 3.0.1, 2014-06-22T19:25:12. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/picture.cpp b/picture.cpp
index c26cb08..0e6caef 100644
--- a/picture.cpp
+++ b/picture.cpp
@@ -113,38 +113,40 @@ void Picture::on_processButton_pressed(){
   on_processButton_clicked();
 }
 void Picture::on_processButton_clicked(){
-    bool ignored=false;
-    QStringList myStringList;
-    for (int i = 0; i < ui->fileList->count(); ++i)
-      myStringList.append(ui->fileList->item(i)->text());
-    qDebug() << myStringList;
-    //foreach(const QString &str,directory.entryList()){
-    foreach(const QString &str,myStringList){
-      QImageReader reader(str);
-      if(!reader.format().isEmpty()){
-        QString fullPath=str;
-        try{
-          Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fullPath.toStdString());
-          assert (image.get() != 0);
-          image->readMetadata();
-          Exiv2::ExifData &exifData = image->exifData();
-          exifData["Exif.Photo.UserComment"] = "charset=Ascii "+ui->labelText->text().toStdString();
-          image->writeMetadata();
-        }catch(Exiv2::AnyError& e){
-          QMessageBox msgBox;
-          msgBox.setInformativeText("The program could not process the file: "+fullPath);
-          msgBox.setStandardButtons(QMessageBox::Ok);
-          msgBox.setDefaultButton(QMessageBox::Ok);
-          int ret=msgBox.exec();
+  bool ignored=false;
+  QStringList myStringList;
+  for (int i=0;i<ui->fileList->count();++i){
+    myStringList.append(ui->fileList->item(i)->text());
+  }
+  qDebug()<<myStringList;
+  foreach(const QString &str,myStringList){
+    QImageReader reader(str);
+    if(!reader.format().isEmpty()){
+      QString fullPath=str;
+      try{
+        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fullPath.toStdString());
+        assert (image.get() != 0);
+        image->readMetadata();
+        if(ui->eraseOtherMetadata->isChecked()){
+            image->clearMetadata();
         }
-      }else{
-        if(!ignored){
-          ignored=true;
-          ui->log->append("Ignored Files:");
-        }
-        ui->log->append(str);
+        Exiv2::ExifData &exifData=image->exifData();
+        exifData["Exif.Photo.UserComment"] = "charset=Ascii "+ui->labelText->text().toStdString();
+        image->writeMetadata();
+      }catch(Exiv2::AnyError& e){
+        QMessageBox msgBox;
+        msgBox.setInformativeText("The program could not process the file: "+fullPath);
+        msgBox.setStandardButtons(QMessageBox::Ok);
+        msgBox.setDefaultButton(QMessageBox::Ok);
+        msgBox.exec();
       }
+    }else{
+      if(!ignored){
+        ignored=true;
+        ui->log->append("Ignored Files:");
+      }
+      ui->log->append(str);
     }
-    ui->log->append("Done erasing metadata");
+  }
+  ui->log->append("Done erasing metadata");
 }
-
diff --git a/picture.ui b/picture.ui
index a9b7df2..ea002ac 100644
--- a/picture.ui
+++ b/picture.ui
@@ -61,7 +61,7 @@
         <item>
          <widget class="QPushButton" name="erase">
           <property name="text">
-           <string>Erase Metadata</string>
+           <string>Erase All Metadata</string>
           </property>
          </widget>
         </item>
@@ -88,6 +88,13 @@
         <item>
          <widget class="QLineEdit" name="labelText"/>
         </item>
+        <item>
+         <widget class="QCheckBox" name="eraseOtherMetadata">
+          <property name="text">
+           <string>Erase Other Metadata</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QCheckBox" name="eraseGpsData">
           <property name="text">
@@ -167,5 +174,22 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>eraseOtherMetadata</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>eraseGpsData</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>428</x>
+     <y>367</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>432</x>
+     <y>387</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>