[Kst] branches/work/kst/1.6/kst/src/libkstapp

[Andrew Walker]

SVN commit 742006 by arwalker:

BUG:152951 Correctly handle marker properties during an edit multiple operation

 M  +9 -7      kst2dplotwidget_i.cpp  


--- branches/work/kst/1.6/kst/src/libkstapp/kst2dplotwidget_i.cpp #742005:742006
@@ -1367,16 +1367,18 @@
     } else {
       plot->removeCurveToMarkers();
     }
+
+    if (UseVector->isChecked()) {
+      KstVectorPtr vector = *(KST::vectorList.findTag(_vectorForMarkers->selectedVector()));
+      plot->setVectorToMarkers(vector);
+    } else {
+      plot->removeVectorToMarkers();
+    }
   }
 
-  if (UseVector->isChecked()) {
-    KstVectorPtr vector = *(KST::vectorList.findTag(_vectorForMarkers->selectedVector()));
-    plot->setVectorToMarkers(vector);
-  } else {
-    plot->removeVectorToMarkers();
+  if (!_editMultipleMode || _comboMarkerLineStyle->currentText().compare(QString(" ")) != 0) {
+    plot->setLineStyleMarkers(_comboMarkerLineStyle->currentItem());
   }
-
-  plot->setLineStyleMarkers(_comboMarkerLineStyle->currentItem());
   if (!_editMultipleMode || _spinBoxMarkerLineWidth->value() != _spinBoxMarkerLineWidth->minValue()) {
     plot->setLineWidthMarkers(_spinBoxMarkerLineWidth->value());
   }