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

[Barth Netterfield]

SVN commit 925533 by netterfield:

Fix some bugs with margins not getting set.

Paint is being continuously called on plots, which is a serious bug.



 M  +95 -34    plotitem.cpp  
 M  +1 -1      plotitemdialog.cpp  
 M  +2 -0      viewgridlayout.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #925532:925533
@@ -137,6 +137,8 @@
     max_gnum = _gnum;
   _gnum++;
 
+  parentView()->setPlotBordersDirty(true);
+
   connect(this, SIGNAL(marginsChanged()), this, SLOT(marginsUpdated()));
 }
 
@@ -545,6 +547,7 @@
 
 
 void PlotItem::paint(QPainter *painter) {
+  qDebug() << "paint in plotitem";
   if (parentViewItem() && isInSharedAxisBox()) {
     setBrush(Qt::transparent);
   } else {
@@ -1229,6 +1232,7 @@
 
 void PlotItem::setRightLabelFont(const QFont &font) {
   _rightLabelFont = font;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1239,6 +1243,7 @@
 
 void PlotItem::setTopLabelFont(const QFont &font) {
   _topLabelFont = font;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1259,6 +1264,7 @@
 
 void PlotItem::setLeftLabelFont(const QFont &font) {
   _leftLabelFont = font;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1269,6 +1275,7 @@
 
 void PlotItem::setBottomLabelFont(const QFont &font) {
   _bottomLabelFont = font;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1279,6 +1286,7 @@
 
 void PlotItem::setNumberLabelFont(const QFont &font) {
   _numberLabelFont = font;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1289,6 +1297,7 @@
 
 void PlotItem::setRightLabelFontScale(const qreal scale) {
   _rightLabelFontScale = scale;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1309,6 +1318,7 @@
 
 void PlotItem::setLeftLabelFontScale(const qreal scale) {
   _leftLabelFontScale = scale;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1319,6 +1329,7 @@
 
 void PlotItem::setTopLabelFontScale(const qreal scale) {
   _topLabelFontScale = scale;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1329,6 +1340,7 @@
 
 void PlotItem::setBottomLabelFontScale(const qreal scale) {
   _bottomLabelFontScale = scale;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1339,6 +1351,7 @@
 
 void PlotItem::setNumberLabelFontScale(const qreal scale) {
   _numberLabelFontScale = scale;
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1417,6 +1430,7 @@
   } else {
     _leftLabelOverride = label;
   }
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1435,6 +1449,7 @@
   } else {
     _bottomLabelOverride = label;
   }
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1453,6 +1468,7 @@
   } else {
     _topLabelOverride = label;
   }
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1471,6 +1487,7 @@
   } else {
     _rightLabelOverride = label;
   }
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1523,6 +1540,7 @@
 void PlotItem::setLeftSuppressed(bool suppressed) {
   setLeftLabelVisible(!suppressed);
   _yAxis->setAxisVisible(!suppressed);
+  parentView()->setPlotBordersDirty(true);
 }
 
 
@@ -1542,7 +1560,8 @@
     return;
 
   _isLeftLabelVisible = visible;
-  emit marginsChanged();
+  parentView()->setPlotBordersDirty(true);
+//   emit marginsChanged();
 }
 
 
@@ -1556,7 +1575,8 @@
     return;
 
   _isBottomLabelVisible = visible;
-  emit marginsChanged();
+  parentView()->setPlotBordersDirty(true);
+//   emit marginsChanged();
 }
 
 
@@ -1570,7 +1590,8 @@
     return;
 
   _isRightLabelVisible = visible;
-  emit marginsChanged();
+  parentView()->setPlotBordersDirty(true);
+//   emit marginsChanged();
 }
 
 
@@ -1584,7 +1605,8 @@
     return;
 
   _isTopLabelVisible = visible;
-  emit marginsChanged();
+  parentView()->setPlotBordersDirty(true);
+//   emit marginsChanged();
 }
 
 
@@ -1623,9 +1645,9 @@
 void PlotItem::setCalculatedLeftLabelMargin(qreal margin) {
   qreal before = this->calculatedLeftLabelMargin();
   _calculatedLeftLabelMargin = margin;
-  if (before != this->calculatedLeftLabelMargin()) {
+/*  if (before != this->calculatedLeftLabelMargin()) {
     emit marginsChanged();
-  }
+  }*/
 }
 
 
@@ -1643,9 +1665,9 @@
 void PlotItem::setCalculatedRightLabelMargin(qreal margin) {
   qreal before = this->calculatedRightLabelMargin();
   _calculatedRightLabelMargin = margin;
-  if (before != this->calculatedRightLabelMargin()) {
+/*  if (before != this->calculatedRightLabelMargin()) {
     emit marginsChanged();
-  }
+  }*/
 }
 
 
@@ -1674,9 +1696,9 @@
 void PlotItem::setCalculatedTopLabelMargin(qreal margin) {
   qreal before = this->calculatedTopLabelMargin();
   _calculatedTopLabelMargin = margin;
-  if (before != this->calculatedTopLabelMargin()) {
+/*  if (before != this->calculatedTopLabelMargin()) {
     emit marginsChanged();
-  }
+  }*/
 }
 
 
@@ -1694,9 +1716,9 @@
 void PlotItem::setCalculatedBottomLabelMargin(qreal margin) {
   qreal before = this->calculatedBottomLabelMargin();
   _calculatedBottomLabelMargin = margin;
-  if (before != this->calculatedBottomLabelMargin()) {
+/*  if (before != this->calculatedBottomLabelMargin()) {
     emit marginsChanged();
-  }
+  }*/
 }
 
 
@@ -1733,40 +1755,66 @@
 
 
 QFont PlotItem::calculatedLeftLabelFont() {
-  QFont font(_leftLabelFont);
-  font.setPixelSize(parentView()->defaultFont(_leftLabelFontScale).pixelSize());
-
+  QFont font;
+  if (leftFontUseGlobal()) {
+    font = _globalFont;
+    font.setPixelSize(parentView()->defaultFont(_globalFontScale).pixelSize());
+  } else {
+    font = _leftLabelFont;
+    font.setPixelSize(parentView()->defaultFont(_leftLabelFontScale).pixelSize());
+  }
   return font;
 }
 
 
 QFont PlotItem::calculatedRightLabelFont() {
-  QFont font(_rightLabelFont);
-  font.setPixelSize(parentView()->defaultFont(_rightLabelFontScale).pixelSize());
-
+  QFont font;
+  if (rightFontUseGlobal()) {
+    font = _globalFont;
+    font.setPixelSize(parentView()->defaultFont(_globalFontScale).pixelSize());
+  } else {
+    font = _rightLabelFont;
+    font.setPixelSize(parentView()->defaultFont(_rightLabelFontScale).pixelSize());
+  }
   return font;
 }
 
 
 QFont PlotItem::calculatedTopLabelFont() {
-  QFont font(_topLabelFont);
-  font.setPixelSize(parentView()->defaultFont(_topLabelFontScale).pixelSize());
-
+  QFont font;
+  if (topFontUseGlobal()) {
+    font = _globalFont;
+    font.setPixelSize(parentView()->defaultFont(_globalFontScale).pixelSize());
+  } else {
+    font = _topLabelFont;
+    font.setPixelSize(parentView()->defaultFont(_topLabelFontScale).pixelSize());
+  }
   return font;
 }
 
 
 QFont PlotItem::calculatedBottomLabelFont() {
-  QFont font(_bottomLabelFont);
-  font.setPixelSize(parentView()->defaultFont(_bottomLabelFontScale).pixelSize());
-
+  QFont font;
+  if (bottomFontUseGlobal()) {
+    font = _globalFont;
+    font.setPixelSize(parentView()->defaultFont(_globalFontScale).pixelSize());
+  } else {
+    font = _bottomLabelFont;
+    font.setPixelSize(parentView()->defaultFont(_bottomLabelFontScale).pixelSize());
+  }
   return font;
 }
 
 
 QFont PlotItem::calculatedNumberLabelFont() {
-  QFont font(_numberLabelFont);
-  font.setPixelSize(parentView()->defaultFont(_numberLabelFontScale).pixelSize());
+  QFont font;
+  if (numberFontUseGlobal()) {
+    font = _globalFont;
+    font.setPixelSize(parentView()->defaultFont(_globalFontScale).pixelSize());
+  } else {
+    font = _numberLabelFont;
+    font.setPixelSize(parentView()->defaultFont(_numberLabelFontScale).pixelSize());
+  }
   return font;
 }
 
@@ -1843,6 +1891,7 @@
 
   QSizeF margins;
   margins.setWidth(leftLabelBound.height());
+
   return margins;
 }
 
@@ -1943,8 +1992,9 @@
 
       if (rc.x > 0)
         painter->drawPixmap(t.mapRect(rightLabel).topLeft(), pixmap, QRectF(0, 0, rc.x, rightLabel.height()));
+
+      painter->restore();
     }
-    painter->restore();
 
     delete parsed;
     parsed = 0;
@@ -2067,9 +2117,9 @@
 void PlotItem::setCalculatedAxisMarginWidth(qreal marginWidth) {
   qreal before = this->calculatedAxisMarginWidth();
   _calculatedAxisMarginWidth = marginWidth;
-  if (before != this->calculatedAxisMarginWidth()) {
-    emit marginsChanged();
-  }
+//   if (before != this->calculatedAxisMarginWidth()) {
+//     emit marginsChanged();
+//   }
 }
 
 
@@ -2088,6 +2138,11 @@
   qreal inROver = _calculatedAxisMarginROverflow;
   QRectF xLabelRect;
 
+  painter->save();
+
+  painter->setFont(calculatedNumberLabelFont());
+
+
   int flags = Qt::TextSingleLine | Qt::AlignCenter;
 
   _calculatedAxisMarginVLead = painter->fontMetrics().boundingRect('0').height()/2;
@@ -2126,11 +2181,12 @@
     _calculatedAxisMarginROverflow = ViewItem::sizeOfGrip().width();
   }
 
-  if ((inHeight != _calculatedAxisMarginHeight) 
+  painter->restore();
+/*  if ((inHeight != _calculatedAxisMarginHeight) 
        || (inVLead != _calculatedAxisMarginVLead) 
        || (inROver != _calculatedAxisMarginROverflow)) {
     emit marginsChanged();
-  }
+  }*/
 }
 
 /** This function calculates and sets three things:
@@ -2146,6 +2202,10 @@
   QRectF yLabelRect;
   int flags = Qt::TextSingleLine | Qt::AlignCenter;
 
+  painter->save();
+
+  painter->setFont(calculatedNumberLabelFont());
+
   _calculatedAxisMarginHLead = painter->fontMetrics().boundingRect('[').height()/2;
 
   if (_yAxis->isAxisVisible()) {
@@ -2179,11 +2239,12 @@
   } else {
     _calculatedAxisMarginTOverflow = ViewItem::sizeOfGrip().width();
   }
-  if ((inWidth != _calculatedAxisMarginWidth) 
+  painter->restore();
+/*  if ((inWidth != _calculatedAxisMarginWidth) 
        || (inHLead != _calculatedAxisMarginHLead) 
        || (inTOver != _calculatedAxisMarginTOverflow)) {
      emit marginsChanged();
-  }
+  }*/
 }
 
 
--- branches/work/kst/portto4/kst/src/libkstapp/plotitemdialog.cpp #925532:925533
@@ -579,7 +579,7 @@
   _plotItem->setBottomFontUseGlobal(_bottomLabelTab->useDefault());
   _plotItem->setLeftFontUseGlobal(_leftLabelTab->useDefault());
   _plotItem->setRightFontUseGlobal(_rightLabelTab->useDefault());
-  _plotItem->setNumberFontUseGlobal(_topLabelTab->useDefault());
+  _plotItem->setNumberFontUseGlobal(_axisLabelTab->useDefault());
   _plotItem->setShowLegend(_labelTab->showLegend());
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/viewgridlayout.cpp #925532:925533
@@ -288,6 +288,8 @@
   QMap<int, qreal> rightMarginWidths;
   QMap<int, qreal> topMarginWidths;
   QMap<int, qreal> bottomMarginHeights;
+  //FIXME: this approach to tolerance only works often
+  // (truncation flips bits suddenly)
   foreach (PlotItem* plotItem, plotItems) {
     plotItem->calculateBorders(painter);
     if (leftMarginWidths[plotItem->width()*PLOT_STANDARDIZATION_FACTOR] < plotItem->leftMarginSize()) {