Added checkbox to clear existing data when merging timeseries

Author: Jofkos

plotjuggler_app/mainwindow.cpp

@@ -1373,7 +1373,7 @@ bool MainWindow::loadDataFromFiles(QStringList filenames)
 {
   filenames.sort();
   std::map<QString, QString> filename_prefix;
-  bool mergeFiles = false;
+  bool mergeFiles = false, clearExisting = true;
 
   if (filenames.size() > 1 || ui->checkBoxAddPrefixAndMerge->isChecked())
   {
@@ -1385,6 +1385,7 @@ bool MainWindow::loadDataFromFiles(QStringList filenames)
     }
     filename_prefix = dialog.getPrefixes();
     mergeFiles = dialog.mergeFiles;
+    clearExisting = dialog.clearExisting;
   }
 
   std::unordered_set<std::string> previous_names = _mapped_plot_data.getAllNames();
@@ -1400,7 +1401,7 @@ bool MainWindow::loadDataFromFiles(QStringList filenames)
     {
       info.prefix = filename_prefix[info.filename];
     }
-    auto added_names = loadDataFromFile(info, mergeFiles);
+    auto added_names = loadDataFromFile(info, mergeFiles && !(i == 0 && clearExisting));
     if (!added_names.empty())
     {
       loaded_filenames.push_back(filenames[i]);

plotjuggler_app/multifile_prefix.cpp

@@ -32,6 +32,16 @@ DialogMultifilePrefix::DialogMultifilePrefix(QStringList filenames, QWidget* par
   ui->mergeFilesCheckbox->setChecked(
       settings.value("DialogMultifilePrefix::mergeFiles", false).toBool());
 
+  ui->checkBoxClearExisting->setChecked(
+      settings.value("DialogMultifilePrefix::clearExisting", true).toBool());
+
+  ui->checkBoxClearExisting->setDisabled(!ui->mergeFilesCheckbox->isChecked());
+  connect(ui->mergeFilesCheckbox, &QCheckBox::toggled, this,
+          [this](bool checked) {
+            ui->checkBoxClearExisting->setDisabled(!checked);
+          });
+
+
   int index = 0;
   for (QString filename : filenames)
   {
@@ -60,6 +70,7 @@ DialogMultifilePrefix::DialogMultifilePrefix(QStringList filenames, QWidget* par
   }
 
   this->mergeFilesCheckbox = ui->mergeFilesCheckbox;
+  this->clearExistingCheckbox = ui->checkBoxClearExisting;
 }
 
 std::map<QString, QString> DialogMultifilePrefix::getPrefixes() const
@@ -93,9 +104,10 @@ void DialogMultifilePrefix::accept()
   }
 
   this->mergeFiles = this->mergeFilesCheckbox->isChecked();
+  this->clearExisting = this->clearExistingCheckbox->isChecked();
 
   settings.setValue("DialogMultifilePrefix::previous", prev_prefixes);
   settings.setValue("DialogMultifilePrefix::mergeFiles", this->mergeFiles);
-
+  settings.setValue("DialogMultifilePrefix::clearExisting", this->clearExisting);
   QDialog::accept();
 }

plotjuggler_app/multifile_prefix.h

@@ -23,7 +23,7 @@ class DialogMultifilePrefix : public QDialog
 public:
   explicit DialogMultifilePrefix(QStringList filenames, QWidget* parent = nullptr);
 
-  bool mergeFiles;
+  bool mergeFiles, clearExisting;
   std::map<QString, QString> getPrefixes() const;
 
   ~DialogMultifilePrefix();
@@ -35,7 +35,7 @@ class DialogMultifilePrefix : public QDialog
   std::map<QString, QLineEdit*> _line_edits;
   std::map<QString, QString> _previous_prefixes;
   std::map<QString, QString> _prefixes;
-  QCheckBox *mergeFilesCheckbox;
+  QCheckBox *mergeFilesCheckbox, *clearExistingCheckbox;
 };
 
 #endif  // MULTIFILE_PREFIX_H

plotjuggler_app/multifile_prefix.ui

@@ -64,6 +64,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QCheckBox" name="checkBoxClearExisting">
+       <property name="text">
+        <string>clear already present data</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">