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

[Mike Fenton]

SVN commit 941020 by fenton:

Fix AppendLayout / DataWizard incorrectly cleaning up LayoutBoxItem's and aligning improperly.


 M  +6 -6      datawizard.cpp  
 M  +2 -3      view.cpp  
 M  +1 -0      viewitem.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #941019:941020
@@ -894,12 +894,6 @@
     }
   }
 
-  int tmpi=0;
-  foreach (PlotItem* plot, plotList) {
-    tmpi++;
-    plot->update();
-    plot->parentView()->appendToLayout(_pagePlot->layout(), plot, _pagePlot->gridColumns());
-  }
   // legends and labels
   bool xLabels = _pagePlot->xAxisLabels();
   bool yLabels = _pagePlot->yAxisLabels();
@@ -939,6 +933,12 @@
       }
     }
   }
+
+  foreach (PlotItem* plot, plotList) {
+    plot->update();
+    plot->parentView()->appendToLayout(_pagePlot->layout(), plot, _pagePlot->gridColumns());
+  }
+
   QApplication::restoreOverrideCursor();
 
   accept();
--- branches/work/kst/portto4/kst/src/libkstapp/view.cpp #941019:941020
@@ -329,11 +329,10 @@
 void View::appendToLayout(CurvePlacement::Layout layout, ViewItem* item, int columns) {
   AppendLayoutCommand *appendlayout = new AppendLayoutCommand(new LayoutBoxItem(this));
   appendlayout->appendLayout(layout, item, columns);
-
   if (_layoutBoxItem) {
+    LayoutBoxItem *layoutBox = _layoutBoxItem;
     _layoutBoxItem->setEnabled(false);
-    delete _layoutBoxItem;
-    _layoutBoxItem = 0;
+    delete layoutBox;
   }
 
 }
--- branches/work/kst/portto4/kst/src/libkstapp/viewitem.cpp #941019:941020
@@ -1434,6 +1434,7 @@
 
 void ViewItem::setParent(ViewItem* parent) {
   setParentItem(parent);
+  updateRelativeSize();
 }