[Kst] extragear/graphics/kst/src/libkstapp

[Andrew Walker]

SVN commit 539829 by arwalker:

CCBUG:125888 Remove special casing for line widths when switching to monochrome before printing as this is handled in the paint code.

 M  +1 -1      kst.cpp  
 M  +2 -2      kst2dplot.cpp  
 M  +1 -1      kst2dplot.h  


--- trunk/extragear/graphics/kst/src/libkstapp/kst.cpp #539828:539829
@@ -1533,7 +1533,7 @@
           if (enhanceReadability) {
             Kst2DPlotList plotList = tlv->findChildrenType<Kst2DPlot>(false);
             for (Kst2DPlotList::Iterator it = plotList.begin(); it != plotList.end(); ++it ) {
-              (*it)->changeToMonochrome(pointStyleOrder, lineStyleOrder, lineWidthOrder, maxLineWidth, pointDensity, true);
+              (*it)->changeToMonochrome(pointStyleOrder, lineStyleOrder, lineWidthOrder, maxLineWidth, pointDensity);
             }
           }
         }
--- trunk/extragear/graphics/kst/src/libkstapp/kst2dplot.cpp #539828:539829
@@ -6389,7 +6389,7 @@
 
 
 void Kst2DPlot::changeToMonochrome(int pointStylePriority, int lineStylePriority, int lineWidthPriority,
-                                   int maxLineWidth, int pointDensity, bool forPrint) {
+                                   int maxLineWidth, int pointDensity) {
   // change plot background to white, foreground to black,
   // and set all curves to black, and cycle line styles and point styles
   pushPlotColors();
@@ -6439,7 +6439,7 @@
       (*i)->pushLineStyle(lineStyleSeq.current());
     }
     if (lineWidthPriority > -1) {
-      (*i)->pushLineWidth(forPrint ? 5*lineWidthSeq.current() : lineWidthSeq.current());
+      (*i)->pushLineWidth(5*lineWidthSeq.current());
     }
     (*i)->writeUnlock();
     seqVect[0]->next();
--- trunk/extragear/graphics/kst/src/libkstapp/kst2dplot.h #539828:539829
@@ -342,7 +342,7 @@
   // corresponding curve property is not cycled or altered. The remaining priorities must
   // be in the range [0, X-1] with no duplicates, where X = number of priorities != -1
   void changeToMonochrome(int pointStylePriority, int lineStylePriority, int lineWidthPriority,
-                          int maxLineWidth, int pointDensity, bool forPrint);
+                          int maxLineWidth, int pointDensity);
   // undo changes made by changeToMonochrome
   // PRE: pointStylePriority, lineStylePriority, lineWidthPriority must have same values as when
   //      passed to changeToMonochrome (otherwise behaviour is not as expected)