Changeset 8363:e185adc25e0e in orange

Timestamp:

07/06/11 10:38:43 (23 months ago)

Author:

Noughmad <Noughmad@…>

Branch:

default

Convert:

98dad152de2d46965059dd63c5627272d6c6246c

Message:

Rename the python classes to a consistent naming scheme

Location:

orange/OrangeWidgets

Files:

• Graph/__init__.py (deleted)
• Graph/axis.py (deleted)
• Graph/constants.py (deleted)
• Graph/curve.py (deleted)
• Graph/item.py (deleted)
• Graph/legend.py (deleted)
• Graph/palette.py (deleted)
• Graph/point.py (deleted)
• Graph/tools.py (deleted)
• OWGraphQt.py (deleted)
• OWkNNOptimization.py (modified) (13 diffs)
• Prototypes/OWDiscretizeQt.py (modified) (8 diffs)
• Prototypes/OWDistributionsQt.py (modified) (7 diffs)
• Prototypes/OWLinProjGraphQt.py (modified) (14 diffs)
• Prototypes/OWScatterPlotGraphQt.py (modified) (9 diffs)
• Prototypes/OWScatterPlotQt.py (modified) (3 diffs)

orange/OrangeWidgets/OWkNNOptimization.py

@@ -1 +1 @@
 from OWWidget import *
 import OWGUI, OWDlgs, numpy, user, sys
-from Graph.tools import *
-from OWGraphQt import *
+from plot.owtools import *
+from plot.owplot import *
 from orngVizRank import *
 from orngScaleData import getVariableValuesSorted
@@ -634 +634 @@
     def attributeAnalysis(self):
         if not self.attributeHistogramDlg:
-            self.attributeHistogramDlg = OWGraphAttributeHistogram(self, VIZRANK_POINT, signalManager = self.signalManager)
+            self.attributeHistogramDlg = OWPlotAttributeHistogram(self, VIZRANK_POINT, signalManager = self.signalManager)
         self.attributeHistogramDlg.show()
         self.attributeHistogramDlg.setResults(self.graph.rawData, self.shownResults)
 
     def graphProjectionQuality(self):
-        dialog = OWGraphProjectionQuality(self, VIZRANK_POINT, signalManager = self.signalManager)
+        dialog = OWPlotProjectionQuality(self, VIZRANK_POINT, signalManager = self.signalManager)
         dialog.show()
         dialog.setResults(self.results)
@@ -645 +645 @@
     def identifyOutliers(self):
         if not self.identifyOutliersDlg:
-            self.identifyOutliersDlg = OWGraphIdentifyOutliers(self, VIZRANK_POINT, signalManager = self.signalManager, widget = self.parentWidget)
+            self.identifyOutliersDlg = OWPlotIdentifyOutliers(self, VIZRANK_POINT, signalManager = self.signalManager, widget = self.parentWidget)
         self.identifyOutliersDlg.show()
         self.identifyOutliersDlg.setResults(self.graph.rawData, self.shownResults)
@@ -842 +842 @@
         self.useGeneSets = 0
 
-        self.graph = OWGraph(self.mainArea)
+        self.graph = OWPlot(self.mainArea)
         self.mainArea.layout().addWidget(self.graph)
 
