Try to fix unixy places. Re #2657.

mantidproject · Jan 8, 2012 · fc62f35 · fc62f35
1 parent 1c4f222
commit fc62f35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidCurve.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidCurve.cpp
@@ -151,17 +151,16 @@ void MantidCurve::doDraw(QPainter *p,
           const QRect&, MantidQwtWorkspaceData const * const d) const
 {
   int sh = 0;
-  const QwtSymbol symbol(symbol());
-  if (symbol.style() != QwtSymbol::NoSymbol)
+  if (symbol().style() != QwtSymbol::NoSymbol)
   {
-    sh = symbol.size().height() / 2;
+    sh = symbol().size().height() / 2;
   }
 
   int xi0 = 0;
-  QPen pen(pen());
-  pen.setColor(m_errorSettings->color());
-  pen.setWidth(m_errorSettings->width());
-  p->setPen(pen);
+  QPen mypen(pen());
+  mypen.setColor(m_errorSettings->color());
+  mypen.setWidthF(m_errorSettings->width());
+  p->setPen(mypen);
   const int dx = m_errorSettings->capLength()/2;
   const int dx2 = 2*dx;
   const int x1 = static_cast<int>(floor(xMap.p1()));

diff --git a/Code/Mantid/MantidPlot/src/QwtErrorPlotCurve.h b/Code/Mantid/MantidPlot/src/QwtErrorPlotCurve.h
@@ -50,10 +50,10 @@ class QwtErrorPlotCurve: public DataCurve, public ErrorBarSettings
   QwtArray<double> errors(){return err;};
   void setErrors(const QwtArray<double>&data){err=data;};
 
-  double width(){return pen().widthF();};
+  double width() const {return pen().widthF();};
   void setWidth(double w);
 
-  QColor color(){return pen().color();};
+  QColor color() const {return pen().color();};
   void setColor(const QColor& c);
 
   int direction(){return type;};