Changeset 47:8c29813f5150 in orange

Timestamp:

04/02/03 09:30:38 (10 years ago)

Author:

tomazc <tomazc@…>

Branch:

default

Convert:

71d91b367ef04c48fe012c9fa763f36954af6cea

Message:

krivulja verjetnosti zdaj nad vsemi "bar"-i (ce le-teh manj kot 10007, glej OWGraph.py)

File:

• orange/OrangeWidgets/OWDistributions.py (modified) (7 diffs)

orange/OrangeWidgets/OWDistributions.py

@@ -20 +20 @@
 from OWGraph import *
 
-class subBarQwtCurve(QwtCurve):
+class subBarQwtPlotCurve(QwtPlotCurve):
     def __init__(self, parent = None, text = None):
-        QwtCurve.__init__(self, parent, text)
+        QwtPlotCurve.__init__(self, parent, text)
         self.color = Qt.black
 
@@ -38 +38 @@
             px2 = xMap.transform(self.x(i+1))
             py2 = yMap.transform(self.y(i+1))
-#            print "draw from ", px1, ",", py1, "to", px2, ",", py2
             p.drawRect(px1, py1, (px2 - px1), (py2 - py1))
 
-class subBarQwtPlotCurve(QwtPlotCurve, subBarQwtCurve): # there must be a better way to do this
-    def dummy():
-        None
+class errorBarQwtPlotCurve(QwtPlotCurve):
+    def __init__(self, parent = None, text = None):
+        QwtPlotCurve.__init__(self, parent, text)
+
+    def draw(self, p, xMap, yMap, f, t):
+        self.setPen( self.symbol().pen() )
+        p.setPen( self.symbol().pen() )
+        if self.style() == QwtCurve.UserCurve:
+            p.setBackgroundMode(Qt.OpaqueMode)
+            if t < 0: t = self.dataSize() - 1
+            if divmod(f, 3)[1] != 0: f -= f % 3
+            if divmod(t, 3)[1] == 0:  t += 1
+            for i in range(f, t+1, 3):
+                px = xMap.transform(self.x(i))
+                pxl = xMap.transform(self.x(i) - 0.1)
+                pxr = xMap.transform(self.x(i) + 0.1)
+                py1 = yMap.transform(self.y(i + 0))
+                py2 = yMap.transform(self.y(i + 1))
+                py3 = yMap.transform(self.y(i + 2))
+                p.drawLine(px, py1, px, py3)
+                p.drawLine(pxl, py1, pxr, py1)
+                p.drawLine(pxl, py3, pxr, py3)
+                self.symbol().draw(p, px, py2)
+        else:
+            QwtPlotCurve.draw(self, p, xMap, yMap, f, t)
+
 
 class OWDistributions(OWWidget):
@@ -91 +113 @@
         self.outcomenames = []
         self.probGraphValues = []
-        self.probCurveKey = self.graph.insertCurve('', QwtPlot.xBottom, QwtPlot.yRight)
+
+        curve = errorBarQwtPlotCurve(self.graph, '')
+        self.probCurveKey = self.graph.insertCurve(curve)
+        self.graph.setCurveXAxis(self.probCurveKey, QwtPlot.xBottom)
+        self.graph.setCurveYAxis(self.probCurveKey, QwtPlot.yRight)
+
         self.probCurveUpperCIKey = self.graph.insertCurve('', QwtPlot.xBottom, QwtPlot.yRight)
         self.probCurveLowerCIKey = self.graph.insertCurve('', QwtPlot.xBottom, QwtPlot.yRight)
@@ -308 +335 @@
 
         self.graph.removeCurves()
-##        newColor = QColor()
-##        newColor.setHsv(5*360/12, 255, 255)
-##        curve = subBarQwtPlotCurve(self.graph)
-##        curve.setPen(QPen(newColor))
-##        ckey = self.graph.insertCurve(curve)
-##        self.graph.setCurveStyle(ckey, QwtCurve.UserCurve)
-##        self.graph.setCurveData(ckey, [10, 11], [5, 7])
 
         currentBarsHeight = [0] * len(keys)
@@ -337 +357 @@
                     currentBarsHeight[cn] += subBarHeight
                     cn += 1
-        self.probCurveKey = self.graph.insertCurve('', QwtPlot.xBottom, QwtPlot.yRight)
+
+        curve = errorBarQwtPlotCurve(self.graph, '')
+        self.probCurveKey = self.graph.insertCurve(curve)
+        self.graph.setCurveXAxis(self.probCurveKey, QwtPlot.xBottom)
+        self.graph.setCurveYAxis(self.probCurveKey, QwtPlot.yRight)
+
         self.probCurveUpperCIKey = self.graph.insertCurve('', QwtPlot.xBottom, QwtPlot.yRight)
         self.probCurveLowerCIKey = self.graph.insertCurve('', QwtPlot.xBottom, QwtPlot.yRight)
@@ -344 +369 @@
     def refreshProbGraph(self):
         if self.ShowProbabilities:
-            if self.VariableContinuous:
-                newSymbol = QwtSymbol()
-            else:
-                newSymbol = QwtSymbol() #QwtSymbol.Cross, QBrush(Qt.red), QPen(Qt.red), QSize(1,100))
-
             self.graph.enableYRaxis(1)
             xs = []
@@ -358 +378 @@
                 if self.VariableContinuous:
                     xs.append(x)
+                    ups.append(ps[self.targetValue] + cis[self.targetValue])
+                    mps.append(ps[self.targetValue] + 0.0)
+                    lps.append(ps[self.targetValue] - cis[self.targetValue])
                 else:
+                    if self.ShowConfidenceIntervals:
+                        xs.append(cn)
+                        mps.append(ps[self.targetValue] + cis[self.targetValue])
+
                     xs.append(cn)
-                ups.append(ps[self.targetValue] + cis[self.targetValue])
-                mps.append(ps[self.targetValue] + 0.0)
-                lps.append(ps[self.targetValue] - cis[self.targetValue])
+                    mps.append(ps[self.targetValue] + 0.0)
+
+                    if self.ShowConfidenceIntervals:
+                        xs.append(cn)
+                        mps.append(ps[self.targetValue] - cis[self.targetValue])
                 cn += 1.0
+
+            ## (re)set the curves
+            if self.VariableContinuous:
+                newSymbol = QwtSymbol(QwtSymbol.None, QBrush(Qt.color0), QPen(Qt.black, 2), QSize(0,0))
+            else:
+                newSymbol = QwtSymbol(QwtSymbol.Diamond, QBrush(Qt.color0), QPen(Qt.black, 2), QSize(7,7))
 
             self.graph.setCurveData(self.probCurveKey, xs, mps)
             self.graph.setCurveSymbol(self.probCurveKey, newSymbol)
-            if self.ShowConfidenceIntervals:
-                self.graph.setCurveData(self.probCurveUpperCIKey, xs, ups)
-                self.graph.setCurveData(self.probCurveLowerCIKey, xs, lps)
+
+            if self.VariableContinuous:
+                self.graph.setCurveStyle(self.probCurveKey, QwtCurve.Lines)
+                if self.ShowConfidenceIntervals:
+                    self.graph.setCurveData(self.probCurveUpperCIKey, xs, ups)
+                    self.graph.setCurveData(self.probCurveLowerCIKey, xs, lps)
+            else:
+                if self.ShowConfidenceIntervals:
+                    self.graph.setCurveStyle(self.probCurveKey, QwtCurve.UserCurve)
+                else:
+                    self.graph.setCurveStyle(self.probCurveKey, QwtCurve.Dots)
         else:
             self.graph.enableYRaxis(0)