@@ -1088 +1088 @@
         
         """ 
-            Commented out to be compatible with Qt-only OWGraph
-        self.graph.setAxisScaleDraw(QwtPlot.xBottom, OWGraphTools.DiscreteAxisScaleDraw(attributes))
+            Commented out to be compatible with Qt-only OWPlot
+        self.graph.setAxisScaleDraw(QwtPlot.xBottom, OWPlotTools.DiscreteAxisScaleDraw(attributes))
         self.graph.axisScaleDraw(QwtPlot.xBottom).enableComponent(QwtScaleDraw.Ticks, 0)
         self.graph.axisScaleDraw(QwtPlot.xBottom).enableComponent(QwtScaleDraw.Backbone, 0)
@@ -1099 +1099 @@
             self.graph.axisScaleDraw(QwtPlot.xBottom).setLabelAlignment(Qt.AlignLeft)
 
-        self.graph.setAxisScaleDraw(QwtPlot.yLeft, OWGraphTools.DiscreteAxisScaleDraw([""] + attributes[::-1]))
+        self.graph.setAxisScaleDraw(QwtPlot.yLeft, OWPlotTools.DiscreteAxisScaleDraw([""] + attributes[::-1]))
         self.graph.axisScaleDraw(QwtPlot.yLeft).enableComponent(QwtScaleDraw.Ticks, 0)
         self.graph.axisScaleDraw(QwtPlot.yLeft).enableComponent(QwtScaleDraw.Backbone, 0)
@@ -1118 +1118 @@
 
 
-class OWGraphAttributeHistogram(OWWidget):
+class OWPlotAttributeHistogram(OWWidget):
     settingsList = ["attributeCount", "projectionCount", "rotateXAttributes", "colorAttributes", "progressLines", "useGeneSets", "recentGeneSets"]
     def __init__(self, parent=None, dialogType=VIZRANK_POINT, signalManager = None):
@@ -1131 +1131 @@
         self.evaluatedAttributesByClass = None
 
-        self.graph = OWGraph(self.mainArea)
+        self.graph = OWPlot(self.mainArea)
         self.mainArea.layout().addWidget(self.graph)
 
@@ -1319 +1319 @@
 # #############################################################################
 # draw a graph for all the evaluated projections that shows how is the classification accuracy falling when we are moving from the best to the worst evaluated projections
-class OWGraphProjectionQuality(OWWidget):
+class OWPlotProjectionQuality(OWWidget):
     def __init__(self,parent=None, dialogType = VIZRANK_POINT, signalManager = None):
         OWWidget.__init__(self, parent, signalManager, "Projection Quality", wantGraph = 1)
@@ -1339 +1339 @@
         self.controlArea.layout().addStretch(100)
 
-        self.graph = OWGraph(self.mainArea)
+        self.graph = OWPlot(self.mainArea)
         self.mainArea.layout().addWidget(self.graph)
         self.graph.showXaxisTitle = 1
@@ -1421 +1421 @@
 # #############################################################################
 # draw a graph for all the evaluated projections that shows how is the classification accuracy falling when we are moving from the best to the worst evaluated projections
-class OWGraphIdentifyOutliers(VizRankOutliers, OWWidget):
+class OWPlotIdentifyOutliers(VizRankOutliers, OWWidget):
     settingsList = ["projectionCountList", "showLegend", "showAllClasses", "sortProjections", "showClickedProjection"]
     def __init__(self, vizrank, dialogType, signalManager = None, widget = None):
@@ -1460 +1460 @@
         self.exampleList.setToolTip("Average probabilities of correct classification and indices of corresponding examples")
 
-        self.graph = OWGraph(self.mainArea)
+        self.graph = OWPlot(self.mainArea)
         self.mainArea.layout().addWidget(self.graph)
         self.graph.showXaxisTitle = 1
@@ -1720 +1720 @@
     ow=OWVizRank()
 ##    ow = OWInteractionAnalysis()
-##    ow = OWGraphAttributeHistogram()
+##    ow = OWPlotAttributeHistogram()
     ow.show()
     a.exec_()

orange/OrangeWidgets/Prototypes/OWDiscretizeQt.py

@@ -8 +8 @@
 import orange
 from OWWidget import *
-from OWGraphQt import *
+from plot.owplot import *
+from plot.owcurve import *
 import OWGUI
-from Graph.curve import *
 import math
 
@@ -17 +17 @@
     return [low+i*inc for i in range(steps)]
 
-class DiscGraph(OWGraph):
+class DiscGraph(OWPlot):
     def __init__(self, master, *args):
-        OWGraph.__init__(self, *args)
+        OWPlot.__init__(self, *args)
         self.master=master
 
@@ -158 +158 @@
             
             for val, freq in freqhigh:
-                c = self.addCurve("", Qt.gray, Qt.gray, 1, style = Qt.SolidLine, symbol = Curve.NoSymbol, xData = [val, val], yData = [1.0, 1.0 - max(.02, freqfac * freq)], autoScale = 1)
+                c = self.addCurve("", Qt.gray, Qt.gray, 1, style = Qt.SolidLine, symbol = OWCurve.NoSymbol, xData = [val, val], yData = [1.0, 1.0 - max(.02, freqfac * freq)], autoScale = 1)
                 c.setYAxis(yRight)
                 self.rugKeys.append(c)
 
             for val, freq in freqlow:
-                c = self.addCurve("", Qt.gray, Qt.gray, 1, style = Qt.SolidLine, symbol = Curve.NoSymbol, xData = [val, val], yData = [0.04, 0.04 + max(.02, freqfac * freq)], autoScale = 1)
+                c = self.addCurve("", Qt.gray, Qt.gray, 1, style = Qt.SolidLine, symbol = OWCurve.NoSymbol, xData = [val, val], yData = [0.04, 0.04 + max(.02, freqfac * freq)], autoScale = 1)
                 c.setYAxis(yRight)
                 self.rugKeys.append(c)
@@ -182 +182 @@
                 self.baseCurveX, self.baseCurveY = self.computeAddedScore(list(self.curCutPoints))
             
-            self.baseCurveKey = self.addCurve("", Qt.black, Qt.black, 1, style = Qt.SolidLine, symbol = Curve.NoSymbol, xData = self.baseCurveX, yData = self.baseCurveY, lineWidth = 2, autoScale = 1)
+            self.baseCurveKey = self.addCurve("", Qt.black, Qt.black, 1, style = Qt.SolidLine, symbol = OWCurve.NoSymbol, xData = self.baseCurveX, yData = self.baseCurveY, lineWidth = 2, autoScale = 1)
             self.baseCurveKey.setYAxis(yLeft)
 
@@ -195 +195 @@
 
         if self.lookaheadCurveX and self.master.showLookaheadLine:
-            self.lookaheadCurveKey = self.addCurve("", Qt.black, Qt.black, 1, style = Qt.SolidLine, symbol = Curve.NoSymbol, xData = self.lookaheadCurveX, yData = self.lookaheadCurveY, lineWidth = 1, autoScale = 1)
+            self.lookaheadCurveKey = self.addCurve("", Qt.black, Qt.black, 1, style = Qt.SolidLine, symbol = OWCurve.NoSymbol, xData = self.lookaheadCurveX, yData = self.lookaheadCurveY, lineWidth = 1, autoScale = 1)
             self.lookaheadCurveKey.setYAxis(yLeft)
             #self.lookaheadCurveKey.setVisible(1)
@@ -210 +210 @@
         if self.contingency and self.condProb and self.master.showTargetClassProb:
             xData = self.contingency.keys()[1:-1]
-            self.probCurveKey = self.addCurve("", Qt.gray, Qt.gray, 1, style = Qt.SolidLine, symbol = Curve.NoSymbol, xData = xData, yData = [self.condProb(x)[self.master.targetClass] for x in xData], lineWidth = 2, autoScale = 1)
+            self.probCurveKey = self.addCurve("", Qt.gray, Qt.gray, 1, style = Qt.SolidLine, symbol = OWCurve.NoSymbol, xData = xData, yData = [self.condProb(x)[self.master.targetClass] for x in xData], lineWidth = 2, autoScale = 1)
             self.probCurveKey.setYAxis(yRight)
 
@@ -226 +226 @@
 
         for cut in self.curCutPoints:
-            c = self.addCurve("", Qt.blue, Qt.blue, 1, style = Qt.DashLine, symbol = Curve.NoSymbol, xData = [cut, cut], yData = [.9, 0.1], autoScale = 1)
+            c = self.addCurve("", Qt.blue, Qt.blue, 1, style = Qt.DashLine, symbol = OWCurve.NoSymbol, xData = [cut, cut], yData = [.9, 0.1], autoScale = 1)
             c.setYAxis(yRight)
             self.cutLineKeys.append(c)
@@ -256 +256 @@
     def addCutPoint(self, cut):
         self.curCutPoints.append(cut)
-        c = self.addCurve("", Qt.blue, Qt.blue, 1, style = Qt.DashLine, symbol = Curve.NoSymbol, xData = [cut, cut], yData = [1.0, 0.015], autoScale = 1)
+        c = self.addCurve("", Qt.blue, Qt.blue, 1, style = Qt.DashLine, symbol = OWCurve.NoSymbol, xData = [cut, cut], yData = [1.0, 0.015], autoScale = 1)
         c.setYAxis(yRight)
         self.cutLineKeys.append(c)

orange/OrangeWidgets/Prototypes/OWDistributionsQt.py

@@ -14 +14 @@
 from OWColorPalette import ColorPixmap, ColorPaletteGenerator
 from OWWidget import *
-from OWGraphQt import *
+from plot.owplot import *
 import OWGUI
 import math
 import statc
 
-from Graph.curve import *
-from Graph.tools import *
-
-class distribErrorBarCurve(Curve):
+from plot.owcurve import *
+from plot.owtools import *
+
+class distribErrorBarCurve(OWCurve):
     def __init__(self, text = None):
         self._items = []
-        Curve.__init__(self,xData=[], yData=[])
+        OWCurve.__init__(self,xData=[], yData=[])
         
     def updateProperties(self):
-        if self.style() != Curve.UserCurve:
+        if self.style() != OWCurve.UserCurve:
             resize_plot_item_list(self._items, 0, None, self)
             self.items = []
             self.setDirty()
-            Curve.updateProperties(self)
+            OWCurve.updateProperties(self)
             return
             
@@ -55 +55 @@
             self._items[i].setPen(self.pen())
 
-class OWDistributionGraphQt(OWGraph):
+class OWDistributionGraphQt(OWPlot):
     def __init__(self, settingsWidget = None, parent = None, name = None):
-        OWGraph.__init__(self, parent, name, axes = [xBottom, yLeft, yRight])
+        OWPlot.__init__(self, parent, name, axes = [xBottom, yLeft, yRight])
         self.parent = parent
 
@@ -90 +90 @@
         curve.setVisible(visible)
         curve.setAxes(xAxis, yAxis)
-        return OWGraph.add_custom_curve(self, curve, enableLegend=0)
+        return OWPlot.add_custom_curve(self, curve, enableLegend=0)
 
     def sizeHint(self):
@@ -274 +274 @@
             else:
                 key.setColor(Qt.black)
-                key.setSymbol(Diamond)
+                key.setSymbol(OWCurve.Diamond)
                 key.setPointSize(7)
         else:
@@ -365 +365 @@
             ## (re)set the curves
             if self.variableContinuous:
-                newSymbol = NoSymbol
+                newSymbol = OWCurve.NoSymbol
             else:
-                newSymbol = Diamond
+                newSymbol = OWCurve.Diamond
                 
             self.probCurveKey.setData(xs, mps)
@@ -373 +373 @@
 
             if self.variableContinuous:
-                self.probCurveKey.setStyle(Curve.Lines)
+                self.probCurveKey.setStyle(OWCurve.Lines)
                 if self.showConfidenceIntervals:
                     self.probCurveUpperCIKey.setData(xs, ups)
@@ -379 +379 @@
             else:
                 if self.showConfidenceIntervals:
-                    self.probCurveKey.setStyle(Curve.UserCurve)
+                    self.probCurveKey.setStyle(OWCurve.UserCurve)
                 else:
-                    self.probCurveKey.setStyle(Curve.Dots)
+                    self.probCurveKey.setStyle(OWCurve.Dots)
         else:
             self.enableYRaxis(0)

orange/OrangeWidgets/Prototypes/OWLinProjGraphQt.py

@@ -1 @@
-from OWGraphQt import *
+from plot.owplot import *
 from copy import copy
 import time
@@ -7 +7 @@
 import orngVisFuncts
 import OWColorPalette
-from Graph.tools import UnconnectedLinesCurve
+from plot.owtools import UnconnectedLinesCurve
 
 # indices in curveData
@@ -24 +24 @@
 ##### CLASS : OWLINPROJGRAPH
 ###########################################################################################
-class OWLinProjGraph(OWGraph, orngScaleLinProjData):
+class OWLinProjGraph(OWPlot, orngScaleLinProjData):
     def __init__(self, widget, parent = None, name = "None"):
-        OWGraph.__init__(self, parent, name, axes=[])
+        OWPlot.__init__(self, parent, name, axes=[])
         orngScaleLinProjData.__init__(self)
 
@@ -69 +69 @@
 
     def setData(self, data, subsetData = None, **args):
-        OWGraph.setData(self, data)
+        OWPlot.setData(self, data)
         orngScaleLinProjData.setData(self, data, subsetData, **args)
         #self.anchorData = []
@@ -106 +106 @@
                 xdata = self.createXAnchors(100)*(self.hideRadius / 10)
                 ydata = self.createYAnchors(100)*(self.hideRadius / 10)
-                self.addCurve("hidecircle", QColor(200,200,200), QColor(200,200,200), 1, style = Qt.SolidLine, symbol = NoSymbol, xData = xdata.tolist() + [xdata[0]], yData = ydata.tolist() + [ydata[0]])
+                self.addCurve("hidecircle", QColor(200,200,200), QColor(200,200,200), 1, style = Qt.SolidLine, symbol = OWCurve.NoSymbol, xData = xdata.tolist() + [xdata[0]], yData = ydata.tolist() + [ydata[0]])
 
             # draw dots at anchors
@@ -127 +127 @@
                 XAnchors = [a[0] for a in shownAnchorData]
                 YAnchors = [a[1] for a in shownAnchorData]
-                self.addCurve("dots", QColor(160,160,160), QColor(160,160,160), 10, style = Qt.NoPen, symbol = Ellipse, xData = XAnchors, yData = YAnchors, showFilledSymbols = 1)
+                self.addCurve("dots", QColor(160,160,160), QColor(160,160,160), 10, style = Qt.NoPen, symbol = OWCurve.Ellipse, xData = XAnchors, yData = YAnchors, showFilledSymbols = 1)
 
                 # draw text at anchors
@@ -138 +138 @@
             xdata = self.createXAnchors(100)
             ydata = self.createYAnchors(100)
-            self.addCurve("circle", QColor(Qt.black), QColor(Qt.black), 1, style = Qt.SolidLine, symbol = NoSymbol, xData = xdata.tolist() + [xdata[0]], yData = ydata.tolist() + [ydata[0]])
+            self.addCurve("circle", QColor(Qt.black), QColor(Qt.black), 1, style = Qt.SolidLine, symbol = OWCurve.NoSymbol, xData = xdata.tolist() + [xdata[0]], yData = ydata.tolist() + [ydata[0]])
 
         self.potentialsClassifier = None # remove the classifier so that repaint won't recompute it
@@ -301 +301 @@
                 if not validData[i]: continue
                 newColor = self.contPalette.getRGB(self.noJitteringScaledData[self.dataClassIndex][i])
-                self.addCurve(str(i), QColor(*newColor+ (self.alphaValue,)), QColor(*newColor+ (self.alphaValue,)), self.pointWidth, symbol = Ellipse, xData = [x_positions[i]], yData = [y_positions[i]])
+                self.addCurve(str(i), QColor(*newColor+ (self.alphaValue,)), QColor(*newColor+ (self.alphaValue,)), self.pointWidth, symbol = OWCurve.Ellipse, xData = [x_positions[i]], yData = [y_positions[i]])
                 if self.showValueLines:
                     self.addValueLineCurve(x_positions[i], y_positions[i], newColor, i, indices)
@@ -411 +411 @@
                     self.selectedAnchorIndex = index
         else:
-            OWGraph.mousePressEvent(self, e)
+            OWPlot.mousePressEvent(self, e)
 
 
@@ -419 +419 @@
             self.selectedAnchorIndex = None
         else:
-            OWGraph.mouseReleaseEvent(self, e)
+            OWPlot.mouseReleaseEvent(self, e)
 
     # ##############################################################
@@ -439 +439 @@
         if self._pressed_mouse_button:
             if not self.manualPositioning:
-                OWGraph.mouseMoveEvent(self, e)
+                OWPlot.mouseMoveEvent(self, e)
                 if redraw: self.replot()
             else:
@@ -478 +478 @@
                         attrVal = self.scaledData[self.attributeNameIndex[label]][index]
                         markerX, markerY = xAnchor*(attrVal+0.03), yAnchor*(attrVal+0.03)
-                        curve = self.addCurve("", color, color, 1, style = Qt.SolidLine, symbol = NoSymbol, xData = [0, xAnchor*attrVal], yData = [0, yAnchor*attrVal], lineWidth=3)
+                        curve = self.addCurve("", color, color, 1, style = Qt.SolidLine, symbol = OWCurve.NoSymbol, xData = [0, xAnchor*attrVal], yData = [0, yAnchor*attrVal], lineWidth=3)
 
                         marker = None
@@ -508 +508 @@
                 self.showTip(intX, intY, text)
 
-        OWGraph.mouseMoveEvent(self, e)
+        OWPlot.mouseMoveEvent(self, e)
         self.replot()
 
@@ -716 +716 @@
             painter.drawImage(target, self.potentialsImage, source)
 #            painter.drawImage(self.transform(QwtPlot.xBottom, -1), self.transform(QwtPlot.yLeft, 1), self.potentialsImage)
-        OWGraph.drawCanvas(self, painter)
+        OWPlot.drawCanvas(self, painter)
 
 

orange/OrangeWidgets/Prototypes/OWScatterPlotGraphQt.py

@@ -2 +2 @@
 # OWScatterPlotGraph.py
 #
-from OWGraphQt import *
+from plot.owplot import *
 import time
 from orngCI import FeatureByCartesianProduct
@@ -20 +20 @@
 ##### CLASS : OWSCATTERPLOTGRAPH
 ###########################################################################################
-class OWScatterPlotGraphQt(OWGraph, orngScaleScatterPlotData):
+class OWScatterPlotGraphQt(OWPlot, orngScaleScatterPlotData):
     def __init__(self, scatterWidget, parent = None, name = "None"):
-        OWGraph.__init__(self, parent, name)
+        OWPlot.__init__(self, parent, name)
         orngScaleScatterPlotData.__init__(self)
 
@@ -49 +49 @@
 
     def setData(self, data, subsetData = None, **args):
-        OWGraph.setData(self, data)
+        OWPlot.setData(self, data)
         self.oldLegendKeys = {}
         orngScaleScatterPlotData.setData(self, data, subsetData, **args)
@@ -323 +323 @@
             if colorIndex != -1:
                 num = len(self.dataDomain[colorIndex].values)
-                val = [[], [], [self.pointWidth]*num, [Ellipse]*num]
+                val = [[], [], [self.pointWidth]*num, [OWCurve.Ellipse]*num]
                 varValues = getVariableValuesSorted(self.dataDomain[colorIndex])
                 for ind in range(num):
@@ -344 +344 @@
                 num = len(self.dataDomain[sizeIndex].values)
                 if legendKeys.has_key(sizeIndex):  val = legendKeys[sizeIndex]
-                else:                               val = [[], [Qt.black]*num, [], [Ellipse]*num]
+                else:                               val = [[], [Qt.black]*num, [], [OWCurve.Ellipse]*num]
                 val[2] = []; val[0] = []
                 varValues = getVariableValuesSorted(self.dataDomain[sizeIndex])
@@ -406 +406 @@
 ##                color = self.discPalette[classIndices[self.rawData.domain.classVar[classValue[key]].value]]
 ##                for (p1, p2) in clusterLines:
-##                    self.addCurve("", color, color, 1, QwtPlotCurve.Lines, NoSymbol, xData = [float(shortData[p1][0]), float(shortData[p2][0])], yData = [float(shortData[p1][1]), float(shortData[p2][1])], lineWidth = width)
+##                    self.addCurve("", color, color, 1, QwtPlotCurve.Lines, OWCurve.NoSymbol, xData = [float(shortData[p1][0]), float(shortData[p2][0])], yData = [float(shortData[p1][1]), float(shortData[p2][1])], lineWidth = width)
 ##        else:
 ##            colorIndex = self.discPalette[classIndices[self.rawData.domain.classVar[classValue].value]]
 ##            for (p1, p2) in closure:
-##                self.addCurve("", color, color, 1, QwtPlotCurve.Lines, NoSymbol, xData = [float(shortData[p1][0]), float(shortData[p2][0])], yData = [float(shortData[p1][1]), float(shortData[p2][1])], lineWidth = width)
+##                self.addCurve("", color, color, 1, QwtPlotCurve.Lines, OWCurve.NoSymbol, xData = [float(shortData[p1][0]), float(shortData[p2][0])], yData = [float(shortData[p1][1]), float(shortData[p2][1])], lineWidth = width)
 
     def addTip(self, x, y, attrIndices = None, dataindex = None, text = None):
@@ -420 +420 @@
 
 
-    # override the default buildTooltip function defined in OWGraph
+    # override the default buildTooltip function defined in OWPlot
     def buildTooltip(self, exampleIndex):
         if exampleIndex < 0:
@@ -467 +467 @@
 
     def onMouseReleased(self, e):
-        OWGraph.onMouseReleased(self, e)
+        OWPlot.onMouseReleased(self, e)
         self.updateLayout()
 
@@ -513 +513 @@
             painter.drawImage(target, self.potentialsImage, source)
 #            painter.drawImage(self.transform(xBottom, self.xmin), self.transform(yLeft, self.ymax), self.potentialsImage)
-        OWGraph.drawCanvas(self, painter)
+        OWPlot.drawCanvas(self, painter)
 
 

orange/OrangeWidgets/Prototypes/OWScatterPlotQt.py

@@ -16 +16 @@
 import OWGUI, OWToolbars, OWColorPalette
 from orngScaleData import *
-from Graph.curve import Curve
+from plot.owcurve import *
 
 ###########################################################################################
@@ -355 +355 @@
     def alphaChange(self):
         for curve in self.graph.itemList():
-            if isinstance(curve, Curve):
+            if isinstance(curve, OWCurve):
                 color = curve.color()
                 color.setAlpha(self.graph.alphaValue)
@@ -366 +366 @@
         else:
             for curve in self.graph.itemList():
-                if isinstance(curve, Curve):
+                if isinstance(curve, OWCurve):
                     curve.setPointSize(self.graph.pointWidth)
             self.graph.replot()