save - restore page type and overlay

Author: sulincix

src/Archive.cpp

@@ -12,10 +12,15 @@ extern QMainWindow* mainWindow;
 
 class ArchiveStorage {
 public:
+    QString config = "";
     void add(const QString& path, const QImage& image) {
         values[path] = image;
     }
 
+    void setConfig(QString cfg){
+        config = cfg;
+    }
+
     void create(const QString& archiveFileName) {
         // Open the archive file
         struct archive* ar = archive_write_new();
@@ -24,15 +29,14 @@ class ArchiveStorage {
         archive_write_open_filename(ar, archiveFileName.toStdString().c_str());
         // write config
         struct archive_entry* entry = archive_entry_new();
-        QString config = QString::number(mainWindow->geometry().width()) + "x" + QString::number(mainWindow->geometry().height());
         archive_entry_set_pathname(entry, "config");
         archive_entry_set_filetype(entry, AE_IFREG);
         archive_entry_set_perm(entry, 0644);
         archive_entry_set_size(entry, config.size());
         archive_write_header(ar, entry);
         archive_write_data(ar, config.toStdString().c_str(), config.size());
         archive_entry_free(entry);
-        
+
         for (auto it = values.begin(); it != values.end(); ++it) {
             QString path = it.key();
             QImage image = it.value();
@@ -52,10 +56,12 @@ class ArchiveStorage {
         // Clean up
         archive_write_close(ar);
         archive_write_free(ar);
+        values.clear();
     }
 
     QMap<QString, QImage> load(const QString& archiveFileName) {
         QMap<QString, QImage> values;
+        config = "";
         // Open the archive file
         struct archive *ar;
         struct archive_entry *entry;
@@ -89,9 +95,16 @@ class ArchiveStorage {
                 }
                 printf("Decompress:%s %ld\n", entryName, total_size);
                 if(strcmp(entryName, "config") == 0){
-                    QStringList res = QString::fromUtf8(*imageData).split("x");
-                    width = res[0].toInt();
-                    height = res[1].toInt();
+                    config = QString::fromUtf8(*imageData);
+                    QStringList list = config.split("\n");
+                    for (const auto &str : std::as_const(list)) {
+                        if(str.startsWith("width=")){
+                            width = str.split("=")[1].toInt();
+                        } else if(str.startsWith("height=")){
+                            height = str.split("=")[1].toInt();
+                        }
+
+                    }
                     continue;
                 }
                 QImage image = QImage(reinterpret_cast<const uchar*>(imageData->data()), width, height, QImage::Format_ARGB32);
@@ -121,6 +134,13 @@ void archive_add(const QString& path, const QImage& image){
     archive.add(path, image);
 }
 
+void archive_set_config(const QString& cfg){
+    archive.setConfig(cfg);
+}
+QString archive_get_config(){
+    return archive.config;
+}
+
 void archive_create(const QString& archiveFileName){
     archive.create(archiveFileName);
 }

src/Archive.h

@@ -4,6 +4,8 @@
 #include <QString>
 void archive_add(const QString& path, const QImage& image);
 void archive_create(const QString& archiveFileName);
+void archive_set_config(const QString& cfg);
+QString archive_get_config();
 QMap<QString, QImage> archive_load(const QString& archiveFileName) ;
 
 #endif

src/DrawingWidget.cpp

@@ -187,17 +187,27 @@ class PageStorage {
     }
 #ifdef LIBARCHIVE
     void saveAll(const QString& filename){
+        images.overlayType = board->getOverlayType();
+        images.pageType = board->getType();
         values[last_page_num] = images;
+        QString cfg = "[main]\n";
+        cfg += "width="+QString::number(mainWindow->geometry().width())+"\n";
+        cfg += "height="+QString::number(mainWindow->geometry().height())+"\n";
         for(int i=0;i<=page_count;i++){
+            cfg += "[page"+QString::number(i)+"]\n";
+            cfg += "overlay="+QString::number(loadValue(i).overlayType)+"\n";
+            cfg += "page="+QString::number(loadValue(i).pageType)+"\n";
             for(int j=1+loadValue(i).removed;j<=loadValue(i).image_count;j++){
                 archive_add(QString::number(i)+"/"+QString::number(j-1-loadValue(i).removed), values[i].loadValue(j));
             }
         }
+        archive_set_config(cfg);
         archive_create(filename);
     }
 
     void loadArchive(const QString& filename){
         QMap<QString, QImage> archive = archive_load(filename);
+        QString cfg = archive_get_config();
         clear();
         for (auto it = archive.begin(); it != archive.end(); ++it) {
             QString path = it.key();
@@ -219,7 +229,26 @@ class PageStorage {
             values[page].image_count++;
             values[page].last_image_num = values[page].image_count;
         }
+        QStringList list = cfg.split("\n");
+        QString area = "main";
+        int page = 0;
+        for (const auto &str : std::as_const(list)) {
+            if(str.startsWith("[") && str.endsWith("]")) {
+                area = str.mid(1,str.length()-2);
+                if(area.startsWith("page")){
+                    page = area.mid(4,str.length()-1).toInt();
+                }
+            } else if(str.startsWith("overlay")){
+                values[page].overlayType = str.split("=")[1].toInt();
+                printf("Load: page: %d overlay %d\n", page, values[page].overlayType);
+            } else if(str.startsWith("page")){
+                values[page].pageType = str.split("=")[1].toInt();
+                printf("Load: page: %d page %d\n", page, values[page].pageType);
+            }
+        }
         images = values[0];
+        board->setType(images.pageType);
+        board->setOverlayType(images.overlayType);
         drawing->loadImage(images.last_image_num);
         drawing->update();
         updateGoBackButtons();