fix issue #318

Author: Davide Faconti

plotter_gui/mainwindow.cpp

@@ -875,7 +875,7 @@ void MainWindow::updateRecentLayoutMenu(QStringList new_filenames)
 
 void MainWindow::deleteAllData()
 {
-  forEachWidget([](PlotWidget* plot) { plot->detachAllCurves(); });
+  forEachWidget([](PlotWidget* plot) { plot->removeAllCurves(); });
 
   _mapped_plot_data.numeric.clear();
   _mapped_plot_data.user_defined.clear();

plotter_gui/plotwidget.cpp

@@ -226,7 +226,7 @@ void PlotWidget::buildActions()
   connect(_action_removeCurve, &QAction::triggered, this, &PlotWidget::launchRemoveCurveDialog);
 
   _action_removeAllCurves = new QAction("&Remove ALL curves", this);
-  connect(_action_removeAllCurves, &QAction::triggered, this, &PlotWidget::detachAllCurves);
+  connect(_action_removeAllCurves, &QAction::triggered, this, &PlotWidget::removeAllCurves);
   connect(_action_removeAllCurves, &QAction::triggered, this, &PlotWidget::undoableChange);
 
   _action_changeColorsDialog = new QAction("&Change colors", this);
@@ -722,7 +722,7 @@ void PlotWidget::dropEvent(QDropEvent*)
   _dragging.curves.clear();
 }
 
-void PlotWidget::detachAllCurves()
+void PlotWidget::removeAllCurves()
 {
   for (auto& it : _curve_list)
   {
@@ -829,14 +829,20 @@ QDomElement PlotWidget::xmlSaveState(QDomDocument& doc) const
 
 bool PlotWidget::xmlLoadState(QDomElement& plot_widget)
 {
-  std::set<std::string> added_curve_names;
-
   QDomElement transform = plot_widget.firstChildElement("transform");
   QString trans_value = transform.attribute("value");
 
   if (trans_value == "XYPlot")
   {
-    convertToXY();
+    if( !isXYPlot()){
+      convertToXY();
+    }
+  }
+  else {
+    if( isXYPlot() ){
+      removeAllCurves();
+      _xy_mode = false;
+    }
   }
 
   QDomElement limitY_el = plot_widget.firstChildElement("limitY");
@@ -869,7 +875,34 @@ bool PlotWidget::xmlLoadState(QDomElement& plot_widget)
 
   bool curve_added = false;
 
-  for (QDomElement curve_element = plot_widget.firstChildElement("curve"); !curve_element.isNull();
+  std::set<std::string> curves_to_add;
+  for (QDomElement curve_element = plot_widget.firstChildElement("curve");
+       !curve_element.isNull();
+       curve_element = curve_element.nextSiblingElement("curve"))
+  {
+    curves_to_add.insert(curve_element.attribute("name").toStdString() );
+  }
+
+  bool curve_removed = true;
+
+  while (curve_removed)
+  {
+    curve_removed = false;
+    for (auto& it : _curve_list)
+    {
+      auto curve_name = it.first;
+      if (curves_to_add.find(curve_name) == curves_to_add.end())
+      {
+        removeCurve(curve_name);
+        curve_removed = true;
+        break;
+      }
+    }
+  }
+  //---------------------------------------
+
+  for (QDomElement curve_element = plot_widget.firstChildElement("curve");
+       !curve_element.isNull();
        curve_element = curve_element.nextSiblingElement("curve"))
   {
     QString curve_name = curve_element.attribute("name");
@@ -891,7 +924,6 @@ bool PlotWidget::xmlLoadState(QDomElement& plot_widget)
         auto added = addCurve(curve_name_std);
         curve_added = curve_added || added;
         _curve_list[curve_name_std]->setPen(color, 1.0);
-        added_curve_names.insert(curve_name_std);
       }
     }
     else
@@ -909,7 +941,6 @@ bool PlotWidget::xmlLoadState(QDomElement& plot_widget)
         auto added = addCurveXY(curve_x, curve_y, curve_name);
         curve_added = curve_added || added;
         _curve_list[curve_name_std]->setPen(color, 1.0);
-        added_curve_names.insert(curve_name_std);
       }
     }
 
@@ -922,23 +953,6 @@ bool PlotWidget::xmlLoadState(QDomElement& plot_widget)
     }
   }
 
-  bool curve_removed = true;
-
-  while (curve_removed)
-  {
-    curve_removed = false;
-    for (auto& it : _curve_list)
-    {
-      auto curve_name = it.first;
-      if (added_curve_names.find(curve_name) == added_curve_names.end())
-      {
-        removeCurve(curve_name);
-        curve_removed = true;
-        break;
-      }
-    }
-  }
-
   if (trans_value.isEmpty() || trans_value == "noTransform")
   {
     _action_noTransform->trigger();
@@ -971,7 +985,7 @@ bool PlotWidget::xmlLoadState(QDomElement& plot_widget)
     _action_custom_transform->setChecked(true);
   }
 
-  if (curve_removed || curve_added)
+  if (curve_added)
   {
     _tracker->redraw();
     // replot();
@@ -1604,7 +1618,7 @@ void PlotWidget::convertToXY()
 
   this->setFooter(text);
 
-  zoomOut(true);
+  zoomOut(false);
   on_changeDateTimeScale(_use_date_time_scale);
   replot();
 }

plotter_gui/plotwidget.h

@@ -102,7 +102,7 @@ public slots:
 
   void updateCurves();
 
-  void detachAllCurves();
+  void removeAllCurves();
 
   void on_panned(int dx, int dy);
 

plotter_gui/tabbedplotwidget.cpp

@@ -152,9 +152,8 @@ bool TabbedPlotWidget::xmlLoadState(QDomElement& tabbed_area)
       this->addTab(NULL);
       num_tabs++;
     }
-    PlotMatrix* plot_matrix = static_cast<PlotMatrix*>(tabWidget()->widget(index));
-    bool success = plot_matrix->xmlLoadState(plotmatrix_el);
 
+    PlotMatrix* plot_matrix = static_cast<PlotMatrix*>(tabWidget()->widget(index));
     // read tab name
     if (plotmatrix_el.hasAttribute("tab_name"))
     {
@@ -163,6 +162,8 @@ bool TabbedPlotWidget::xmlLoadState(QDomElement& tabbed_area)
       plot_matrix->setName(tab_name);
     }
 
+    bool success = plot_matrix->xmlLoadState(plotmatrix_el);
+
     if (!success)
     {
       return false;
@@ -495,7 +496,7 @@ void TabbedPlotWidget::on_tabWidget_tabCloseRequested(int index)
     for (unsigned p = 0; p < matrix->plotCount(); p++)
     {
       PlotWidget* plot = matrix->plotAt(p);
-      plot->detachAllCurves();
+      plot->removeAllCurves();
       plot->deleteLater();
     }
     matrix->deleteLater();