Changeset 4016:6c8318e473e3 in orange


Ignore:
Timestamp:
07/21/07 19:03:40 (7 years ago)
Author:
janezd <janez.demsar@…>
Branch:
default
Convert:
ccc7984831aeefe3179f587358f124cf9975658e
Message:

merge back from branch multilingual, fixed minor interface things like

  • capitalization
  • typographical errors
  • badly formulated tooltips
  • outputs impossible to translate into non-English
  • ...
Location:
orange
Files:
57 edited

Legend:

Unmodified
Added
Removed
  • orange/OrangeCanvas/orngCanvasItems.py

    r4014 r4016  
    372372        if (self.instance != None): 
    373373            try:    self.instance.saveSettings() 
    374             except: print "Unable to successfully save settings for %s widget" % (self.instance.title) 
     374            except: print "Unable to save settings for %s widget" % (self.instance.title) 
    375375            self.instance.hide() 
    376376            del self.instance 
  • orange/OrangeCanvas/orngDlgs.py

    r4014 r4016  
    512512        selectedWidgetBox = QHBox(colorsBox) 
    513513        self.selectedWidgetIcon = ColorIcon(selectedWidgetBox, canvasDlg.widgetSelectedColor) 
    514         selectedWidgetLabel = QLabel(" Selected Widget", selectedWidgetBox) 
     514        selectedWidgetLabel = QLabel(" Selected widget", selectedWidgetBox) 
    515515 
    516516        activeWidgetBox = QHBox(colorsBox) 
    517517        self.activeWidgetIcon = ColorIcon(activeWidgetBox, canvasDlg.widgetActiveColor) 
    518         activeWidgetLabel = QLabel(" Active Widget", activeWidgetBox) 
     518        activeWidgetLabel = QLabel(" Active widget", activeWidgetBox) 
    519519 
    520520        lineBox = QHBox(colorsBox) 
    521521        self.lineIcon = ColorIcon(lineBox, canvasDlg.lineColor) 
    522         lineLabel = QLabel(" Lines", lineBox) 
     522        lineLabel = QLabel(" Connections", lineBox) 
    523523 
    524524 
     
    661661 
    662662        if assigned: 
    663             dlg = QMessageBox("Confirmation", "'%s' is already assigned to '%s'. Override?" % (pressed, assigned.widget.nameKey), 
     663            dlg = QMessageBox("Confirmation", "'%(pressed)s' is already assigned to '%(assigned)s'. Override?" % {"pressed": pressed, "assigned": assigned.widget.nameKey}, 
    664664                              QMessageBox.Warning, QMessageBox.Yes | QMessageBox.Default, QMessageBox.No | QMessageBox.Escape, 0) 
    665665            dlg.exec_loop() 
     
    790790        groupBox.setMaximumSize(180,150) 
    791791 
    792         saveButton = QPushButton("Save changes", groupBox) 
    793         addButton = QPushButton("Add new channel name", self) 
    794         removeButton = QPushButton("Remove selected name", self) 
     792        saveButton = QPushButton("Save Changes", groupBox) 
     793        addButton = QPushButton("Add New Channel Name", self) 
     794        removeButton = QPushButton("Remove Selected Name", self) 
    795795        closeButton = QPushButton("Close",self) 
    796796        self.channelList = QListBox( self, "channels" ) 
     
    941941        Layout1.setMargin(0) 
    942942 
    943         self.insertSeparatorButton = QPushButton('Add separator', LayoutWidget) 
     943        self.insertSeparatorButton = QPushButton('Add Separator', LayoutWidget) 
    944944        self.connect(self.insertSeparatorButton, SIGNAL("clicked()"), self.insertSeparator) 
    945945        Layout1.addWidget(self.insertSeparatorButton) 
  • orange/OrangeCanvas/orngDoc.py

    r4014 r4016  
    2121        self.resize(700,500) 
    2222        self.showNormal() 
    23         self.setCaption("Schema " + str(self.canvasDlg.iDocIndex)) 
     23        self.setCaption("Schema"+" " + str(self.canvasDlg.iDocIndex)) 
    2424        self.canvasDlg.iDocIndex = self.canvasDlg.iDocIndex + 1 
    2525 
     
    474474        if not os.path.exists(filename): 
    475475            self.close() 
    476             QMessageBox.critical(self,'Orange Canvas','Unable to find file "'+ filename,  QMessageBox.Ok + QMessageBox.Default) 
     476            QMessageBox.critical(self,'Orange Canvas','Unable to find file "%s"' % filename,  QMessageBox.Ok + QMessageBox.Default) 
    477477            return 
    478478 
     
    501501                tempWidget = self.addWidgetByFileName(name, int(widget.getAttribute("xPos")), int(widget.getAttribute("yPos")), widget.getAttribute("caption"), activateSettings = 0) 
    502502                if not tempWidget: 
    503                     QMessageBox.information(self,'Orange Canvas','Unable to create an instance of the \"'+ name + '\" widget',  QMessageBox.Ok + QMessageBox.Default) 
     503                    QMessageBox.information(self,'Orange Canvas','Unable to create an instance of the widget "%s"' % name,  QMessageBox.Ok + QMessageBox.Default) 
    504504                else: 
    505505                    if tempWidget.caption in settingsDict.keys(): 
     
    518518                outWidget = self.getWidgetByCaption(outCaption) 
    519519                if inWidget == None or outWidget == None: 
    520                     print 'Unable to create a line between widgets "%s" and "%s" due to a missing widget.' % (outCaption, inCaption) 
     520                    print 'Unable to connect etween widgets "%s" and "%s" due to a missing widget.' % (outCaption, inCaption) 
    521521                    continue 
    522522 
  • orange/OrangeCanvas/orngView.py

    r4014 r4016  
    6565        exName = str(self.tempWidget.caption) 
    6666        if (int(qVersion()[0]) >= 3): 
    67             (newName ,ok) = QInputDialog.getText("Rename Widget", "Enter new name for the widget \"" + exName + "\":", exName) 
     67            (newName ,ok) = QInputDialog.getText("Rename Widget", 'Enter new name for the widget "%s": ' % exName, exName) 
    6868        else: 
    69             (newName ,ok) = QInputDialog.getText("Qt Rename Widget", "Enter new name for the widget \"" + exName + "\":", exName) 
     69            (newName ,ok) = QInputDialog.getText("Qt Rename Widget", 'Enter new name for the widget "%s": ' % exName, exName) 
    7070        newName = str(newName) 
    7171        if ok and self.tempWidget != None and newName != exName: 
  • orange/OrangeWidgets/Associate/OWAssociationRules.py

    r4001 r4016  
    3131        box = OWGUI.widgetBox(self.space, "Algorithm", addSpace = True) 
    3232        self.cbSparseAlgorithm = OWGUI.checkBox(box, self, 'useSparseAlgorithm', 'Use algorithm for sparse data', tooltip="Use original Agrawal's algorithm", callback = self.checkSparse) 
    33         self.cbClassificationRules = OWGUI.checkBox(box, self, 'classificationRules', 'Induce classification rules', tooltip="Induce classifaction rules") 
     33        self.cbClassificationRules = OWGUI.checkBox(box, self, 'classificationRules', 'Induce classification rules', tooltip="Induce classification rules") 
    3434        self.checkSparse() 
    3535 
  • orange/OrangeWidgets/Associate/OWDistanceMap.py

    r3558 r4016  
    8888 
    8989        self.maxHSize = 30; self.maxVSize = 30 
    90         self.sorting = [("None", self.sortNone), ("Adjacent distance", self.sortAdjDist), ("Random", self.sortRandom)] 
     90        self.sorting = [("No sorting", self.sortNone), ("Adjacent distance", self.sortAdjDist), ("Random order", self.sortRandom)] 
    9191 
    9292        self.matrix = self.order = None 
     
    111111        tab = QVGroupBox(self) 
    112112        box = QVButtonGroup("Threshold Values", tab) 
    113         OWGUI.checkBox(box, self, 'CutEnabled', "Enabled", callback=self.setCutEnabled) 
     113        OWGUI.checkBox(box, self, 'CutEnabled', "Enable thresholds", callback=self.setCutEnabled) 
    114114        self.sliderCutLow = OWGUI.qwtHSlider(box, self, 'CutLow', label='Low:', labelWidth=33, minValue=-100, maxValue=0, step=0.1, precision=1, ticks=0, maxWidth=80, callback=self.drawDistanceMap) 
    115115        self.sliderCutHigh = OWGUI.qwtHSlider(box, self, 'CutHigh', label='High:', labelWidth=33, minValue=0, maxValue=100, step=0.1, precision=1, ticks=0, maxWidth=80, callback=self.drawDistanceMap) 
  • orange/OrangeWidgets/Associate/OWHierarchicalClustering.py

    r3480 r4016  
    3535        self.inputs=[("Distance matrix", orange.SymMatrix, self.dataset)] 
    3636        self.outputs=[("Selected Examples", ExampleTable), ("Structured Data Files", DataFiles)] 
    37         self.linkage=[("Single ", orange.HierarchicalClustering.Single), 
    38                         ("Average", orange.HierarchicalClustering.Average), 
    39                         ("Complete", orange.HierarchicalClustering.Complete)] 
     37        self.linkage=[("Single linkage", orange.HierarchicalClustering.Single), 
     38                        ("Average linkage", orange.HierarchicalClustering.Average), 
     39                        ("Complete linkage", orange.HierarchicalClustering.Complete)] 
    4040        self.Linkage=0 
    4141        self.OverwriteMatrix=0 
     
    109109 
    110110        #Selection options 
    111         OWGUI.checkBox(self.selectionTab, self, "SelectionMode", "Cutoff line",  
     111        OWGUI.checkBox(self.selectionTab, self, "SelectionMode", "Show cutoff line",  
    112112              callback=self.updateCutOffLine) 
    113113        self.classificationBox=QVGroupBox(self.selectionTab) 
     
    122122        OWGUI.checkBox(self.selectionTab, self, "DisableHighlights", "Disable highlights") 
    123123        OWGUI.checkBox(self.selectionTab, self, "DisableBubble", "Disable bubble info") 
    124         OWGUI.button(self.controlArea, self, "&Save graph", self.saveGraph, debuggingEnabled = 0) 
     124        OWGUI.button(self.controlArea, self, "&Save Graph", self.saveGraph, debuggingEnabled = 0) 
    125125 
    126126        self.mainAreaLayout=QVBoxLayout(self.mainArea, QVBoxLayout.TopToBottom,0) 
     
    195195 
    196196    def updateLabel(self): 
     197#        self.rootCluster.mapping.setattr("objects", self.matrix.items) 
     198#        self.dendogram.updateLabel() 
     199#        return 
     200     
    197201        items=self.matrix.items 
    198202        if self.Annotation==0: 
  • orange/OrangeWidgets/Associate/OWInteractionGraph.py

    r3480 r4016  
    9797        self.attrRemoveButton = QPushButton("Remove attr.", self.addRemoveGroup) 
    9898 
     99        OWGUI.separator(self.space) 
     100 
    99101        self.mergeAttributesCB = QCheckBox('Merge attributes', self.space) 
    100102        self.importantInteractionsCB = QCheckBox('Show only important interactions', self.space) 
     103        QToolTip.add(self.mergeAttributesCB, "Enable or disable attribute merging. If enabled, you can merge \ntwo attributes with right mouse click inside attribute rectangle.\nMerged attribute is then built as cartesian product of corresponding attribute pair\nand added to the list of possible attributes") 
     104 
     105        OWGUI.separator(self.space) 
    101106 
    102107        self.selectionButton = QPushButton("Show selection", self.space) 
    103  
    104108        QToolTip.add(self.selectionButton, "Sends 'selection' signal to any successor visualization widgets.\nThis signal contains a list of selected attributes to visualize.") 
    105         QToolTip.add(self.mergeAttributesCB, "Enable or disable attribute merging. If enabled, you can merge \ntwo attributes with right mouse click inside attribute rectangle.\nMerged attribute is then built as cartesian product of corresponding attribute pair\nand added to the list of possible attributes") 
    106109 
    107110 
  • orange/OrangeWidgets/Associate/OWKMeans.py

    r3480 r4016  
    3939        # settings 
    4040        OWGUI.qwtHSlider(self.controlArea, self, "K", box="Number of Clusters", label="K: ", minValue=1, maxValue=30, step=1, callback=self.settingsChanged) 
    41         OWGUI.comboBox(self.controlArea, self, "DistanceMeasure", box="Distance Measure", items=["Euclidean", "Manthattan"], tooltip=None, callback=self.settingsChanged) 
     41        OWGUI.comboBox(self.controlArea, self, "DistanceMeasure", box="Distance Measure", items=["Euclidean", "Manhattan"], tooltip=None, callback=self.settingsChanged) 
    4242        QWidget(self.controlArea).setFixedSize(0, 8) 
    43         self.applyBtn = QPushButton("Apply Settings", self.controlArea) 
     43        self.applyBtn = QPushButton("&Apply", self.controlArea) 
    4444        self.applyBtn.setDisabled(TRUE) 
    4545 
  • orange/OrangeWidgets/Associate/OWMDS.py

    r3480 r4016  
    4343        self.StressFunc=3 
    4444        self.minStressDelta=1e-5 
    45         self.maxIterations=50 
     45        self.maxIterations=5000 
    4646        self.maxImprovment=10 
    4747        self.autoSendSelection=0 
     
    8888        opt=OWGUI.widgetBox(mds, "Optimization") 
    8989 
    90         self.startButton=OWGUI.button(opt, self, "Start", self.testStart) 
     90        self.startButton=OWGUI.button(opt, self, "Optimize", self.testStart) 
    9191        OWGUI.button(opt, self, "LSMT", self.LSMT) 
    9292        OWGUI.button(opt, self, "Step", self.smacofStep) 
     
    103103        OWGUI.comboBox(self.stopping, self, "StressFunc", box="Stress Function", items=[a[0] for a in self.stressFunc], callback=self.updateStress) 
    104104        OWGUI.qwtHSlider(stress, self, "minStressDelta", minValue=1e-5, maxValue=1e-2, step=1e-5, precision=6) 
    105         OWGUI.spin(self.stopping, self, "maxIterations", box="Max. Number of Steps", min=1, max=100) 
     105        OWGUI.spin(self.stopping, self, "maxIterations", box="Max. Number of Steps", min=1, max=5000) 
    106106        #OWGUI.spin(stopping, self, "maxImprovment", box="Max. improvment of a run", min=0, max=100, postfix="%") 
    107107     
     
    158158        contAttributes=filter(lambda a: a.varType==orange.VarTypes.Continuous, attributes) 
    159159        attrName=[attr.name for attr in attributes] 
    160         for name in ["One color"]+attrName: 
     160        for name in ["Same color"]+attrName: 
    161161            self.colorCombo.insertItem(name) 
    162         for name in ["One size"]+map(lambda a:a.name, contAttributes): 
     162        for name in ["Same size"]+map(lambda a:a.name, contAttributes): 
    163163            self.sizeCombo.insertItem(name) 
    164         for name in ["One shape"]+map(lambda a: a.name, discAttributes): 
     164        for name in ["Same shape"]+map(lambda a: a.name, discAttributes): 
    165165            self.shapeCombo.insertItem(name) 
    166166        for name in ["No  name"]+attrName: 
     
    211211        self.shapeCombo.clear() 
    212212        self.nameCombo.clear() 
    213         for name in ["One color", "strain"]: 
     213        for name in ["Same color", "strain"]: 
    214214            self.colorCombo.insertItem(name) 
    215215        for name in ["No name", "name", "strain"]: 
     
    240240        self.shapeCombo.clear() 
    241241        self.nameCombo.clear() 
    242         for name in ["One color", "Variable"]: 
     242        for name in ["Same color", "Variable"]: 
    243243            self.colorCombo.insertItem(name) 
    244244        for name in ["No name", "Var name"]: 
     
    349349 
    350350            oldStress=stress 
    351         self.startButton.setText("Start") 
     351        self.startButton.setText("Optimize") 
    352352        self.progressBarFinished() 
    353353        #if not self.ReDraw: 
     
    363363            return 
    364364        self.done=False 
    365         self.startButton.setText("Stop") 
     365        self.startButton.setText("Stop Optimization") 
    366366        self.stopping.setDisabled(1) 
    367367        self.progressBarInit() 
     
    371371        if self.iterNum%(math.pow(10,self.RefreshMode)): 
    372372            self.graph.updateData() 
    373         self.startButton.setText("Start") 
     373        self.startButton.setText("Optimize") 
    374374        self.stopping.setDisabled(0) 
    375375        self.progressBarFinished() 
     
    434434 
    435435    def sendList(self, selectedInd): 
     436        if self.data and type(self.data[0]) == str: 
     437            xAttr=orange.FloatVariable("X") 
     438            yAttr=orange.FloatVariable("Y") 
     439            nameAttr=  orange.StringVariable("name") 
     440            if self.selectionOptions == 1: 
     441                domain = orange.Domain([xAttr, yAttr, nameAttr]) 
     442                selection = orange.ExampleTable(domain) 
     443                for i in range(len(selectedInd)): 
     444                    selection.append(list(self.mds.points[selectedInd[i]]) + [self.data[i]]) 
     445            else: 
     446                domain = orange.Domain([nameAttr]) 
     447                if self.selectionOptions: 
     448                    domain.addmeta(orange.newmetaid(), xAttr) 
     449                    domain.addmeta(orange.newmetaid(), yAttr) 
     450                selection = orange.ExampleTable(domain) 
     451                for i in range(len(selectedInd)): 
     452                    selection.append([self.data[i]]) 
     453                    if self.selectionOptions: 
     454                        selection[i][xAttr]=self.mds.points[selectedInd[i]][0] 
     455                        selection[i][yAttr]=self.mds.points[selectedInd[i]][1] 
     456            self.send("Example Table", selection) 
     457            return 
     458                
    436459        if not selectedInd: 
    437460            self.send("Structured Data Files", None) 
     
    467490        self.lines=[] 
    468491        self.lineKeys=[] 
     492        self.distanceLineKeys=[] 
    469493        self.colors=[] 
    470494        self.sizes=[] 
     
    496520        if 1: 
    497521            self.clear() 
     522            if self.ShowStress: 
     523                self.updateDistanceLines() 
    498524            self.setPoints() 
    499             if self.ShowStress: 
    500                 self.setLines(True) 
     525                #self.setLines(True) 
    501526        for axis in [QwtPlot.xBottom, QwtPlot.xTop, QwtPlot.yLeft, QwtPlot.yRight]: 
    502527            self.setAxisAutoScale(axis) 
     
    504529        self.repaint() 
    505530 
     531    def updateDistanceLines(self): 
     532        for k in self.distanceLineKeys: 
     533            self.removeCurve(k) 
     534 
     535        matrix = self.mds.originalDistances 
     536        mindist = min([min(r) for r in matrix]) 
     537        maxdist = max([max(r) for r in matrix]) 
     538        diff = maxdist - mindist 
     539# DBLP 
     540#        maxdist = 0.85 * (mindist + diff) 
     541        maxdist = 0.5 * (mindist + diff) 
     542        k = 10 / diff 
     543        if self.mds: 
     544            black = QColor(192,192,192) 
     545            for i, pti in enumerate(self.mds.points): 
     546                for j, ptj in enumerate(self.mds.points): 
     547                    dist =  matrix[i, j] 
     548                    if dist < maxdist: 
     549                        self.distanceLineKeys.append(self.addCurve("A", black, black, 0, QwtCurve.Lines, xData=[pti[0],ptj[0]], yData=[pti[1],ptj[1]], lineWidth = (maxdist - dist) * k)) 
     550                     
    506551    def updateLines(self): 
    507552        if self.mds: 
     
    539584            if self.NameAttr!=0: 
    540585                self.addMarker(self.names[i][self.NameAttr], self.mds.points[i][0], self.mds.points[i][1], Qt.AlignRight) 
     586        self.update() 
    541587             
    542588                                
  • orange/OrangeWidgets/Associate/OWSOM.py

    r1958 r4016  
    3939        self.learnerName=OWGUI.lineEdit(self.controlArea, self, "LearnerName", box="Learner/Classifier Name", tooltip="Name to be used by other widgets to identify yor Learner/Classifier") 
    4040        self.learnerName.setText("SOM Classifier") 
    41         box=OWGUI.widgetBox(self.controlArea, self) 
    42         OWGUI.spin(box, self, "xdim", 4, 1000, orientation="horizontal", label="X Dim") 
    43         OWGUI.spin(box, self, "ydim", 4, 1000, orientation="horizontal", label="Y Dim") 
     41        box=OWGUI.widgetBox(self.controlArea, self, "Dimensions") 
     42        OWGUI.spin(box, self, "xdim", 4, 1000, orientation="horizontal", label="Columns") 
     43        OWGUI.spin(box, self, "ydim", 4, 1000, orientation="horizontal", label="Rows") 
    4444        OWGUI.radioButtonsInBox(self.controlArea, self, "topology", ["Hexagonal topology", "Rectangular topology"], box="Topology") 
    4545        OWGUI.radioButtonsInBox(self.controlArea, self, "neighborhood", ["Bubble neighborhood","Gaussian neighborhood"], box="Neighborhood") 
     
    5858        self.alpha1=self.alpha1 
    5959        self.alpha2=self.alpha2 
    60         OWGUI.button(self.controlArea, self,  "&Apply settings", callback=self.ApplySettings) 
     60        OWGUI.button(self.controlArea, self,  "&Apply", callback=self.ApplySettings) 
    6161         
    6262        self.resize(100,100) 
  • orange/OrangeWidgets/Associate/OWSOMVisualizer.py

    r3480 r4016  
    169169        b=CanvasBubbleInfo(node,None,self.canvas()) 
    170170        b.setZ(20) 
    171         s="Items: "+str(len(node.examples)) 
     171        s="Items: %i" % len(node.examples) 
    172172        b.addTextLine(s) 
    173173         
     
    586586        self.backgroundBox=QVButtonGroup("Background", mainTab) 
    587587        #OWGUI.checkBox(self.backgroundBox, self, "backgroundCheck","Show background", callback=self.setBackground) 
    588         b=OWGUI.radioButtonsInBox(self.backgroundBox, self, "canvas.drawMode", ["None", "U-Matrix", "Component Planes"], callback=self.setBackground) 
     588        b=OWGUI.radioButtonsInBox(self.backgroundBox, self, "canvas.drawMode", ["None", "U-Matrix", "Component planes"], callback=self.setBackground) 
    589589        b.setSizePolicy(QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)) 
    590590        self.componentCombo=OWGUI.comboBox(b,self,"canvas.component", callback=self.setBackground) 
    591591        self.componentCombo.setEnabled(self.canvas.drawMode==2) 
    592         OWGUI.checkBox(self.backgroundBox, self, "canvas.showGrid", "Show Grid", callback=self.canvas.updateAll) 
     592        OWGUI.checkBox(self.backgroundBox, self, "canvas.showGrid", "Show grid", callback=self.canvas.updateAll) 
    593593        #b=OWGUI.widgetBox(mainTab, "Histogram") 
    594594        OWGUI.separator(mainTab) 
     
    608608        OWGUI.separator(b1) 
    609609 
    610         b1=OWGUI.widgetBox(b1, "Bubble Info") 
     610        b1=OWGUI.widgetBox(b1, "Bubble info") 
    611611        OWGUI.checkBox(b1, self, "canvasView.showBubbleInfo","Show") 
    612612        OWGUI.checkBox(b1, self, "canvasView.includeCodebook", "Include codebook vector") 
  • orange/OrangeWidgets/Classify/OWC45Tree.py

    r3482 r4016  
    3939        self.preprocessor = None            # no preprocessing as default 
    4040 
    41         OWGUI.lineEdit(self.controlArea, self, 'name', box='Learner/Classifier Name', \ 
     41        OWGUI.lineEdit(self.controlArea, self, 'name', box='Learner/Classifier Name', 
    4242                 tooltip='Name to be used by other widgets to identify your learner/classifier.') 
    4343        OWGUI.separator(self.controlArea) 
     
    7171        OWGUI.separator(self.controlArea) 
    7272 
    73         OWGUI.button(self.controlArea, self, "&Apply Setting", callback = self.setLearner, disabled=0) 
     73        OWGUI.button(self.controlArea, self, "&Apply", callback = self.setLearner, disabled=0) 
    7474 
    7575        self.adjustSize() 
  • orange/OrangeWidgets/Classify/OWCN2.py

    r3601 r4016  
    9191        OWGUI.doubleSpin(self.ruleValidationGroup, self, "stepAlpha", 0, 1,0.001, label="Stopping Alpha (vs. parent rule)", 
    9292                orientation="horizontal", labelWidth=labelWidth, 
    93                 tooltip="How different (significance) is class distribution from examples\ncovered by a rule and covered by a parent rule") 
     93                tooltip="Required significance of each specialization of a rule.") 
    9494        OWGUI.spin(self.ruleValidationGroup, self, "MinCoverage", 0, 100,label="Minimum coverage", 
    9595                orientation="horizontal", labelWidth=labelWidth, tooltip= 
     
    122122 
    123123        OWGUI.separator(self.controlArea) 
    124         self.btnApply = OWGUI.button(self.controlArea, self, "&Apply Settings", callback=self.applySettings) 
     124        self.btnApply = OWGUI.button(self.controlArea, self, "&Apply", callback=self.applySettings) 
    125125 
    126126        self.Alpha=float(self.Alpha) 
  • orange/OrangeWidgets/Classify/OWClassificationTree.py

    r3614 r4016  
    7676 
    7777        OWGUI.separator(self.controlArea) 
    78         self.btnApply = OWGUI.button(self.controlArea, self, "&Apply Changes", callback = self.setLearner, disabled=0) 
     78        self.btnApply = OWGUI.button(self.controlArea, self, "&Apply", callback = self.setLearner, disabled=0) 
    7979 
    8080    def setLearner(self): 
  • orange/OrangeWidgets/Classify/OWClassificationTreeGraph.py

    r4003 r4016  
    326326        b.addTextLine(text) 
    327327        b.addTextLine() 
    328         text="Instances:"+str(node.numInst)+"(%.1f" % (node.numInst/self.tree.distribution.cases*100)+"%)" 
     328        text="Instances: %(ninst)s (%(prop).1f%%)" % {"ninst": str(node.numInst), "prop": node.numInst/self.tree.distribution.cases*100} 
    329329        b.addTextLine(text) 
    330330        b.addTextLine() 
     
    333333                b.addTextLine("%s: %i (%.1f" %(d[0],int(d[1]),d[1]/sum(node.dist)*100)+"%)",self.ClassColors[i]) 
    334334        b.addTextLine() 
    335         b.addTextLine((node.tree.branches and "Partition on: "+node.name) or "(leaf)") 
     335        b.addTextLine((node.tree.branches and "Partition on: %(nodename)s" % {"nodename": node.name}) or "(leaf)") 
    336336        b.show() 
    337337        return b 
     
    339339    def saveGraph(self, fileName = None): 
    340340        if not fileName: 
    341             qfileName = QFileDialog.getSaveFileName("tree.png","Portable Network Graphics (.PNG)\nWindows Bitmap (.BMP)\nGraphics Interchange Format (.GIF)\nDot Tree File(.DOT)", None, "Save to..") 
     341            qfileName = QFileDialog.getSaveFileName("tree.png","Portable Network Graphics (.PNG)\nWindows Bitmap (.BMP)\nGraphics Interchange Format (.GIF)\nDot Tree File(.DOT)", None, None, "Save to..") 
    342342            fileName = str(qfileName) 
    343343            if not fileName: 
  • orange/OrangeWidgets/Classify/OWClassificationTreeViewer.py

    r3482 r4016  
    194194 
    195195        if tree: 
    196             self.infoa.setText('Number of nodes: ' + str(orngTree.countNodes(tree))) 
    197             self.infob.setText('Number of leaves: ' + str(orngTree.countLeaves(tree))) 
     196            self.infoa.setText('Number of nodes: %i' % orngTree.countNodes(tree)) 
     197            self.infob.setText('Number of leaves: %i' % orngTree.countLeaves(tree)) 
    198198        else: 
    199199            self.infoa.setText('No tree.') 
     
    257257            className = str(nodeclsfr.classVar.name) 
    258258            if tx: 
    259                 self.rule.setText("IF %s\nTHEN %s = %s" % (tx, className, classLabel)) 
     259                self.rule.setText("IF %(tx)s\nTHEN %(className)s = %(classLabel)s" % vars()) 
    260260            else: 
    261                 self.rule.setText("%s = %s" % (className, classLabel)) 
     261                self.rule.setText("%(className)s = %(classLabel)s" % vars()) 
    262262        else: 
    263263            self.send("Examples", None) 
  • orange/OrangeWidgets/Classify/OWKNN.py

    r3482 r4016  
    5858        OWGUI.separator(self.controlArea) 
    5959 
    60         OWGUI.button(self.controlArea, self, "&Apply Settings", callback = self.setLearner, disabled=0) 
     60        OWGUI.button(self.controlArea, self, "&Apply", callback = self.setLearner, disabled=0) 
    6161 
    6262        self.resize(100,250) 
  • orange/OrangeWidgets/Classify/OWLogisticRegression.py

    r3482 r4016  
    5252        stepwiseCb = OWGUI.checkBox(box, self, "stepwiseLR", "Stepwise attribute selection") 
    5353        ibox = OWGUI.indentedBox(box) 
    54         addCritSpin = OWGUI.spin(ibox, self, "addCrit", 1, 50, label="Add criteria [%]", labelWidth=155, tooltip="Requested significance of attribute to be added in common model.") 
    55         remCritSpin = OWGUI.spin(ibox, self, "removeCrit", 1, 50, label="Remove criteria [%]", labelWidth=155, tooltip="Requested significance of attribute to be removed from common model.") 
    56         limitAttSpin = OWGUI.checkWithSpin(ibox, self, "Limit number of attributes to ", 1, 100, "limitNumAttr", "numAttr", step=1, labelWidth=155, tooltip="Maximum number of selected attributes. Algorithm stops when it selects specified number of attributes.") 
     54        addCritSpin = OWGUI.spin(ibox, self, "addCrit", 1, 50, label="Add threshold [%]", labelWidth=155, tooltip="Requested significance for adding an attribute.") 
     55        remCritSpin = OWGUI.spin(ibox, self, "removeCrit", 1, 50, label="Remove threshold [%]", labelWidth=155, tooltip="Requested significance for removing an attribute.") 
     56        limitAttSpin = OWGUI.checkWithSpin(ibox, self, "Limit number of attributes to ", 1, 100, "limitNumAttr", "numAttr", step=1, labelWidth=155, tooltip="Maximum number of attributes. Algorithm stops when it selects specified number of attributes.") 
    5757        stepwiseCb.disables += [addCritSpin, remCritSpin, limitAttSpin] 
    5858        stepwiseCb.makeConsistent() 
  • orange/OrangeWidgets/Classify/OWMajority.py

    r3482 r4016  
    2929        OWGUI.separator(self.controlArea) 
    3030 
    31         OWGUI.button(self.controlArea, self, "&Apply Setting", callback = self.setLearner, disabled=0) 
     31        OWGUI.button(self.controlArea, self, "&Apply", callback = self.setLearner, disabled=0) 
    3232 
    3333        self.learner = orange.MajorityLearner() 
  • orange/OrangeWidgets/Classify/OWNaiveBayes.py

    r3615 r4016  
    5050        OWGUI.separator(self.controlArea) 
    5151 
    52         box = QGroupBox('Probability Estimation', self.controlArea) 
     52        box = QGroupBox('Probability estimation', self.controlArea) 
    5353        glay = QGridLayout(box, 7, 3, 10, 5) 
    5454 
    5555        glay.addWidget(OWGUI.separator(box, height=5), 0, 0) 
    5656 
    57         glay.addWidget(OWGUI.widgetLabel(box, "Unconditional"), 1, 0) 
     57        glay.addWidget(OWGUI.widgetLabel(box, "Prior"), 1, 0) 
    5858 
    5959        glay.addWidget(OWGUI.comboBox(box, self, 'probEstimation', items=[e[0] for e in self.estMethods], tooltip='Method to estimate unconditional probability.'), 
  • orange/OrangeWidgets/Classify/OWNomogram.py

    r3739 r4016  
    501501        self.error(1)             
    502502        if not len(self.data.domain.classVar.values) == 2: 
    503             self.error(1, "Only two class domains can be used for rules!") 
     503            self.error(1, "Rules require binary classes") 
    504504        classVal = cl.domain.classVar 
    505505        att = cl.domain.attributes 
     
    549549        self.error(2) 
    550550        if self.data and self.data.domain and not self.data.domain.classVar: 
    551             self.error(2, "This domain has no class attribute!") 
     551            self.error(2, "Classless domain") 
    552552            return 
    553553 
     
    668668        size = QSize(sizeW, sizeH) 
    669669 
    670         qfileName = QFileDialog.getSaveFileName("graph.png","Portable Network Graphics (.PNG)\nWindows Bitmap (.BMP)\nGraphics Interchange Format (.GIF)", None, "Save to..") 
     670        qfileName = QFileDialog.getSaveFileName("graph.png","Portable Network Graphics (.PNG)\nWindows Bitmap (.BMP)\nGraphics Interchange Format (.GIF)", None, None, "Save to..") 
    671671        fileName = str(qfileName) 
    672672        if fileName == "": return 
  • orange/OrangeWidgets/Classify/OWNomogramGraph.py

    r3681 r4016  
    13611361 
    13621362    def printOUT(self): 
    1363         print "constant:", str(self.constant.betaValue) 
     1363        print "Constant:", str(self.constant.betaValue) 
    13641364        for a in self.attributes: 
    13651365            print a.toString() 
  • orange/OrangeWidgets/Classify/OWSVM.py

    r3648 r4016  
    6666        OWGUI.separator(self.controlArea) 
    6767 
    68         OWGUI.button(self.controlArea, self,"&Apply settings", callback=self.applySettings) 
     68        OWGUI.button(self.controlArea, self,"&Apply", callback=self.applySettings) 
    6969        self.nuBox.setDisabled(not self.useNu) 
    7070        self.adjustSize() 
  • orange/OrangeWidgets/Data/OWDataSampler.py

    r3436 r4016  
    199199            sample = self.data.select(self.ind, 0) 
    200200            remainder = self.data.select(self.ind, 1) 
    201             self.infoc.setText('Output: subset %d of %d, %d instance(s).' % (self.outFold, self.Folds, len(sample))) 
     201            self.infoc.setText('Output: subset %(outFold)d of %(folds)d, %(instances)d instance(s).' % {"outFold": self.outFold, "folds": self.Folds, "instances": len(sample)}) 
    202202        else: 
    203203            sample = self.data.select(self.ind, self.outFold-1) 
    204204            remainder = self.data.select(self.ind, self.outFold-1, negate=1) 
    205             self.infoc.setText('Output: fold %d of %d, %d instance(s).' % (self.outFold, self.Folds, len(sample))) 
     205            self.infoc.setText('Output: fold %(outFold)d of %(folds)d, %(instances)d instance(s).' % {"outFold": self.outFold, "folds": self.Folds, "instances": len(sample)}) 
    206206        # set name (by PJ) 
    207207        if sample: 
  • orange/OrangeWidgets/Data/OWDiscretize.py

    r3616 r4016  
    859859 
    860860 
    861     shortDiscNames = ("", " (leave continuous)", " (entropy)", " (equal frequency)", " (equal width)", " (removed)", " (custom 1)", " (custom 2)", " (custom 3)") 
     861    # This weird construction of the list is needed for easier translation into other languages 
     862    shortDiscNames = "" + [" (%s)" % x ("leave continuous", "entropy", "equal frequency", "equal width", "removed"] + ["custom %i" % x for x in range(1, 4)] 
    862863 
    863864    def computeDiscretizer(self, i, idx, onlyDefaults=False): 
  • orange/OrangeWidgets/Data/OWMergeData.py

    r2203 r4016  
    218218                    etBreduced.append(orange.Example(domBreduced, exBDK)) 
    219219            etAB = orange.ExampleTable([self.dataA, etBreduced]) 
    220             etAB.name = nameA + " (merged with %s)" % nameB 
     220            etAB.name = "%(nameA)s (merged with %(nameB)s)" % vars() 
    221221            self.send("Merged Examples A+B", etAB) 
    222222             
  • orange/OrangeWidgets/Data/OWPurgeDomain.py

    r3618 r4016  
    171171        if not klass: 
    172172            newclass = klass 
    173             self.classAttr = "No class." 
     173            self.classAttr = "No class" 
    174174        elif klass.varType != orange.VarTypes.Discrete: 
    175175            newclass = klass 
    176             self.classAttr = "Class is not discrete." 
     176            self.classAttr = "Class is not discrete" 
    177177        elif not (self.removeClassAttribute or self.sortClasses): 
    178178            newclass = klass 
    179             self.classAttr = "Class is not checked." 
     179            self.classAttr = "Class is not checked" 
    180180        else: 
    181181            self.classAttr = "" 
     
    188188            if not newclass or self.removeClassAttribute and len(newclass.values) < 2: 
    189189                newclass = None 
    190                 self.classAttr = "Class is removed." 
     190                self.classAttr = "Class is removed" 
    191191            elif len(newclass.values) != len(klass.values): 
    192                     self.classAttr = "Class is reduced." 
     192                    self.classAttr = "Class is reduced" 
    193193 
    194194            if newclass and self.sortClasses: 
  • orange/OrangeWidgets/Data/OWSelectData.py

    r3619 r4016  
    116116        self.lblAvg = QLabel("Avg: ", boxAttrStat) 
    117117        self.lblMax = QLabel("Max: ", boxAttrStat) 
    118         self.lblDefined = QLabel("Defined for ---- examples", boxAttrStat) 
     118        self.lblDefined = QLabel("Defined for %s examples" % "----", boxAttrStat) 
    119119        # values 1: discrete 
    120120        boxVal = QVGroupBox("Values", None) 
     
    133133        gl.addMultiCellWidget(self.boxButtons, 1,1,0,2) 
    134134        self.btnNew = OWGUI.button(self.boxButtons, self, "Add", self.OnNewCondition) 
    135         self.btnUpdate = OWGUI.button(self.boxButtons, self, "Update", self.OnUpdateCondition) 
     135        self.btnUpdate = OWGUI.button(self.boxButtons, self, "Modify", self.OnUpdateCondition) 
    136136        self.btnRemove = OWGUI.button(self.boxButtons, self, "Remove", self.OnRemoveCondition) 
    137137        self.btnOR = OWGUI.button(self.boxButtons, self, "OR", self.OnDisjunction) 
     
    174174 
    175175        boxSettings = QVGroupBox(ca) 
    176         boxSettings.setTitle('Update') 
     176        boxSettings.setTitle('Commit') 
    177177        gl.addWidget(boxSettings, 3,2) 
    178178        OWGUI.checkBox(boxSettings, self, "purgeAttributes", "Remove unused values/attributes", box=None, callback=self.OnPurgeChange) 
    179179        self.purgeClassesCB = OWGUI.checkBox(OWGUI.indentedBox(boxSettings), self, "purgeClasses", "Remove unused classes", callback=self.OnPurgeChange) 
    180         OWGUI.checkBox(boxSettings, self, "updateOnChange", "Update on any change", box=None) 
    181         btnUpdate = OWGUI.button(boxSettings, self, "Update", self.setOutput) 
     180        OWGUI.checkBox(boxSettings, self, "updateOnChange", "Commit on change", box=None) 
     181        btnUpdate = OWGUI.button(boxSettings, self, "Commit", self.setOutput) 
    182182 
    183183        self.icons = self.createAttributeIconDict() 
  • orange/OrangeWidgets/Evaluate/OWCalibrationPlot.py

    r1931 r4016  
    228228        self.classifiersQLB = QListBox(self.classifiersQVGB) 
    229229        self.classifiersQLB.setSelectionMode(QListBox.Multi) 
    230         self.unselectAllClassifiersQLB = QPushButton("(Un)select all", self.classifiersQVGB) 
     230        self.unselectAllClassifiersQLB = QPushButton("(Un)select All", self.classifiersQVGB) 
    231231        self.connect(self.classifiersQLB, SIGNAL("selectionChanged()"), self.classifiersSelectionChange) 
    232232        self.connect(self.unselectAllClassifiersQLB, SIGNAL("clicked()"), self.SUAclassifiersQLB) 
     
    235235        ## settings tab 
    236236        self.settingsTab = QVGroupBox(self) 
    237         OWGUI.hSlider(self.settingsTab, self, 'CalibrationCurveWidth', box='Calibration Curve Width', minValue=1, maxValue=9, step=1, callback=self.setCalibrationCurveWidth, ticks=1) 
    238         OWGUI.checkBox(self.settingsTab, self, 'ShowDiagonal', 'Show Diagonal Line', tooltip='', callback=self.setShowDiagonal) 
    239         OWGUI.checkBox(self.settingsTab, self, 'ShowRugs', 'Show Rugs', tooltip='', callback=self.setShowRugs) 
     237        OWGUI.hSlider(self.settingsTab, self, 'CalibrationCurveWidth', box='Calibration curve width', minValue=1, maxValue=9, step=1, callback=self.setCalibrationCurveWidth, ticks=1) 
     238        OWGUI.checkBox(self.settingsTab, self, 'ShowDiagonal', 'Show diagonal line', tooltip='', callback=self.setShowDiagonal) 
     239        OWGUI.checkBox(self.settingsTab, self, 'ShowRugs', 'Show rug', tooltip='', callback=self.setShowRugs) 
    240240        self.tabs.insertTab(self.settingsTab, "Settings") 
    241241 
  • orange/OrangeWidgets/Evaluate/OWLiftCurve.py

    r3192 r4016  
    225225 
    226226        ## target class 
    227         self.classCombo = OWGUI.comboBox(self.generalTab, self, 'targetClass', box='Target Class', items=[], callback=self.target) 
     227        self.classCombo = OWGUI.comboBox(self.generalTab, self, 'targetClass', box='Target class', items=[], callback=self.target) 
    228228        self.classCombo.setMaximumSize(150, 20) 
    229229 
     
    234234        self.classifiersQLB.setSelectionMode(QListBox.Multi) 
    235235        self.connect(self.classifiersQLB, SIGNAL("selectionChanged()"), self.classifiersSelectionChange) 
    236         self.unselectAllClassifiersQLB = QPushButton("(Un)select all", self.classifiersQVGB) 
     236        self.unselectAllClassifiersQLB = QPushButton("(Un)select All", self.classifiersQVGB) 
    237237        self.connect(self.unselectAllClassifiersQLB, SIGNAL("clicked()"), self.SUAclassifiersQLB) 
    238238 
    239239        # show Lift Curve convex hull 
    240         OWGUI.checkBox(self.generalTab, self, 'ShowConvexHull', 'Show Lift Convex Hull', tooltip='', callback=self.setShowConvexHull) 
     240        OWGUI.checkBox(self.generalTab, self, 'ShowConvexHull', 'Show lift convex hull', tooltip='', callback=self.setShowConvexHull) 
    241241        self.tabs.insertTab(self.generalTab, "General") 
    242242         
     
    245245        self.performanceTab = QVGroupBox(self) 
    246246        self.performanceTabCosts = QVGroupBox(self.performanceTab) 
    247         OWGUI.checkBox(self.performanceTabCosts, self, 'EnablePerformance', 'Show Cost Function', tooltip='', callback=self.setShowPerformanceAnalysis) 
     247        OWGUI.checkBox(self.performanceTabCosts, self, 'EnablePerformance', 'Show cost function', tooltip='', callback=self.setShowPerformanceAnalysis) 
    248248 
    249249        ## FP and FN cost ranges 
     
    254254        OWGUI.hSlider(self.performanceTabCosts, self, 'FPcost', box='FP Cost', minValue=mincost, maxValue=maxcost, step=stepcost, callback=self.costsChanged, ticks=50) 
    255255        OWGUI.hSlider(self.performanceTabCosts, self, 'FNcost', box='FN Cost', minValue=mincost, maxValue=maxcost, step=stepcost, callback=self.costsChanged, ticks=50) 
    256         OWGUI.hSlider(self.performanceTabCosts, self, 'pvalue', box='p(cl) [%]', minValue=self.minp, maxValue=self.maxp, step=stepp, callback=self.pvaluesUpdated, ticks=5, labelFormat="%2.1f") 
    257         OWGUI.button(self.performanceTabCosts, self, 'Default p(cl)', self.setDefaultPValues) ## reset p values to default 
     256 
     257        ptc = OWGUI.widgetBox(self.performanceTabCosts, "Prior target class probability [%]") 
     258        OWGUI.hSlider(ptc, self, 'pvalue', minValue=self.minp, maxValue=self.maxp, step=stepp, callback=self.pvaluesUpdated, ticks=5, labelFormat="%2.1f") 
     259        OWGUI.button(ptc, self, 'Compute from data', self.setDefaultPValues) ## reset p values to default 
    258260 
    259261        ## test set selection (testSetsQLB) 
     
    263265        self.testSetsQLB.setSelectionMode(QListBox.Multi) 
    264266        self.connect(self.testSetsQLB, SIGNAL("selectionChanged()"), self.testSetsSelectionChange) 
    265         self.unselectAllTestSetsQLB = QPushButton("(Un)select all", self.testSetsQVGB) 
     267        self.unselectAllTestSetsQLB = QPushButton("(Un)select All", self.testSetsQVGB) 
    266268        self.connect(self.unselectAllTestSetsQLB, SIGNAL("clicked()"), self.SUAtestSetsQLB) 
    267269        self.tabs.insertTab(self.performanceTab, "Analysis") 
     
    269271        # settings tab 
    270272        self.settingsTab = QVGroupBox(self) 
    271         OWGUI.hSlider(self.settingsTab, self, 'PointWidth', box='Point Width', minValue=3, maxValue=5, step=9, callback=self.setPointWidth, ticks=1) 
    272         OWGUI.hSlider(self.settingsTab, self, 'CurveWidth', box='Lift Curve Width', minValue=1, maxValue=5, step=1, callback=self.setCurveWidth, ticks=1) 
    273         OWGUI.hSlider(self.settingsTab, self, 'ConvexHullCurveWidth', box='Lift Curve Convex Hull', minValue=2, maxValue=9, step=1, callback=self.setConvexHullCurveWidth, ticks=1) 
    274         OWGUI.checkBox(self.settingsTab, self, 'ShowDiagonal', 'Show Diagonal', tooltip='', callback=self.setShowDiagonal) 
     273        OWGUI.hSlider(self.settingsTab, self, 'PointWidth', box='Point width', minValue=3, maxValue=5, step=9, callback=self.setPointWidth, ticks=1) 
     274        OWGUI.hSlider(self.settingsTab, self, 'CurveWidth', box='Lift curve width', minValue=1, maxValue=5, step=1, callback=self.setCurveWidth, ticks=1) 
     275        OWGUI.hSlider(self.settingsTab, self, 'ConvexHullCurveWidth', box='Lift curve convex hull', minValue=2, maxValue=9, step=1, callback=self.setConvexHullCurveWidth, ticks=1) 
     276        OWGUI.checkBox(self.settingsTab, self, 'ShowDiagonal', 'Show diagonal', tooltip='', callback=self.setShowDiagonal) 
    275277        self.tabs.insertTab(self.settingsTab, "Settings") 
    276278 
     
    321323                self.FPcostList.append( 500) 
    322324                self.FNcostList.append( 500) 
    323                 graph = singleClassLiftCurveGraph(self.mainArea, "", "Predicted Class: " + self.dres.classValues[i]) 
     325                graph = singleClassLiftCurveGraph(self.mainArea, "", "Predicted class: " + self.dres.classValues[i]) 
    324326                self.graphs.append( graph ) 
    325327                self.classCombo.insertItem(self.dres.classValues[i]) 
  • orange/OrangeWidgets/Evaluate/OWPredictions.py

    r3630 r4016  
    286286            vartypes = {1:"discrete", 2:"continuous"} 
    287287            if len(self.classifiers) and data.domain.classVar and data.domain.classVar <> self.outvar: 
    288                 self.warning(id, "Data set %s ignored, inconsistent outcome variables\n%s/%s <> %s/%s (type or variable mismatch)" % (data.name, data.domain.classVar.name, vartypes.get(data.domain.classVar.varType, "?"), self.outvar.name, vartypes.get(self.outvar.varType, "?"))) 
     288                self.warning(id, "Data set %s is ignored due to inconsistent outcome variables\n%s/%s <> %s/%s (type or variable mismatch)" % (data.name, data.domain.classVar.name, vartypes.get(data.domain.classVar.varType, "?"), self.outvar.name, vartypes.get(self.outvar.varType, "?"))) 
    289289                return 
    290290            self.data = data 
     
    306306            if len(self.classifiers) and c.classVar <> self.outvar: 
    307307                vartypes = {1:"discrete", 2:"continuous"} 
    308                 self.warning(id, "Predictor %s ignored, inconsistent outcome variables\n%s/%s <> %s/%s (type or variable mismatch)" % (c.name, c.classVar.name, vartypes.get(c.classVar.varType, "?"), self.outvar.name, vartypes.get(self.outvar.varType, "?"))) 
     308                self.warning(id, "Predictor %s is ignored due to inconsistent outcome variables\n%s/%s <> %s/%s (type or variable mismatch)" % (c.name, c.classVar.name, vartypes.get(c.classVar.varType, "?"), self.outvar.name, vartypes.get(self.outvar.varType, "?"))) 
    309309                return 
    310310            else: 
  • orange/OrangeWidgets/Evaluate/OWROC.py

    r3192 r4016  
    679679 
    680680        ## target class 
    681         self.classCombo = OWGUI.comboBox(self.generalTab, self, 'targetClass', box='Target Class', items=[], callback=self.target) 
     681        self.classCombo = OWGUI.comboBox(self.generalTab, self, 'targetClass', box='Target class', items=[], callback=self.target) 
    682682        self.classCombo.setMaximumSize(150, 20) 
    683683 
     
    688688        self.classifiersQLB.setSelectionMode(QListBox.Multi) 
    689689        self.connect(self.classifiersQLB, SIGNAL("selectionChanged()"), self.classifiersSelectionChange) 
    690         self.unselectAllClassifiersQLB = QPushButton("(Un)select all", self.classifiersQVGB) 
     690        self.unselectAllClassifiersQLB = QPushButton("(Un)select All", self.classifiersQVGB) 
    691691        self.connect(self.unselectAllClassifiersQLB, SIGNAL("clicked()"), self.SUAclassifiersQLB) 
    692692 
    693693        # show convex ROC curves and show ROC convex hull 
    694         self.convexCurvesQCB = OWGUI.checkBox(self.generalTab, self, 'ShowConvexCurves', 'Show Convex ROC Curves', tooltip='', callback=self.setShowConvexCurves) 
    695         OWGUI.checkBox(self.generalTab, self, 'ShowConvexHull', 'Show ROC Convex Hull', tooltip='', callback=self.setShowConvexHull) 
     694        self.convexCurvesQCB = OWGUI.checkBox(self.generalTab, self, 'ShowConvexCurves', 'Show convex ROC curves', tooltip='', callback=self.setShowConvexCurves) 
     695        OWGUI.checkBox(self.generalTab, self, 'ShowConvexHull', 'Show ROC convex hull', tooltip='', callback=self.setShowConvexHull) 
    696696        self.tabs.insertTab(self.generalTab, "General") 
    697697         
     
    700700        self.performanceTab = QVGroupBox(self) 
    701701        self.performanceTabCosts = QVGroupBox(self.performanceTab) 
    702         OWGUI.checkBox(self.performanceTabCosts, self, 'EnablePerformance', 'Show Performance Line', tooltip='', callback=self.setShowPerformanceAnalysis) 
    703         OWGUI.checkBox(self.performanceTabCosts, self, 'DefaultThresholdPoint', 'Default Threshold (0.5) Point', tooltip='', callback=self.setShowDefaultThresholdPoint) 
     702        OWGUI.checkBox(self.performanceTabCosts, self, 'EnablePerformance', 'Show performance line', tooltip='', callback=self.setShowPerformanceAnalysis) 
     703        OWGUI.checkBox(self.performanceTabCosts, self, 'DefaultThresholdPoint', 'Default threshold (0.5) point', tooltip='', callback=self.setShowDefaultThresholdPoint) 
    704704 
    705705        ## FP and FN cost ranges 
     
    721721        self.testSetsQLB.setSelectionMode(QListBox.Multi) 
    722722        self.connect(self.testSetsQLB, SIGNAL("selectionChanged()"), self.testSetsSelectionChange) 
    723         self.unselectAllTestSetsQLB = QPushButton("(Un)select all", self.testSetsQVGB) 
     723        self.unselectAllTestSetsQLB = QPushButton("(Un)select All", self.testSetsQVGB) 
    724724        self.connect(self.unselectAllTestSetsQLB, SIGNAL("clicked()"), self.SUAtestSetsQLB) 
    725725        self.tabs.insertTab(self.performanceTab, "Analysis") 
     
    728728        self.settingsTab = QVGroupBox(self) 
    729729        OWGUI.radioButtonsInBox(self.settingsTab, self, 'AveragingMethodIndex', ['Merge (expected ROC perf.)', 'Vertical', 'Threshold', 'None'], box='Averaging ROC curves', callback=self.selectAveragingMethod) 
    730         OWGUI.hSlider(self.settingsTab, self, 'PointWidth', box='Point Width', minValue=3, maxValue=9, step=1, callback=self.setPointWidth, ticks=1) 
    731         OWGUI.hSlider(self.settingsTab, self, 'CurveWidth', box='ROC Curve Width', minValue=1, maxValue=5, step=1, callback=self.setCurveWidth, ticks=1) 
    732         OWGUI.hSlider(self.settingsTab, self, 'ConvexCurveWidth', box='ROC Convex Curve Width', minValue=1, maxValue=5, step=1, callback=self.setConvexCurveWidth, ticks=1) 
    733         OWGUI.hSlider(self.settingsTab, self, 'ConvexHullCurveWidth', box='ROC Convex Hull', minValue=2, maxValue=9, step=1, callback=self.setConvexHullCurveWidth, ticks=1) 
    734         OWGUI.checkBox(self.settingsTab, self, 'ShowDiagonal', 'Show Diagonal ROC Line', tooltip='', callback=self.setShowDiagonal) 
     730        OWGUI.hSlider(self.settingsTab, self, 'PointWidth', box='Point width', minValue=3, maxValue=9, step=1, callback=self.setPointWidth, ticks=1) 
     731        OWGUI.hSlider(self.settingsTab, self, 'CurveWidth', box='ROC curve width', minValue=1, maxValue=5, step=1, callback=self.setCurveWidth, ticks=1) 
     732        OWGUI.hSlider(self.settingsTab, self, 'ConvexCurveWidth', box='ROC convex curve width', minValue=1, maxValue=5, step=1, callback=self.setConvexCurveWidth, ticks=1) 
     733        OWGUI.hSlider(self.settingsTab, self, 'ConvexHullCurveWidth', box='ROC convex hull', minValue=2, maxValue=9, step=1, callback=self.setConvexHullCurveWidth, ticks=1) 
     734        OWGUI.checkBox(self.settingsTab, self, 'ShowDiagonal', 'Show diagonal ROC line', tooltip='', callback=self.setShowDiagonal) 
    735735        self.tabs.insertTab(self.settingsTab, "Settings") 
    736736       
     
    964964                self.FPcostList.append( 500) 
    965965                self.FNcostList.append( 500) 
    966                 graph = singleClassROCgraph(self.mainArea, "", "Predicted Class: " + self.dres.classValues[i]) 
     966                graph = singleClassROCgraph(self.mainArea, "", "Predicted class: " + self.dres.classValues[i]) 
    967967                self.graphs.append( graph ) 
    968968                self.classCombo.insertItem(self.dres.classValues[i]) 
  • orange/OrangeWidgets/Evaluate/OWTestLearners.py

    r3482 r4016  
    2525             ('Sensitivity', 'Sens', 'sens(cm)'), 
    2626             ('Specificity', 'Spec', 'spec(cm)'), 
    27              ('Area under ROC', 'AUC', 'AUC(res)'), 
     27             ('Area under ROC curve', 'AUC', 'AUC(res)'), 
    2828             ('Information score', 'IS', 'IS(res)'), 
    2929             ('Brier score', 'Brier', 'BrierScore(res)') 
     
    9797        self.layout=QVBoxLayout(self.mainArea) 
    9898        self.g = QVGroupBox(self.mainArea) 
    99         self.g.setTitle('Evaluation Results') 
     99        self.g.setTitle('Evaluation results') 
    100100 
    101101        self.tab=QTable(self.g) 
     
    170170#                        type, val, traceback = sys.exc_info() 
    171171#                        sys.excepthook(type, val, traceback)  # print the exception 
    172                         self.error("Caught an exception while evaluating classifier %s " % learner.name) 
     172                        self.error("An error occurred while evaluating classifier %s " % learner.name) 
    173173            else: 
    174174                # this is an old but updated learner 
     
    185185#                        type, val, traceback = sys.exc_info() 
    186186#                        sys.excepthook(type, val, traceback)  # print the exception 
    187                         self.error("Caught an exception while evaluating classifier %s" % learner.name) 
     187                        self.error("An error occurred while evaluating classifier %s" % learner.name) 
    188188 
    189189        else: # test on all learners, or on the new learner with no other learners in the memory 
  • orange/OrangeWidgets/OWClusterOptimization.py

    r3567 r4016  
    134134        # MAIN TAB 
    135135        self.optimizationBox = OWGUI.widgetBox(self.MainTab, "Evaluate") 
    136         self.resultsBox = OWGUI.widgetBox(self.MainTab, "Projection List, Most Interesting First") 
    137         self.resultsDetailsBox = OWGUI.widgetBox(self.MainTab, "Shown Details in Projections List" , orientation = "horizontal") 
     136        self.resultsBox = OWGUI.widgetBox(self.MainTab, "Projection list, most interesting first") 
     137        self.resultsDetailsBox = OWGUI.widgetBox(self.MainTab, "Shown details in projections list" , orientation = "horizontal") 
    138138        self.buttonBox = OWGUI.widgetBox(self.optimizationBox, orientation = "horizontal") 
    139139        self.label1 = QLabel('Projections with ', self.buttonBox) 
     
    142142        self.attributeLabel = QLabel(' attributes', self.buttonBox) 
    143143 
    144         self.startOptimizationButton = OWGUI.button(self.optimizationBox, self, "Start evaluating projections") 
     144        self.startOptimizationButton = OWGUI.button(self.optimizationBox, self, "Start Evaluating Projections") 
    145145        f = self.startOptimizationButton.font() 
    146146        f.setBold(1) 
    147147        self.startOptimizationButton.setFont(f) 
    148         self.stopOptimizationButton = OWGUI.button(self.optimizationBox, self, "Stop evaluation", callback = self.stopOptimizationClick) 
     148        self.stopOptimizationButton = OWGUI.button(self.optimizationBox, self, "Stop Evaluation", callback = self.stopOptimizationClick) 
    149149        self.stopOptimizationButton.setFont(f) 
    150150        self.stopOptimizationButton.hide() 
     
    155155 
    156156        self.showRankCheck = OWGUI.checkBox(self.resultsDetailsBox, self, 'showRank', 'Rank', callback = self.updateShownProjections, tooltip = "Show projection ranks") 
    157         self.showValueCheck = OWGUI.checkBox(self.resultsDetailsBox, self, 'showValue', 'Cluster Value', callback = self.updateShownProjections, tooltip = "Show the cluster value") 
     157        self.showValueCheck = OWGUI.checkBox(self.resultsDetailsBox, self, 'showValue', 'Cluster value', callback = self.updateShownProjections, tooltip = "Show the cluster value") 
    158158 
    159159 
     
    171171        self.considerDistanceCheck = OWGUI.checkBox(valueBox, self, "considerDistance", "Consider distance between clusters", tooltip = "If checked, cluster value is defined also by the distance between the cluster points and nearest points that belong to a different class") 
    172172 
    173         self.heuristicsSettingsBox = OWGUI.widgetBox(self.SettingsTab, "Heuristics for Attribute Ordering") 
    174         self.miscSettingsBox = OWGUI.widgetBox(self.SettingsTab, "Miscellaneous Settings") 
    175  
    176         OWGUI.comboBox(self.heuristicsSettingsBox, self, "attrCont", box = "Ordering of Continuous Attributes", items = [val for (val, m) in contMeasures]) 
    177         OWGUI.comboBox(self.heuristicsSettingsBox, self, "attrDisc", box = "Ordering of Discrete Attributes", items = [val for (val, m) in discMeasures]) 
     173        self.heuristicsSettingsBox = OWGUI.widgetBox(self.SettingsTab, "Heuristics for attribute ordering") 
     174        self.miscSettingsBox = OWGUI.widgetBox(self.SettingsTab, "Miscellaneous settings") 
     175 
     176        OWGUI.comboBox(self.heuristicsSettingsBox, self, "attrCont", box = "Ordering of continuous attributes", items = [val for (val, m) in contMeasures]) 
     177        OWGUI.comboBox(self.heuristicsSettingsBox, self, "attrDisc", box = "Ordering of discrete attributes", items = [val for (val, m) in discMeasures]) 
    178178         
    179179        self.resultListCombo = OWGUI.comboBoxWithCaption(self.miscSettingsBox, self, "resultListLen", "Maximum length of projection list:   ", tooltip = "Maximum length of the list of interesting projections. This is also the number of projections that will be saved if you click Save button.", items = self.resultsListLenNums, callback = self.updateShownProjections, sendSelectedValue = 1, valueType = int) 
     
    183183        # ARGUMENTATION tab         
    184184        self.argumentationStartBox = OWGUI.widgetBox(self.ArgumentationTab, "Arguments") 
    185         self.findArgumentsButton = OWGUI.button(self.argumentationStartBox, self, "Find arguments", callback = self.findArguments) 
     185        self.findArgumentsButton = OWGUI.button(self.argumentationStartBox, self, "Find Arguments", callback = self.findArguments) 
    186186        f = self.findArgumentsButton.font(); f.setBold(1);  self.findArgumentsButton.setFont(f) 
    187         self.stopArgumentationButton = OWGUI.button(self.argumentationStartBox, self, "Stop searching", callback = self.stopArgumentationClick) 
     187        self.stopArgumentationButton = OWGUI.button(self.argumentationStartBox, self, "Stop Searching", callback = self.stopArgumentationClick) 
    188188        self.stopArgumentationButton.setFont(f) 
    189189        self.stopArgumentationButton.hide() 
     
    230230        self.clusterStabilityButton.setToggleButton(1) 
    231231        #self.saveProjectionButton = OWGUI.button(self.buttonBox3, self, 'Save projection') 
    232         OWGUI.button(self.buttonBox3, self, "Save best graphs", self.exportMultipleGraphs) 
    233  
    234         OWGUI.button(self.manageBox, self, "Clear results", self.clearResults) 
     232        OWGUI.button(self.buttonBox3, self, "Save Best Graphs", self.exportMultipleGraphs) 
     233 
     234        OWGUI.button(self.manageBox, self, "Clear Results", self.clearResults) 
    235235 
    236236        self.attrLenList = QListBox(self.manageResultsBox) 
     
    706706 
    707707    def saveToFileAccept(self): 
    708         fileName = str(QFileDialog.getSaveFileName("Graph","Portable Network Graphics (*.PNG);;Windows Bitmap (*.BMP);;Graphics Interchange Format (*.GIF)", None, "Save to..", "Save to..")) 
     708        fileName = str(QFileDialog.getSaveFileName("Graph","Portable Network Graphics (*.PNG);;Windows Bitmap (*.BMP);;Graphics Interchange Format (*.GIF)", None, "Save to...", "Save to...")) 
    709709        if fileName == "": return 
    710710        (fil,ext) = os.path.splitext(fileName) 
     
    10331033 
    10341034            classValue = self.clusterOptimizationDlg.rawdata.domain.classVar[ind] 
    1035             s = '<nobr>Based on current classification settings, the example would be classified </nobr><br><nobr>to class <b>%s</b> with probability <b>%.2f%%</b>.</nobr><br><nobr>Predicted class distribution is:</nobr><br>' % (classValue, dist[classValue]*100) 
     1035            s = '<nobr>Based on current classification settings, the example would be classified </nobr><br><nobr>to class <b>%(cls)s</b> with probability <b>%(prob).2f%%</b>.</nobr><br><nobr>Predicted class distribution is:</nobr><br>' % {"cls": classValue, "prob": dist[classValue]*100} 
    10361036            for key in dist.keys(): 
    10371037                s += "<nobr>&nbsp &nbsp &nbsp &nbsp %s : %.2f%%</nobr><br>" % (key, dist[key]*100) 
    10381038            if argumentCount > allowedArguments: 
    1039                 s += "<nobr>Note: To get the current prediction, <b>%d</b> arguments had to be used (instead of %d)<br>" % (argumentCount, allowedArguments) 
     1039                s += "<nobr>Note: To get the current prediction, <b>%(fa)d</b> arguments had to be used (instead of %(ac)d)<br>" % {"fa": argumentCount, "ac": allowedArguments} 
    10401040            print s[:-4] 
    10411041             
     
    10811081 
    10821082                        classValue = self.clusterOptimizationDlg.rawdata.domain.classVar[ind] 
    1083                         s = '<nobr>Based on current classification settings, the example would be classified </nobr><br><nobr>to class <b>%s</b> with probability <b>%.2f%%</b>.</nobr><br><nobr>Predicted class distribution is:</nobr><br>' % (classValue, dist[classValue]*100) 
     1083                        s = '<nobr>Based on current classification settings, the example would be classified </nobr><br><nobr>to class <b>%(cls)s</b> with probability <b>%(prob).2f%%</b>.</nobr><br><nobr>Predicted class distribution is:</nobr><br>' % {"cls": classValue, "prob": dist[classValue]*100} 
    10841084                        for key in dist.keys(): 
    10851085                            s += "<nobr>&nbsp &nbsp &nbsp &nbsp %s : %.2f%%</nobr><br>" % (key, dist[key]*100) 
    10861086                        if consideredArguments > neededArguments: 
    1087                             s += "<nobr>Note: To get the current prediction, <b>%d</b> arguments had to be used (instead of %d)<br>" % (consideredArguments, neededArguments) 
     1087                            s += "<nobr>Note: To get the current prediction, <b>%(fa)d</b> arguments had to be used (instead of %(ac)d)<br>" % {"fa": consideredArguments, "ac": neededArguments} 
    10881088                        print s[:-4] 
    10891089                         
     
    11071107 
    11081108            classValue = self.clusterOptimizationDlg.rawdata.domain.classVar[ind] 
    1109             s = '<nobr>Based on current classification settings, the example would be classified </nobr><br><nobr>to class <b>%s</b> with probability <b>%.2f%%</b>.</nobr><br><nobr>Predicted class distribution is:</nobr><br>' % (classValue, dist[classValue]*100) 
     1109            s = '<nobr>Based on current classification settings, the example would be classified </nobr><br><nobr>to class <b>%(cls)s</b> with probability <b>%(prob).2f%%</b>.</nobr><br><nobr>Predicted class distribution is:</nobr><br>' % {"cls": classValue, "prob": dist[classValue]*100} 
    11101110            for key in dist.keys(): 
    11111111                s += "<nobr>&nbsp &nbsp &nbsp &nbsp %s : %.2f%%</nobr><br>" % (key, dist[key]*100) 
  • orange/OrangeWidgets/OWDlgs.py

    r3700 r4016  
    4545        self.printButton =          OWGUI.button(self.space, self, "Print", callback = self.printPic) 
    4646        self.saveImageButton =      OWGUI.button(self.space, self, "Save Image", callback = self.saveImage) 
    47         self.saveMatplotlibButton = OWGUI.button(self.space, self, "Save Graph As matplotlib Script", callback = self.saveToMatplotlib) 
     47        self.saveMatplotlibButton = OWGUI.button(self.space, self, "Save Graph as matplotlib Script", callback = self.saveToMatplotlib) 
    4848        for (text, funct) in extraButtons: 
    4949            butt = OWGUI.button(self.space, self, text, callback = funct) 
     
    223223 
    224224    def getFileName(self, defaultName, mask, extension): 
    225         fileName = str(QFileDialog.getSaveFileName(self.lastSaveDirName + defaultName, mask, None, "Save to..", "Save to..")) 
     225        fileName = str(QFileDialog.getSaveFileName(self.lastSaveDirName + defaultName, mask, None, "Save to...", "Save to...")) 
    226226        if not fileName: return None 
    227227        if not os.path.splitext(fileName)[1][1:]: fileName = fileName + extension 
  • orange/OrangeWidgets/OWFreeVizOptimization.py

    r3788 r4016  
    5858        # ########################### 
    5959        # MAIN TAB 
    60         OWGUI.comboBox(self.MainTab, self, "implementation", box = "FreeViz Implementation", items = ["Fast (C) implementation", "Slow (Python) implementation", "LDA"]) 
    61  
    62         box = OWGUI.widgetBox(self.MainTab, "Gradient Optimization") 
     60        OWGUI.comboBox(self.MainTab, self, "implementation", box = "FreeViz implementation", items = ["Fast (C) implementation", "Slow (Python) implementation", "LDA"]) 
     61 
     62        box = OWGUI.widgetBox(self.MainTab, "Optimization") 
    6363 
    6464        self.optimizeButton = OWGUI.button(box, self, "Optimize Separation", callback = self.optimizeSeparation) 
    65         self.stopButton = OWGUI.button(box, self, "Stop optimization", callback = self.stopOptimization) 
     65        self.stopButton = OWGUI.button(box, self, "Stop Optimization", callback = self.stopOptimization) 
    6666        self.singleStepButton = OWGUI.button(box, self, "Single Step", callback = self.singleStepOptimization) 
    6767        f = self.optimizeButton.font(); f.setBold(1) 
     
    7171        OWGUI.checkBox(box, self, "mirrorSymmetry", "Keep mirror symmetry", tooltip = "'Rotational' keeps the second anchor upside") 
    7272 
    73         vbox = OWGUI.widgetBox(self.MainTab, "Set Anchor Positions") 
     73        vbox = OWGUI.widgetBox(self.MainTab, "Set anchor positions") 
    7474        hbox1 = OWGUI.widgetBox(vbox, orientation = "horizontal") 
    75         OWGUI.button(hbox1, self, "Normal", callback = self.radialAnchors) 
     75        OWGUI.button(hbox1, self, "Circle", callback = self.radialAnchors) 
    7676        OWGUI.button(hbox1, self, "Random", callback = self.randomAnchors) 
    7777        self.manualPositioningButton = OWGUI.button(hbox1, self, "Manual", callback = self.setManualPosition) 
    7878        self.manualPositioningButton.setToggleButton(1) 
    79         OWGUI.comboBox(vbox, self, "restrain", label="Restrain anchors:", orientation = "horizontal", items = ["Unrestrained", "Fixed length", "Fixed angle"], callback = self.setRestraints) 
     79        OWGUI.comboBox(vbox, self, "restrain", label="Restrain anchors:", orientation = "horizontal", items = ["Unrestrained", "Fixed Length", "Fixed Angle"], callback = self.setRestraints) 
    8080 
    8181        box2 = OWGUI.widgetBox(self.MainTab, "Forces", orientation = "vertical") 
     
    9393 
    9494        self.cbforcerel = OWGUI.comboBox(box2, self, "forceRelation", label= "Attractive : Repulsive  ",orientation = "horizontal", items=self.forceRelValues, callback = self.updateForces) 
    95         self.cbforcebal = OWGUI.checkBox(box2, self, "forceBalancing", "Dynamic force balancing", tooltip="If set, the forces are normalized so that the total sums of the\nrepulsive and attractive are in the above proportion.") 
     95        self.cbforcebal = OWGUI.checkBox(box2, self, "forceBalancing", "Dynamic force balancing", tooltip="Normalize the forces so that the total sums of the\nrepulsive and attractive are in the above proportion.") 
    9696 
    9797        OWGUI.separator(box2, 20) 
     
    100100        self.cbDisableRepulsive = OWGUI.checkBox(box2, self, "disableRepulsive", "Disable repulsive forces", callback = self.setDisableRepulsive) 
    101101 
    102         box = OWGUI.widgetBox(self.MainTab, "Show Anchors") 
     102        box = OWGUI.widgetBox(self.MainTab, "Show anchors") 
    103103        OWGUI.checkBox(box, self, 'graph.showAnchors', 'Show attribute anchors', callback = self.parentWidget.updateGraph) 
    104104        OWGUI.qwtHSlider(box, self, "graph.hideRadius", label="Hide radius", minValue=0, maxValue=9, step=1, ticks=0, callback = self.parentWidget.updateGraph) 
  • orange/OrangeWidgets/OWGraph.py

    r3789 r4016  
    495495        xs = self.axisScale(QwtPlot.xBottom) 
    496496        x = self.invTransform(QwtPlot.xBottom, e.x()) 
    497         print "omp", xs.lBound(), xs.hBound(), x 
    498497 
    499498        # #### 
  • orange/OrangeWidgets/OWMosaicOptimization.py

    r3725 r4016  
    8787        self.optimizationBox = OWGUI.widgetBox(self.MainTab, "Evaluate") 
    8888        self.buttonBox = OWGUI.widgetBox(self.optimizationBox, orientation = "horizontal") 
    89         self.resultsBox = OWGUI.widgetBox(self.MainTab, "Projection List, Most Interesting Projections First") 
    90         self.optimizeOrderBox = OWGUI.widgetBox(self.MainTab, "Attribute and Value Order") 
     89        self.resultsBox = OWGUI.widgetBox(self.MainTab, "Projection list, most interesting projections first") 
     90        self.optimizeOrderBox = OWGUI.widgetBox(self.MainTab, "Attribute and value order") 
    9191        self.optimizeOrderSubBox = OWGUI.widgetBox(self.optimizeOrderBox, orientation = "horizontal") 
    9292        self.buttonsBox = OWGUI.widgetBox(self.MainTab, box = 1) 
     
    9999        self.startOptimizationButton = OWGUI.button(self.optimizationBox, self, "Start Evaluating Projections", callback = self.evaluateProjections) 
    100100        f = self.startOptimizationButton.font(); f.setBold(1);   self.startOptimizationButton.setFont(f) 
    101         self.stopOptimizationButton = OWGUI.button(self.optimizationBox, self, "Stop evaluation", callback = self.stopEvaluationClick) 
     101        self.stopOptimizationButton = OWGUI.button(self.optimizationBox, self, "Stop Evaluation", callback = self.stopEvaluationClick) 
    102102        self.stopOptimizationButton.setFont(f) 
    103103        self.stopOptimizationButton.hide() 
     
    115115        # ########################## 
    116116        # SETTINGS TAB 
    117         self.measureCombo = OWGUI.comboBox(self.SettingsTab, self, "qualityMeasure", box = "Measure of Projection Interestingness", items = [item[0] for item in mosaicMeasures], tooltip = "What is interesting?", callback = self.updateGUI) 
    118  
    119         self.ignoreSmallCellsBox = OWGUI.widgetBox(self.SettingsTab, "Ignore Small Cells" ) 
     117        self.measureCombo = OWGUI.comboBox(self.SettingsTab, self, "qualityMeasure", box = "Measure of projection interestingness", items = [item[0] for item in mosaicMeasures], tooltip = "What is interesting?", callback = self.updateGUI) 
     118 
     119        self.ignoreSmallCellsBox = OWGUI.widgetBox(self.SettingsTab, "Ignore small cells" ) 
    120120        self.ignoreSmallCellsCombo = OWGUI.checkBox(self.ignoreSmallCellsBox, self, "ignoreTooSmallCells", "Ignore cells where expected number of cases is less than 5", tooltip = "Statisticians advise that in cases when the number of expected examples is less than 5 we ignore the cell \nsince it can significantly influence the chi-square value.") 
    121121 
    122         self.testingBox = OWGUI.widgetBox(self.SettingsTab, "Testing Method") 
     122        self.testingBox = OWGUI.widgetBox(self.SettingsTab, "Testing method") 
    123123        self.testingCombo = OWGUI.comboBox(self.testingBox, self, "testingMethod", items = ["10 fold cross validation", "70/30 separation 10 times "], tooltip = "Method for evaluating the class separation in the projection.") 
    124124        self.percentDataUsedCombo= OWGUI.comboBoxWithCaption(self.testingBox, self, "percentDataUsed", "Percent of data used: ", items = [5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100], sendSelectedValue = 1, valueType = int, tooltip = "In case that we have a large dataset the evaluation of each projection can take a lot of time.\nWe can therefore use only a subset of randomly selected examples, evaluate projection on them and thus make evaluation faster.") 
    125125 
    126         OWGUI.comboBox(self.SettingsTab, self, "attrDisc", box = "Measure for Ranking Attributes", items = [val for (val, m) in discMeasures], callback = self.removeEvaluatedAttributes) 
    127  
    128         self.testingCombo2 = OWGUI.comboBox(self.SettingsTab, self, "attributeOrderTestingMethod", box = "Testing Method Used for Optimizing Attribute Orders", items = ["10 fold cross validation", "Learn and test on learn data"], tooltip = "Method used when evaluating different attribute orders.") 
     126        OWGUI.comboBox(self.SettingsTab, self, "attrDisc", box = "Measure for ranking attributes", items = [val for (val, m) in discMeasures], callback = self.removeEvaluatedAttributes) 
     127 
     128        self.testingCombo2 = OWGUI.comboBox(self.SettingsTab, self, "attributeOrderTestingMethod", box = "Testing method used for optimizing attribute orders", items = ["10 fold cross validation", "Learn and test on learn data"], tooltip = "Method used when evaluating different attribute orders.") 
    129129 
    130130        # ########################## 
     
    137137        self.stopArgumentationButton.hide() 
    138138 
    139         self.argumentsClassBox = OWGUI.widgetBox(self.ArgumentationTab, "Show Arguments For Class:", orientation = "horizontal") 
     139        self.argumentsClassBox = OWGUI.widgetBox(self.ArgumentationTab, "Show arguments for class:", orientation = "horizontal") 
    140140        self.classValueList = OWGUI.comboBox(self.argumentsClassBox, self, "argumentationClassValue", tooltip = "Select the class value that you wish to see arguments for", callback = self.updateShownArguments) 
    141141        self.logitLabel = OWGUI.widgetLabel(self.argumentsClassBox, " ", labelWidth = 100) 
    142142 
    143         self.argumentBox = OWGUI.widgetBox(self.ArgumentationTab, "Arguments/Odds Ratios For The Selected Class Value") 
     143        self.argumentBox = OWGUI.widgetBox(self.ArgumentationTab, "Arguments/Odds ratios for the selected class value") 
    144144        self.argumentList = QListBox(self.argumentBox) 
    145145        self.argumentList.setMinimumSize(200,200) 
    146146        self.connect(self.argumentList, SIGNAL("selectionChanged()"),self.argumentSelected) 
    147         self.resultsDetailsBox = OWGUI.widgetBox(self.ArgumentationTab, "Shown Details in Arguments List" , orientation = "horizontal") 
    148         self.showConfidenceCheck = OWGUI.checkBox(self.resultsDetailsBox, self, 'showConfidence', '95% Confidence Interval', callback = self.updateShownArguments, tooltip = "Show confidence interval of the argument.") 
     147        self.resultsDetailsBox = OWGUI.widgetBox(self.ArgumentationTab, "Shown details in arguments list" , orientation = "horizontal") 
     148        self.showConfidenceCheck = OWGUI.checkBox(self.resultsDetailsBox, self, 'showConfidence', '95% confidence interval', callback = self.updateShownArguments, tooltip = "Show confidence interval of the argument.") 
    149149 
    150150        # ########################## 
     
    153153 
    154154        #self.argumentValueFormulaIndex = OWGUI.comboBox(self.ClassificationTab, self, "argumentValueFormula", box="Argument Value is Computed As ...", items=["1.0 x Projection Value", "0.5 x Projection Value + 0.5 x Predicted Example Probability", "1.0 x Predicted Example Probability"], tooltip=None) 
    155         probBox = OWGUI.widgetBox(self.ClassificationTab, box = "Probability Estimation") 
     155        probBox = OWGUI.widgetBox(self.ClassificationTab, box = "Probability estimation") 
    156156        self.probCombo = OWGUI.comboBox(probBox, self, "probabilityEstimation", items = ["Relative Frequency", "Laplace", "m-Estimate"], callback = self.updateMestimateComboState) 
    157157 
     
    160160        self.mEditBox = OWGUI.lineEdit(probBox, self, 'mValue', label='              Parameter for m-estimate:   ', orientation='horizontal', valueType = float, validator = mValid) 
    161161 
    162         b = OWGUI.widgetBox(self.ClassificationTab, "Evaluating Time") 
     162        b = OWGUI.widgetBox(self.ClassificationTab, "Evaluation time") 
    163163        OWGUI.checkWithSpin(b, self, "Use time limit:    ", 1, 1000, "useTimeLimit", "timeLimit", "(minutes)", debuggingEnabled = 0)      # disable debugging. we always set this to 1 minute 
    164         classBox = OWGUI.widgetBox(self.ClassificationTab, "For Classification Use...") 
     164        classBox = OWGUI.widgetBox(self.ClassificationTab, "Class prediction settings") 
    165165        classMethodsCombo = OWGUI.comboBox(classBox, self, "classificationMethod", items = ["Top-ranked projections", "Semi-naive Bayes", "Naive Bayes with combining attribute values"], callback = self.updateClassMethodsCombo) 
    166166 
     
    182182        # ########################## 
    183183        # TREE TAB 
    184         subsetBox = OWGUI.widgetBox(self.TreeTab, "Example Subset Analysis") 
     184        subsetBox = OWGUI.widgetBox(self.TreeTab, "Example subset analysis") 
    185185        self.splitter = QSplitter(Qt.Vertical, subsetBox, "main") 
    186186        self.subsetTree = QListView(self.splitter) 
     
    211211 
    212212        self.mosaic = orngMosaic() 
    213         autoBuildTreeBox = OWGUI.widgetBox(self.TreeTab, "Mosaic Tree", orientation = "vertical") 
     213        autoBuildTreeBox = OWGUI.widgetBox(self.TreeTab, "Mosaic tree", orientation = "vertical") 
    214214        autoBuildTreeButtonBox = OWGUI.widgetBox(autoBuildTreeBox, orientation = "horizontal") 
    215215        self.autoBuildTreeButton = OWGUI.button(autoBuildTreeButtonBox, self, "Build Tree", callback = self.mtMosaicAutoBuildTree, tooltip = "Evaluate different mosaic diagrams and automatically build a tree of mosaic diagrams with clear class separation", debuggingEnabled = 0) 
     
    217217        OWGUI.lineEdit(autoBuildTreeBox, self, "mosaicSize", "Size of individual mosaic diagrams: ", orientation = "horizontal", tooltip = "What are the X and Y dimensions of individual mosaics in the tree?", valueType = int, validator = QIntValidator(self)) 
    218218 
    219         loadSaveBox = OWGUI.widgetBox(self.TreeTab, "Load/Save Mosaic Tree", orientation = "horizontal") 
     219        loadSaveBox = OWGUI.widgetBox(self.TreeTab, "Load/Save mosaic tree", orientation = "horizontal") 
    220220        OWGUI.button(loadSaveBox, self, "Load", callback = self.mtLoadTree, tooltip = "Load a tree from a file", debuggingEnabled = 0) 
    221221        OWGUI.button(loadSaveBox, self, "Save", callback = self.mtSaveTree, tooltip = "Save tree to a file", debuggingEnabled = 0) 
     
    232232        # ########################## 
    233233        # SAVE TAB 
    234         self.visualizedAttributesBox = OWGUI.widgetBox(self.ManageTab, "Number of Concurrently Visualized Attributes") 
     234        self.visualizedAttributesBox = OWGUI.widgetBox(self.ManageTab, "Number of concurrently visualized attributes") 
    235235        self.dialogsBox = OWGUI.widgetBox(self.ManageTab, "Dialogs") 
    236         self.manageResultsBox = OWGUI.widgetBox(self.ManageTab, "Manage Projections") 
     236        self.manageResultsBox = OWGUI.widgetBox(self.ManageTab, "Manage projections") 
    237237 
    238238        self.attrLenList = QListBox(self.visualizedAttributesBox) 
     
    439439 
    440440        if showClassification: 
    441             s = '<nobr>Based on the projections, the example would be classified </nobr><br><nobr>to class <b>%s</b> with probability <b>%.2f%%</b>.</nobr><br><nobr>Predicted class distribution is:</nobr><br>' % (str(classValue), max(dist)*100. / float(sum(dist))) 
     441            s = '<nobr>Based on current classification settings, the example would be classified </nobr><br><nobr>to class <b>%(cls)s</b> with probability <b>%(prob).2f%%</b>.</nobr><br><nobr>Predicted class distribution is:</nobr><br>' % {"cls": str(classValue), "prob": max(dist)*100. / float(sum(dist))} 
    442442            for key in values: 
    443443                s += "<nobr>&nbsp &nbsp &nbsp &nbsp %s : %.2f%%</nobr><br>" % (key, dist[key]*100) 
     
    818818                selectedItem = self.subsetTree.selectedItem() 
    819819                if selectedItem and selectedItem.parent() != None: 
    820                     res = QMessageBox.information(self, "Tree Building", "Currently you are visualizing only a subset of examples. Do you want to build the tree\nonly for these examples or for all examples?", "Only for these", "For all examples", None, 0, 1) 
     820                    res = QMessageBox.information(self, "Tree Building", "Currently you are visualizing only a subset of examples. Do you want to build the tree\nonly for these examples or for all examples?", "Only for These", "For All Examples", None, 0, 1) 
    821821                    if res == 1: 
    822822                        examples = self.wholeDataSet 
  • orange/OrangeWidgets/OWToolbars.py

    r3781 r4016  
    5252                button = createButton(self, f[0], lambda x=b: self.action(x), f[3], toggle = f[5]) 
    5353                setattr(self, f[1], button) 
    54                 if f[0] == "Send selections": 
     54                if f[1] == "buttonSendSelections": 
    5555                    button.setEnabled(not autoSend) 
    5656 
     
    6060    def action(self, b): 
    6161        f = self.functions[b] 
    62         if f[5]: 
     62        if f and f[5]: 
    6363            if hasattr(self.widget, "toolbarSelection"): 
    6464                self.widget.toolbarSelection = b 
  • orange/OrangeWidgets/OWTreeViewer2D.py

    r3529 r4016  
    595595        OWGUI.hSlider(GeneralTab, self, 'Zoom', box='Zoom', minValue=1, maxValue=10, step=1, 
    596596                      callback=self.toggleZoomSlider, ticks=1) 
    597         OWGUI.hSlider(GeneralTab, self, 'VSpacing', box='Vertical Spacing', minValue=1, maxValue=10, step=1, 
     597        OWGUI.hSlider(GeneralTab, self, 'VSpacing', box='Vertical spacing', minValue=1, maxValue=10, step=1, 
    598598                      callback=self.toggleVSpacing, ticks=1) 
    599         OWGUI.hSlider(GeneralTab, self, 'HSpacing', box='Horizontal Spacing', minValue=1, maxValue=10, step=1, 
     599        OWGUI.hSlider(GeneralTab, self, 'HSpacing', box='Horizontal spacing', minValue=1, maxValue=10, step=1, 
    600600                      callback=self.toggleHSpacing, ticks=1) 
    601601 
    602         # OWGUI.checkBox(GeneralTab, self, 'ZoomAutoRefresh', 'Auto Refresh After Zoom', 
     602        # OWGUI.checkBox(GeneralTab, self, 'ZoomAutoRefresh', 'Auto refresh after zoom', 
    603603        #                tooltip='Refresh after change of zoom setting?') 
    604         # OWGUI.checkBox(GeneralTab, self, 'AutoArrange', 'Auto Arrange', 
     604        # OWGUI.checkBox(GeneralTab, self, 'AutoArrange', 'Auto arrange', 
    605605        #                tooltip='Auto arrange the position of the nodes\nafter any change of nodes visibility') 
    606606        OWGUI.checkBox(GeneralTab, self, 'NodeBubblesEnabled', 'Node bubbles', 
     
    612612 
    613613        OWGUI.hSlider(GeneralTab, self, 'Zoom', box='Zoom', minValue=1, maxValue=10, step=1, callback=self.toggleZoomSlider, ticks=1) 
    614         OWGUI.hSlider(GeneralTab, self, 'VSpacing', box='Vertical Spacing', minValue=1, maxValue=10, step=1, callback=self.toggleVSpacing, ticks=1) 
    615         OWGUI.hSlider(GeneralTab, self, 'HSpacing', box='Horizontal Spacing', minValue=1, maxValue=10, step=1, callback=self.toggleHSpacing, ticks=1) 
    616  
    617         #OWGUI.checkBox(GeneralTab, self, 'ZoomAutoRefresh', 'Auto Refresh After Zoom', tooltip='Refresh after change of zoom setting?') 
    618         #OWGUI.checkBox(GeneralTab, self, 'AutoArrange', 'Auto Arrange', tooltip='Auto arrange the position of the nodes\nafter any change of nodes visibility') 
    619         OWGUI.checkBox(GeneralTab, self, 'NodeBubblesEnabled', 'Node Bubbles', tooltip='When mouse over the node show info bubble') 
    620         OWGUI.checkBox(GeneralTab, self, 'TruncateText', 'Truncate Text To Fit Margins', tooltip='Truncate any text to fit the node width', callback=self.toggleTruncateText) 
     614        OWGUI.hSlider(GeneralTab, self, 'VSpacing', box='Vertical spacing', minValue=1, maxValue=10, step=1, callback=self.toggleVSpacing, ticks=1) 
     615        OWGUI.hSlider(GeneralTab, self, 'HSpacing', box='Horizontal spacing', minValue=1, maxValue=10, step=1, callback=self.toggleHSpacing, ticks=1) 
     616 
     617        #OWGUI.checkBox(GeneralTab, self, 'ZoomAutoRefresh', 'Auto refresh after zoom', tooltip='Refresh after change of zoom setting?') 
     618        #OWGUI.checkBox(GeneralTab, self, 'AutoArrange', 'Auto arrange', tooltip='Auto arrange the position of the nodes\nafter any change of nodes visibility') 
     619        OWGUI.checkBox(GeneralTab, self, 'NodeBubblesEnabled', 'Node bubbles', tooltip='When mouse over the node show info bubble') 
     620        OWGUI.checkBox(GeneralTab, self, 'TruncateText', 'Truncate text to fit margins', tooltip='Truncate any text to fit the node width', callback=self.toggleTruncateText) 
    621621 
    622622        self.infBox = QVGroupBox(GeneralTab) 
     
    649649        NodeTab = QVGroupBox(self) 
    650650        # Node size options 
    651         OWGUI.hSlider(NodeTab, self, 'NodeSize', box='Node Width', 
     651        OWGUI.hSlider(NodeTab, self, 'NodeSize', box='Node width', 
    652652                      minValue=1, maxValue=10, step=1, 
    653653                      callback=self.toggleNodeSize, ticks=1) 
  • orange/OrangeWidgets/OWVisWidget.py

    r3415 r4016  
    1515        self.selectedHidden = [] 
    1616         
    17         self.shownAttribsGroup = OWGUI.widgetBox(placementTab, " Shown Attributes " ) 
     17        self.shownAttribsGroup = OWGUI.widgetBox(placementTab, " Shown attributes " ) 
    1818        self.addRemoveGroup = OWGUI.widgetBox(placementTab, 1, orientation = "horizontal" ) 
    19         self.hiddenAttribsGroup = OWGUI.widgetBox(placementTab, " Hidden Attributes ") 
     19        self.hiddenAttribsGroup = OWGUI.widgetBox(placementTab, " Hidden attributes ") 
    2020 
    2121        hbox = OWGUI.widgetBox(self.shownAttribsGroup, orientation = 'horizontal') 
  • orange/OrangeWidgets/OWkNNOptimization.py

    r3788 r4016  
    9090        # MAIN TAB 
    9191        self.optimizationBox = OWGUI.widgetBox(self.MainTab, "Evaluate") 
    92         self.resultsBox = OWGUI.widgetBox(self.MainTab, "Projection List, Most Interesting Projections First") 
     92        self.resultsBox = OWGUI.widgetBox(self.MainTab, "Projection list, most interesting first") 
    9393        self.resultsDetailsBox = OWGUI.widgetBox(self.MainTab, "Shown Details in Projections List" , orientation = "horizontal") 
    9494        self.buttonBox = OWGUI.widgetBox(self.optimizationBox, orientation = "horizontal") 
     
    132132            self.projOptimizationMethod = 0 
    133133 
    134         self.measureCombo = OWGUI.comboBox(self.SettingsTab, self, "qualityMeasure", box = " Measure of Classification Success ", items = ["Classification accuracy", "Average probability assigned to the correct class", "Brier score", "Area under curve (AUC)"], tooltip = "Measure to evaluate prediction accuracy of k-NN method on the projected data set.") 
    135  
    136         self.attributeSelectionBox = OWGUI.widgetBox(self.SettingsTab, "Attribute Subset Selection") 
    137         OWGUI.comboBox(self.attributeSelectionBox, self, "attrSubsetSelection", items = ["Deterministically using the selected attribute ranking measures", "Use gamma distribution and test all possible placements", "Use gamma distribution and test only one possible placement"]) 
    138  
    139         self.heuristicsSettingsBox = OWGUI.widgetBox(self.SettingsTab, "Measures for Attribute Ranking") 
     134        self.measureCombo = OWGUI.comboBox(self.SettingsTab, self, "qualityMeasure", box = " Measure of classification success ", items = ["Classification accuracy", "Average Probability Assigned to the Correct Class", "Brier Score", "Area under Curve (AUC)"], tooltip = "Measure to evaluate prediction accuracy of k-NN method on the projected data set.") 
     135 
     136        self.attributeSelectionBox = OWGUI.widgetBox(self.SettingsTab, "Attribute subset selection") 
     137        OWGUI.comboBox(self.attributeSelectionBox, self, "attrSubsetSelection", items = ["Deterministically Using the Selected Attribute Ranking Measures", "Use Gamma Distribution and Test All Possible Placements", "Use Gamma Distribution and Test Only One Possible Placement"]) 
     138 
     139        self.heuristicsSettingsBox = OWGUI.widgetBox(self.SettingsTab, "Measures for attribute ranking") 
    140140        OWGUI.comboBoxWithCaption(self.heuristicsSettingsBox, self, "attrCont", "For continuous attributes:", items = [val for (val, m) in contMeasures], callback = self.removeEvaluatedAttributes) 
    141141        OWGUI.comboBoxWithCaption(self.heuristicsSettingsBox, self, "attrDisc", "For discrete attributes:", items = [val for (val, m) in discMeasures], callback = self.removeEvaluatedAttributes) 
    142142 
    143         self.stopOptimizationBox = OWGUI.collapsableWidgetBox(self.SettingsTab, "When to Stop Evaluation?", self, "boxStopOptimization") 
    144         OWGUI.checkWithSpin(self.stopOptimizationBox, self, "Use time limit:                     ", 1, 1000, "useTimeLimit", "timeLimit", "  (minutes)", debuggingEnabled = 0)      # disable debugging. we always set this to 1 minute 
     143        self.stopOptimizationBox = OWGUI.collapsableWidgetBox(self.SettingsTab, "When to stop evaluation?", self, "boxStopOptimization") 
     144        OWGUI.checkWithSpin(self.stopOptimizationBox, self, "Time limit:                     ", 1, 1000, "useTimeLimit", "timeLimit", "  (minutes)", debuggingEnabled = 0)      # disable debugging. we always set this to 1 minute 
    145145        OWGUI.checkWithSpin(self.stopOptimizationBox, self, "Use projection count limit:  ", 1, 1000000, "useProjectionLimit", "projectionLimit", "  (projections)", debuggingEnabled = 0) 
    146146 
    147         self.localOptimizationSettingsBox = OWGUI.collapsableWidgetBox(self.SettingsTab, "Local Optimization Settings", self, "boxLocalOptimization") 
     147        self.localOptimizationSettingsBox = OWGUI.collapsableWidgetBox(self.SettingsTab, "Local optimization settings", self, "boxLocalOptimization") 
    148148        bbb = OWGUI.checkBox(self.localOptimizationSettingsBox, self, 'locOptOptimizeProjectionByPermutingAttributes', 'Try improving projection by permuting attributes in projection') 
    149149        self.localOptimizationProjCountCombo = OWGUI.comboBoxWithCaption(self.localOptimizationSettingsBox , self, "locOptProjCount", "Number of best projections to optimize:           ", items = range(1,30), tooltip = "Specify the number of best projections in the list that you want to try to locally optimize.\nIf you select 1 only the currently selected projection will be optimized.", sendSelectedValue = 1, valueType = int) 
     
    153153        self.localOptimizationProjMaxAttr    = OWGUI.comboBox(locOptBox, self, "locOptMaxAttrsInProj", items = range(3,50), tooltip = "What is the maximum number of attributes in a projection?", sendSelectedValue = 1, valueType = int) 
    154154 
    155         self.miscSettingsBox = OWGUI.widgetBox(self.SettingsTab, "Length of the Projection List") 
     155        self.miscSettingsBox = OWGUI.widgetBox(self.SettingsTab, "Length of the projection list") 
    156156        self.resultListCombo = OWGUI.comboBoxWithCaption(self.miscSettingsBox, self, "resultListLen", "Maximum length of projection list:   ", tooltip = "Maximum length of the list of interesting projections. This is also the number of projections that will be saved if you click Save button.", items = self.resultsListLenNums, callback = self.updateShownProjections, sendSelectedValue = 1, valueType = int) 
    157157 
     
    187187        # ########################## 
    188188        # SAVE & MANAGE TAB 
    189         self.classesBox = OWGUI.widgetBox(self.ManageTab, "Select Class Values You Wish to Separate") 
     189        self.classesBox = OWGUI.widgetBox(self.ManageTab, "Select class values you wish to separate") 
    190190        self.classesBox.setFixedHeight(130) 
    191         self.visualizedAttributesBox = OWGUI.widgetBox(self.ManageTab, "Number of Concurrently Visualized Attributes") 
     191        self.visualizedAttributesBox = OWGUI.widgetBox(self.ManageTab, "Number of concurrently visualized attributes") 
    192192        self.dialogsBox = OWGUI.widgetBox(self.ManageTab, "Dialogs") 
    193         self.manageResultsBox = OWGUI.widgetBox(self.ManageTab, "Manage Projections") 
     193        self.manageResultsBox = OWGUI.widgetBox(self.ManageTab, "Manage projections") 
    194194 
    195195        self.classesList = QListBox(self.classesBox) 
     
    592592                QMessageBox.information( None, self.parentName, 'Brier score of kNN model is %.3f' % (acc), QMessageBox.Ok + QMessageBox.Default) 
    593593            else: 
    594                 QMessageBox.information( None, self.parentName, 'Accuracy of the model is is %.3f' % (acc), QMessageBox.Ok + QMessageBox.Default) 
     594                QMessageBox.information( None, self.parentName, 'Accuracy of the model is %.3f' % (acc), QMessageBox.Ok + QMessageBox.Default) 
    595595 
    596596 
     
    932932        self.connect(self.graphButton, SIGNAL("clicked()"), self.graph.saveToFile) 
    933933 
    934         b1 = OWGUI.widgetBox(self.controlArea, 'Number Of Attributes') 
    935         b2 = OWGUI.widgetBox(self.controlArea, 'Number Of Projections') 
     934        b1 = OWGUI.widgetBox(self.controlArea, 'Number of attributes') 
     935        b2 = OWGUI.widgetBox(self.controlArea, 'Number of projections') 
    936936        b3 = OWGUI.widgetBox(self.controlArea, "Settings") 
    937937        b4 = OWGUI.widgetBox(self.controlArea, "Use color to represent ...") 
     
    11251125                if self.useGeneSets and self.geneToSet: 
    11261126                    if sharedGeneSets != []: 
    1127                         s += "<hr>Shared gene sets: %s<br>" % (sharedGeneSets) 
    1128                     s += "<hr>Gene sets for individual genes:<br>&nbsp; &nbsp; <b>%s</b>: %s<br>&nbsp; &nbsp; <b>%s</b>: %s" % (attributes[x], getGeneSet(self.geneToSet, attributes[x]), attributes[yy], getGeneSet(self.geneToSet, attributes[yy])) 
     1127                        s += "<hr>"+"Shared gene sets: %s"+"<br>" % (sharedGeneSets) 
     1128                    s += "<hr>"+"Gene sets for individual genes:"+"<br>&nbsp; &nbsp; <b>%s</b>: %s<br>&nbsp; &nbsp; <b>%s</b>: %s" % (attributes[x], getGeneSet(self.geneToSet, attributes[x]), attributes[yy], getGeneSet(self.geneToSet, attributes[yy])) 
    11291129 
    11301130                if self.rectColoring != 3: 
     
    12331233 
    12341234        b1 = OWGUI.widgetBox(self.controlArea, box = 1) 
    1235         b2 = OWGUI.widgetBox(self.controlArea, 'Number Of Attributes') 
    1236         b3 = OWGUI.widgetBox(self.controlArea, 'Number Of Projections') 
    1237         b4 = OWGUI.widgetBox(self.controlArea, "Gene Sets") 
     1235        b2 = OWGUI.widgetBox(self.controlArea, 'Number of attributes') 
     1236        b3 = OWGUI.widgetBox(self.controlArea, 'Number of projections') 
     1237        b4 = OWGUI.widgetBox(self.controlArea, "Gene sets") 
    12381238        box = OWGUI.widgetBox(self.controlArea) 
    12391239 
     
    14531453        b1 = OWGUI.widgetBox(self.controlArea, box = "Show...") 
    14541454        self.smoothingBox = OWGUI.widgetBox(self.controlArea, 'Smoothing parameter') 
    1455         b3 = OWGUI.widgetBox(self.controlArea, 'Line Width') 
     1455        b3 = OWGUI.widgetBox(self.controlArea, 'Line width') 
    14561456 
    14571457        b1.setSizePolicy(QSizePolicy(QSizePolicy.Minimum , QSizePolicy.Fixed )) 
     
    15621562        self.loadSettings() 
    15631563 
    1564         b1 = OWGUI.widgetBox(self.controlArea, 'Projection Count') 
     1564        b1 = OWGUI.widgetBox(self.controlArea, 'Projection count') 
    15651565        self.projectionCountEdit = OWGUI.comboBoxWithCaption(b1, self, "projectionCount", "Best projections to consider:   ", tooltip = "How many projections do you want to consider when computing probabilities of correct classification?", items = self.projectionCountList, callback = self.projectionCountChanged, sendSelectedValue = 1, valueType = str) 
    15661566 
    1567         b2 = OWGUI.widgetBox(self.controlArea, 'Example Index', orientation="horizontal") 
     1567        b2 = OWGUI.widgetBox(self.controlArea, 'Example index', orientation="horizontal") 
    15681568        self.selectedExampleCombo = OWGUI.comboBox(b2, self, "selectedExampleIndex", tooltip = "Select the index of the example whose predictions you wish to analyse in the graph", callback = self.selectedExampleChanged, sendSelectedValue = 1, valueType = int) 
    15691569        butt = OWGUI.button(b2, self, "Get from projection", self.updateIndexFromGraph, tooltip = "Use the index of the example that is selected in the projections") 
    15701570##        butt.setMaximumWidth(60) 
    15711571 
    1572         b3 = OWGUI.widgetBox(self.controlArea, 'Graph Settings') 
     1572        b3 = OWGUI.widgetBox(self.controlArea, 'Graph settings') 
    15731573        OWGUI.checkBox(b3, self, 'showAllClasses', 'Show probabilities for all classes', tooltip = "Show predicted probabilities for each class value", callback = self.updateGraph) 
    15741574        OWGUI.checkBox(b3, self, 'sortProjections', 'Sort projections by decreasing probability', tooltip = "Don't show projections as they are ranked, but by decreasing probability of correct classification (this usually improves perception)", callback = self.updateGraph) 
     
    15761576        OWGUI.checkBox(b3, self, 'showClickedProjection', 'Show selected projection', tooltip = "Show the corresponding projection by clicking its horizontal bar in the graph", callback = self.updateGraph) 
    15771577 
    1578         b6 = OWGUI.widgetBox(self.controlArea, "Show Predictions For All Examples") 
     1578        b6 = OWGUI.widgetBox(self.controlArea, "Show predictions for all examples") 
    15791579        self.showGraphCheck = OWGUI.checkBox(b6, self, 'showPredictionsInProjection', 'Show probabilities in the projection', tooltip = "Color the points in the projection according to the average probability of correct classification over the selected projection count", callback = self.toggleShowPredictions) 
    15801580        self.exampleList = QListBox(b6) 
  • orange/OrangeWidgets/Regression/OWRegressionTree.py

    r3476 r4016  
    6363        OWGUI.separator(self.controlArea) 
    6464        self.postPBox=OWGUI.widgetBox(self.controlArea, "Post-Pruning") 
    65         OWGUI.checkWithSpin(self.postPBox, self, "Prunning with m-estimate, m:", 0, 1000, 'PostMPCheck', 'PostMPVal') 
     65        OWGUI.checkWithSpin(self.postPBox, self, "Pruning with m-estimate, m:", 0, 1000, 'PostMPCheck', 'PostMPVal') 
    6666 
    6767        OWGUI.button(self.controlArea, self, "&Apply settings",callback=self.setLearner) 
  • orange/OrangeWidgets/Regression/OWRegressionTreeViewer2D.py

    r3655 r4016  
    157157 
    158158        nodeInfoBox = QVButtonGroup("Show Info On", self.NodeTab) 
    159         nodeInfoButtons = ['Predicted value', 'Variance', 'Deviance', 'Error', 'Number of instances'] 
     159        nodeInfoButtons = ['Predicted value', 'Variance', 'Deviation, 'Error', 'Number of instances'] 
    160160        nodeInfoSettings = ['maj', 'majp', 'tarp', 'error', 'inst'] 
    161161        self.NodeInfoW = []; self.dummy = 0 
     
    239239        b.addTextLine(text) 
    240240        b.addTextLine() 
    241         text="Instances:"+str(node.numInst)+"(%.1f" % (node.numInst/self.tree.distribution.cases*100)+"%)" 
     241        text="#instances:"+str(node.numInst)+"(%.1f" % (node.numInst/self.tree.distribution.cases*100)+"%)" 
    242242        b.addTextLine(text) 
    243243        b.addTextLine() 
  • orange/OrangeWidgets/Visualize/OWCorrAnalysis.py

    r3777 r4016  
    6868        self.tabs = QTabWidget(self.controlArea, 'tabWidget') 
    6969        self.GeneralTab = QVGroupBox(self) 
    70         self.SettingsTab = QVGroupBox(self, "Settings") 
     70        self.SettingsTab = QVGroupBox(self) 
    7171        self.tabs.insertTab(self.GeneralTab, "General") 
    7272        self.tabs.insertTab(self.SettingsTab, "Settings") 
     
    8989        #col attribute 
    9090        self.attrCol = "" 
    91         self.attrColCombo = OWGUI.comboBox(self.GeneralTab, self, "attrCol", " Column Table Attribute ", callback = self.updateTables, sendSelectedValue = 1, valueType = str) 
     91        self.attrColCombo = OWGUI.comboBox(self.GeneralTab, self, "attrCol", " Column table attribute ", callback = self.updateTables, sendSelectedValue = 1, valueType = str) 
    9292 
    9393        # row attribute 
    9494        self.attrRow = "" 
    95         self.attrRowCombo = OWGUI.comboBox(self.GeneralTab, self, "attrRow", "Row Table Attribute ", callback = self.updateTables, sendSelectedValue = 1, valueType = str) 
     95        self.attrRowCombo = OWGUI.comboBox(self.GeneralTab, self, "attrRow", "Row table attribute ", callback = self.updateTables, sendSelectedValue = 1, valueType = str) 
    9696        
    9797        #x principal axis 
     
    104104         
    105105        contribution = QVGroupBox('Contribution to inertia', self.GeneralTab) 
    106         self.firstAxis = OWGUI.widgetLabel(contribution, 'Axis 1: 10%') 
    107         self.secondAxis = OWGUI.widgetLabel(contribution, 'Axis 2: 10%') 
     106        self.firstAxis = OWGUI.widgetLabel(contribution, 'Axis %d: %f%%' % (1, 10)) 
     107        self.secondAxis = OWGUI.widgetLabel(contribution, 'Axis %d: %f%%' % (2, 10)) 
    108108         
    109109        sliders = QVGroupBox('Percentage of points', self.GeneralTab) 
     
    133133        # SETTINGS TAB 
    134134        # point width 
    135         OWGUI.hSlider(self.SettingsTab, self, 'graph.pointWidth', box=' Point Size ', minValue=1, maxValue=20, step=1, callback = self.replotCurves) 
     135        OWGUI.hSlider(self.SettingsTab, self, 'graph.pointWidth', box=' Point size ', minValue=1, maxValue=20, step=1, callback = self.replotCurves) 
    136136         
    137137        # general graph settings 
    138         box4 = OWGUI.widgetBox(self.SettingsTab, " General Graph Settings ") 
    139         OWGUI.checkBox(box4, self, 'graph.showXaxisTitle', 'X axis title', callback = self.updateGraph) 
    140         OWGUI.checkBox(box4, self, 'graph.showYLaxisTitle', 'Y axis title', callback = self.updateGraph) 
     138        box4 = OWGUI.widgetBox(self.SettingsTab, " General graph settings ") 
     139        OWGUI.checkBox(box4, self, 'graph.showXaxisTitle', 'X-axis title', callback = self.updateGraph) 
     140        OWGUI.checkBox(box4, self, 'graph.showYLaxisTitle', 'Y-axis title', callback = self.updateGraph) 
    141141##        OWGUI.checkBox(box4, self, 'graph.showAxisScale', 'Show axis scale', callback = self.updateGraph) 
    142142        OWGUI.checkBox(box4, self, 'graph.showLegend', 'Show legend', callback = self.updateGraph) 
     
    152152         
    153153        #browsing radius 
    154         OWGUI.hSlider(self.SettingsTab, self, 'percRadius', box=' Browsing Curve Size ', minValue = 0, maxValue=100, step=5, callback = self.calcRadius) 
     154        OWGUI.hSlider(self.SettingsTab, self, 'percRadius', box=' Browsing curve size ', minValue = 0, maxValue=100, step=5, callback = self.calcRadius) 
    155155 
    156156        #font size         
     
    512512 
    513513    def createColorDialog(self): 
    514         c = OWDlgs.ColorPalette(self, "Color Palette") 
    515         c.createDiscretePalette(" Discrete Palette ") 
     514        c = OWDlgs.ColorPalette(self, "Color palette") 
     515        c.createDiscretePalette(" Discrete palette ") 
    516516        c.createContinuousPalette("contPalette", " Continuous palette ") 
    517         box = c.createBox("otherColors", " Other Colors ") 
     517        box = c.createBox("otherColors", " Other colors ") 
    518518        c.createColorButton(box, "Canvas", "Canvas color", Qt.white) 
    519519        box.addSpace(5) 
  • orange/OrangeWidgets/Visualize/OWDistributions.py

    r3483 r4016  
    426426        # GUI connections 
    427427        # options dialog connections 
    428         self.numberOfBarsSlider = OWGUI.hSlider(self.SettingsTab, self, 'numberOfBars', box='Number of Bars', minValue=5, maxValue=60, step=5, callback=self.setNumberOfBars, ticks=5) 
     428        self.numberOfBarsSlider = OWGUI.hSlider(self.SettingsTab, self, 'numberOfBars', box='Number of bars', minValue=5, maxValue=60, step=5, callback=self.setNumberOfBars, ticks=5) 
    429429        self.numberOfBarsSlider.setTracking(0) # no change until the user stop dragging the slider 
    430430 
    431         self.barSizeSlider = OWGUI.hSlider(self.SettingsTab, self, 'barSize', box=' Bar Size ', minValue=30, maxValue=100, step=5, callback=self.setBarSize, ticks=10) 
     431        self.barSizeSlider = OWGUI.hSlider(self.SettingsTab, self, 'barSize', box=' Bar size ', minValue=30, maxValue=100, step=5, callback=self.setBarSize, ticks=10) 
    432432 
    433433        box = OWGUI.widgetBox(self.SettingsTab, " General graph settings ") 
    434434        box.setMinimumWidth(180) 
    435435        box2 = OWGUI.widgetBox(box, orientation = "horizontal") 
    436         OWGUI.checkBox(box2, self, 'showMainTitle', 'Show Main Title', callback = self.setShowMainTitle) 
     436        OWGUI.checkBox(box2, self, 'showMainTitle', 'Show main title', callback = self.setShowMainTitle) 
    437437        OWGUI.lineEdit(box2, self, 'mainTitle', callback = self.setMainTitle) 
    438438 
     
    447447        OWGUI.checkBox(box, self, 'showContinuousClassGraph', 'Show continuous class graph', callback=self.setShowContinuousClassGraph) 
    448448         
    449         box5 = OWGUI.widgetBox(self.SettingsTab, " Probability graph ") 
    450         self.showProb = OWGUI.checkBox(box5, self, 'showProbabilities', ' Show Probabilities ', callback = self.setShowProbabilities) 
     449        box5 = OWGUI.widgetBox(self.SettingsTab, "Probability plot") 
     450        self.showProb = OWGUI.checkBox(box5, self, 'showProbabilities', 'Show probabilities', callback = self.setShowProbabilities) 
    451451 
    452452        box6 = OWGUI.widgetBox(box5, orientation = "horizontal") 
    453453 
    454         self.showYPaxisCheck = OWGUI.checkBox(box6, self, 'showYPaxisTitle', 'Show Axis Title', callback = self.setShowYPaxisTitle) 
     454        self.showYPaxisCheck = OWGUI.checkBox(box6, self, 'showYPaxisTitle', 'Show axis title', callback = self.setShowYPaxisTitle) 
    455455        self.yPaxisEdit = OWGUI.lineEdit(box6, self, 'yPaxisTitle', callback = self.setYPaxisTitle) 
    456         self.confIntCheck = OWGUI.checkBox(box5, self, 'showConfidenceIntervals', 'Show Confidence Intervals', callback = self.setShowConfidenceIntervals) 
     456        self.confIntCheck = OWGUI.checkBox(box5, self, 'showConfidenceIntervals', 'Show confidence intervals', callback = self.setShowConfidenceIntervals) 
    457457        self.showProb.disables = [self.showYPaxisCheck, self.yPaxisEdit, self.confIntCheck] 
    458458        self.showProb.makeConsistent() 
     
    463463         
    464464        #add controls to self.controlArea widget 
    465         self.variablesQCB = OWGUI.comboBox(self.GeneralTab, self, "attribute", box="Attribute", valueType = str, sendSelectedValue = True, callback=self.setVariable) 
     465        self.variablesQCB = OWGUI.comboBox(self.GeneralTab, self, "attribute", box="Variable", valueType = str, sendSelectedValue = True, callback=self.setVariable) 
    466466        self.targetQCB = OWGUI.comboBox(self.GeneralTab, self, "targetValue", box="Target value", valueType=int, callback=self.setTarget) 
    467467        self.outcomesQLB = OWGUI.listBox(self.GeneralTab, self, "visibleOutcomes", "outcomes", "Outcomes", selectionMode = QListBox.Multi, callback = self.outcomeSelectionChange) 
  • orange/OrangeWidgets/Visualize/OWLinProj.py

    r3788 r4016  
    143143        self.extraTopBox = OWGUI.widgetBox(self.SettingsTab, orientation = "vertical") 
    144144        self.extraTopBox.hide() 
    145         OWGUI.hSlider(self.SettingsTab, self, 'graph.pointWidth', box=' Point Size ', minValue=1, maxValue=15, step=1, callback = self.updateGraph) 
     145        OWGUI.hSlider(self.SettingsTab, self, 'graph.pointWidth', box=' Point size ', minValue=1, maxValue=15, step=1, callback = self.updateGraph) 
    146146 
    147147        box = OWGUI.widgetBox(self.SettingsTab, "Jittering Options") 
     
    186186        box7 = OWGUI.widgetBox(box3, orientation = "horizontal") 
    187187 
    188         OWGUI.checkBox(box5, self, 'graph.showProbabilities', 'Show probabilities  ', callback = self.updateGraph, tooltip = "Show a background image with class probabilities") 
     188        OWGUI.checkBox(box5, self, 'graph.showProbabilities', 'Show probabilities'+'  ', callback = self.updateGraph, tooltip = "Show a background image with class probabilities") 
    189189        hider = OWGUI.widgetHider(box5, self, "showProbabilitiesDetails", tooltip = "Show/hide extra settings") 
    190190        rubb = OWGUI.rubber(box5) 
     
    199199        hider.setWidgets([box6, box7]) 
    200200 
    201         OWGUI.button(box8, self, "Set Colors", self.setColors, tooltip = "Set the canvas background color and color palette for coloring continuous variables", debuggingEnabled = 0) 
     201        OWGUI.button(box8, self, "Colors", self.setColors, tooltip = "Set the canvas background color and color palette for coloring continuous variables", debuggingEnabled = 0) 
    202202 
    203203        self.icons = self.createAttributeIconDict() 
     
    211211 
    212212    def saveToFile(self): 
    213         self.graph.saveToFile([("Save PixTex", self.graph.savePicTeX)]) 
     213        self.graph.saveToFile([("Save PicTex", self.graph.savePicTeX)]) 
    214214 
    215215    def activateLoadedSettings(self): 
     
    469469 
    470470    def createColorDialog(self): 
    471         c = OWDlgs.ColorPalette(self, "Color Palette") 
    472         c.createDiscretePalette(" Discrete Palette ") 
     471        c = OWDlgs.ColorPalette(self, "Color palette") 
     472        c.createDiscretePalette(" Discrete palette ") 
    473473        c.createContinuousPalette("contPalette", " Continuous palette ") 
    474         box = c.createBox("otherColors", " Other Colors ") 
     474        box = c.createBox("otherColors", " Other colors ") 
    475475        c.createColorButton(box, "Canvas", "Canvas color", Qt.white) 
    476476        c.setColorSchemas(self.colorSettings, self.selectedSchemaIndex) 
  • orange/OrangeWidgets/Visualize/OWMosaicDisplay.py

    r3788 r4016  
    187187        # SETTINGS TAB 
    188188        # ###################### 
    189         box5 = OWGUI.widgetBox(self.SettingsTab, "Colors in Cells Represent...") 
     189        box5 = OWGUI.widgetBox(self.SettingsTab, "Colors in cells represent...") 
    190190        OWGUI.comboBox(box5, self, "interiorColoring", None, items = ["Standardized (Pearson) residuals", "Class distribution"], callback = self.updateGraph) 
    191191        box5.setSizePolicy(QSizePolicy(QSizePolicy.Minimum , QSizePolicy.Fixed )) 
    192192 
    193         OWGUI.comboBoxWithCaption(self.SettingsTab, self, "cellspace", "Minimum cell distance: ", box = "Visual Settings", items = range(1,11), callback = self.updateGraph, sendSelectedValue = 1, valueType = int, tooltip = "What is the minimum distance between two rectangles in the plot?") 
    194  
    195         self.box6 = OWGUI.widgetBox(self.SettingsTab, "Cell Distribution Settings") 
     193        OWGUI.comboBoxWithCaption(self.SettingsTab, self, "cellspace", "Minimum cell distance: ", box = "Visual settings", items = range(1,11), callback = self.updateGraph, sendSelectedValue = 1, valueType = int, tooltip = "What is the minimum distance between two rectangles in the plot?") 
     194 
     195        self.box6 = OWGUI.widgetBox(self.SettingsTab, "Cell distribution settings") 
    196196        OWGUI.comboBox(self.box6, self, 'horizontalDistribution', items = ["Show Distribution Vertically", "Show Distribution Horizontally"], tooltip = "Do you wish to see class distribution drawn horizontally or vertically?", callback = self.updateGraph) 
    197         OWGUI.checkBox(self.box6, self, 'showAprioriDistributionLines', 'Show Apriori Distribution with Lines', callback = self.updateGraph, tooltip = "Show the lines that represent the apriori class distribution") 
     197        OWGUI.checkBox(self.box6, self, 'showAprioriDistributionLines', 'Show apriori distribution with lines', callback = self.updateGraph, tooltip = "Show the lines that represent the apriori class distribution") 
    198198 
    199199        self.box8 = OWGUI.widgetBox(self.SettingsTab, "Subboxes in Cells") 
     
    207207 
    208208        hbox = OWGUI.widgetBox(self.SettingsTab, "Colors", orientation = "horizontal") 
    209         OWGUI.button(hbox, self, "Set Colors", self.setColors, tooltip = "Set the color palette for coloring different class values", debuggingEnabled = 0) 
     209        OWGUI.button(hbox, self, "Set Colors", self.setColors, tooltip = "Set the color palette for class values", debuggingEnabled = 0) 
    210210        box.setSizePolicy(QSizePolicy(QSizePolicy.Minimum , QSizePolicy.Fixed )) 
    211211 
     
    806806    def createColorDialog(self): 
    807807        c = OWDlgs.ColorPalette(self, "Color Palette") 
    808         c.createDiscretePalette(" Discrete Palette ", ColorBrewerColors) 
     808        c.createDiscretePalette(" Discrete palette ", ColorBrewerColors) 
    809809        c.setColorSchemas(self.colorSettings, self.selectedSchemaIndex) 
    810810        return c 
  • orange/OrangeWidgets/Visualize/OWParallelCoordinates.py

    r3788 r4016  
    5050        self.linesDistance = 60 
    5151        self.autoSendSelection = 1 
    52         self.attrDiscOrder = "None" 
    53         self.attrContOrder = "None" 
     52        self.attrDiscOrder = "Unordered" 
     53        self.attrContOrder = "Unordered" 
    5454        self.projections = None 
    5555        self.correlationDict = {} 
     
    8282 
    8383        #add controls to self.controlArea widget 
    84         self.targetValueCombo = OWGUI.comboBox(self.GeneralTab, self, "targetValue", box = "Target Class Value", sendSelectedValue = 1, valueType = str, callback = self.updateGraph) 
     84        self.targetValueCombo = OWGUI.comboBox(self.GeneralTab, self, "targetValue", box = "Target class value", sendSelectedValue = 1, valueType = str, callback = self.updateGraph) 
    8585 
    8686        self.createShowHiddenLists(self.GeneralTab, callback = self.updateGraph) 
     
    8888 
    8989        self.optimizationDlg = ParallelOptimization(self, signalManager = self.signalManager) 
    90         self.optimizationDlgButton = OWGUI.button(self.GeneralTab, self, "Optimization dialog", callback = self.optimizationDlg.reshow, debuggingEnabled = 0) 
     90        self.optimizationDlgButton = OWGUI.button(self.GeneralTab, self, "Optimization Dialog", callback = self.optimizationDlg.reshow, debuggingEnabled = 0) 
    9191 
    9292        self.zoomSelectToolbar = OWToolbars.ZoomSelectToolbar(self, self.GeneralTab, self.graph, self.autoSendSelection) 
     
    102102        boxX = OWGUI.widgetBox(self.SettingsTab, "Graph settings") 
    103103        OWGUI.comboBox(boxX, self, "graph.jitterSize", label = 'Jittering size (% of size):  ', orientation='horizontal', callback = self.setJitteringSize, items = self.jitterSizeNums, sendSelectedValue = 1, valueType = float) 
    104         OWGUI.comboBox(boxX, self, "linesDistance", label = 'Minimum axis distance:  ', orientation='horizontal', callback = self.updateGraph, items = self.linesDistanceNums, tooltip = "What is the minimum distance between two adjecent attribute axis", sendSelectedValue = 1, valueType = int) 
     104        OWGUI.comboBox(boxX, self, "linesDistance", label = 'Minimum axis distance:  ', orientation='horizontal', callback = self.updateGraph, items = self.linesDistanceNums, tooltip = "The minimum distance between two adjacent attribute axis", sendSelectedValue = 1, valueType = int) 
    105105 
    106106        # visual settings 
     
    111111        OWGUI.checkBox(box, self, 'graph.lineTracking', 'Line tracking', callback = self.updateValues, tooltip = "Show nearest example with a wider line. The rest of the lines \nwill be shown in lighter colors.") 
    112112        OWGUI.checkBox(box, self, 'graph.enabledLegend', 'Show legend', callback = self.updateValues) 
    113         OWGUI.checkBox(box, self, 'graph.globalValueScaling', 'Global Value Scaling', callback = self.setGlobalValueScaling) 
     113        OWGUI.checkBox(box, self, 'graph.globalValueScaling', 'Global value scaling', callback = self.setGlobalValueScaling) 
    114114 
    115115        box3 = OWGUI.widgetBox(self.SettingsTab, "Statistics") 
     
    117117        OWGUI.checkBox(box3, self, 'graph.showDistributions', 'Show distributions', callback = self.updateValues, tooltip = "Show bars with distribution of class values (only for discrete attributes)") 
    118118 
    119         OWGUI.comboBox(self.SettingsTab, self, "middleLabels", box = "Middle labels", items = ["Off", "Correlations", "VizRank"], callback = self.updateGraph, tooltip = "What information do you wish to view on top in the middle of coordinate axes?", sendSelectedValue = 1, valueType = str) 
     119        OWGUI.comboBox(self.SettingsTab, self, "middleLabels", box = "Middle labels", items = ["No labels", "Correlations", "VizRank"], callback = self.updateGraph, tooltip = "The information do you wish to view on top in the middle of coordinate axes", sendSelectedValue = 1, valueType = str) 
    120120 
    121121        hbox4 = OWGUI.widgetBox(self.SettingsTab, "Colors", orientation = "horizontal") 
    122         OWGUI.button(hbox4, self, "Set Colors", self.setColors, tooltip = "Set the canvas background color and color palette for coloring continuous variables", debuggingEnabled = 0) 
     122        OWGUI.button(hbox4, self, "Set colors", self.setColors, tooltip = "Set the canvas background color and color palette for coloring continuous variables", debuggingEnabled = 0) 
    123123 
    124124        box2 = OWGUI.widgetBox(self.SettingsTab, "Sending selection") 
     
    179179 
    180180        targetVal = str(self.targetValueCombo.currentText()) 
    181         if targetVal == "(None)": targetVal = None 
     181        if targetVal == "(Unordered)": targetVal = None 
    182182        #self.graph.updateData(attrs[start:start+maxAttrs], targetVal, self.buildMidLabels(attrs[start:start+maxAttrs])) 
    183183        self.graph.updateData(attrs, targetVal, self.buildMidLabels(attrs), start, start + maxAttrs) 
     
    196196    def buildMidLabels(self, attrs): 
    197197        labels = [] 
    198         if self.middleLabels == "Off" or self.data == None or len(self.data) == 0: return None 
     198        if self.middleLabels == "No labels" or self.data == None or len(self.data) == 0: return None 
    199199        elif self.middleLabels == "Correlations": 
    200200            for i in range(len(attrs)-1): 
     
    361361    def createColorDialog(self): 
    362362        c = OWDlgs.ColorPalette(self, "Color Palette") 
    363         c.createDiscretePalette("Discrete Palette") 
     363        c.createDiscretePalette("Discrete palette") 
    364364        c.createContinuousPalette("contPalette", "Continuous palette") 
    365         box = c.createBox("otherColors", "Other Colors") 
     365        box = c.createBox("otherColors", "Other colors") 
    366366        c.createColorButton(box, "Canvas", "Canvas color", Qt.white) 
    367367        box.addSpace(5) 
     
    392392 
    393393    def __init__(self, parallelWidget, parent=None, signalManager = None): 
    394         OWBaseWidget.__init__(self, parent, signalManager, "Parallel Optimization Dialog", FALSE) 
     394        OWBaseWidget.__init__(self, parent, signalManager, "Parallel Optimization dialog", FALSE) 
    395395 
    396396        if (int(qVersion()[0]) >= 3): 
     
    472472        label  = OWGUI.widgetLabel(box, "   attributes") 
    473473 
    474         self.startOptimizationButton = OWGUI.button(self.optimizeBox, self, "Start optimization", callback = self.startOptimization) 
     474        self.startOptimizationButton = OWGUI.button(self.optimizeBox, self, "Start Optimization", callback = self.startOptimization) 
    475475        f = self.startOptimizationButton.font() 
    476476        f.setBold(1) 
    477477        self.startOptimizationButton.setFont(f) 
    478         self.stopOptimizationButton = OWGUI.button(self.optimizeBox, self, "Stop evaluation", callback = self.stopOptimizationClick) 
     478        self.stopOptimizationButton = OWGUI.button(self.optimizeBox, self, "Stop Evaluation", callback = self.stopOptimizationClick) 
    479479        self.stopOptimizationButton.setFont(f) 
    480480        self.stopOptimizationButton.hide() 
     
    482482 
    483483 
    484         self.clearButton = OWGUI.button(self.manageBox, self, "Clear results", self.clearResults) 
     484        self.clearButton = OWGUI.button(self.manageBox, self, "Clear Results", self.clearResults) 
    485485        self.loadButton  = OWGUI.button(self.manageBox, self, "Load", self.loadResults) 
    486486        self.saveButton  = OWGUI.button(self.manageBox, self, "Save", self.saveResults) 
    487         self.closeButton = OWGUI.button(self.manageBox, self, "Close dialog", self.hide) 
     487        self.closeButton = OWGUI.button(self.manageBox, self, "Close Dialog", self.hide) 
    488488 
    489489        self.changeProjectionFile() 
     
    619619        self.fileName = shortFileName 
    620620 
    621         self.kNeighborsLabel.setText("Number of neighbors (k): %s" % (str(settings["kValue"]))) 
    622         self.percentDataUsedLabel.setText("Percent of data used: %d %%" % (settings["percentDataUsed"])) 
    623         self.testingMethodLabel.setText("Testing method used: %s" % (self.testingMethod[settings["testingMethod"]])) 
    624         self.qualityMeasureLabel.setText("Quality measure used: %s" % (self.qualityMeasure[settings["qualityMeasure"]])) 
     621        self.kNeighborsLabel.setText("Number of neighbors (k): " + str(settings["kValue"])) 
     622        self.percentDataUsedLabel.setText("Percent of data used: " + "%d %%" % (settings["percentDataUsed"])) 
     623        self.testingMethodLabel.setText("Testing method used: " + self.testingMethod[settings["testingMethod"]]) 
     624        self.qualityMeasureLabel.setText("Quality measure used: " + self.qualityMeasure[settings["qualityMeasure"]]) 
    625625 
    626626 
  • orange/OrangeWidgets/Visualize/OWPolyviz.py

    r3483 r4016  
    3131        # SETTINGS TAB 
    3232        self.extraTopBox.show() 
    33         OWGUI.hSlider(self.extraTopBox, self, 'graph.lineLength', box=' Line Length ', minValue=0, maxValue=10, step=1, callback = self.updateGraph) 
     33        OWGUI.hSlider(self.extraTopBox, self, 'graph.lineLength', box=' Line length ', minValue=0, maxValue=10, step=1, callback = self.updateGraph) 
    3434 
    3535        self.freeVizDlgButton.hide() 
  • orange/OrangeWidgets/Visualize/OWPolyvizGraph.py

    r3503 r4016  
    602602                            if self.kNNOptimization.isOptimizationCanceled(): 
    603603                                secs = time.time() - startTime 
    604                                 self.kNNOptimization.setStatusBarText("Evaluation stopped (evaluated %s projections in %d min, %d sec)" % (orngVisFuncts.createStringFromNumber(self.triedPossibilities), secs/60, secs%60)) 
     604                                self.kNNOptimization.setStatusBarText("Evaluation stopped (evaluated %(n)s projections in %(min)d min, %(sec)d sec)" % {"n": orngVisFuncts.createStringFromNumber(self.triedPossibilities), "min": secs/60, "sec": secs%60}) 
    605605                                self.polyvizWidget.progressBarFinished() 
    606606                                return 
     
    625625 
    626626        secs = time.time() - startTime 
    627         self.kNNOptimization.setStatusBarText("Finished evaluation (evaluated %s projections in %d min, %d sec)" % (orngVisFuncts.createStringFromNumber(self.triedPossibilities), secs/60, secs%60)) 
     627        self.kNNOptimization.setStatusBarText("Finished evaluation (evaluated %(n)s projections in %(min)d min, %(sec)d sec)" % {"n": orngVisFuncts.createStringFromNumber(self.triedPossibilities), "min": secs/60, "sec": secs%60}) 
    628628        self.polyvizWidget.progressBarFinished() 
    629629 
     
    702702                                if self.kNNOptimization.isOptimizationCanceled(): 
    703703                                    secs = time.time() - startTime 
    704                                     self.kNNOptimization.setStatusBarText("Evaluation stopped (evaluated %s projections in %d min, %d sec)" % (orngVisFuncts.createStringFromNumber(self.triedPossibilities), secs/60, secs%60)) 
     704                                    self.kNNOptimization.setStatusBarText("Evaluation stopped (evaluated %(n)s projections in %(min)d min, %(sec)d sec)" % {"n": orngVisFuncts.createStringFromNumber(self.triedPossibilities), "min": secs/60, "sec": secs%60}) 
    705705                                    return 
    706706                                permutationIndex += 1 
     
    819819                        if max(acc, accuracy)/min(acc, accuracy) > 1.01: significantImprovement = 1 
    820820                    else: 
    821                         self.kNNOptimization.setStatusBarText("Evaluated %s projections (attribute %s/%s). Last accuracy was: %2.2f%%" % (orngVisFuncts.createStringFromNumber(self.triedPossibilities), orngVisFuncts.createStringFromNumber(attrIndex), strTotalAtts, acc)) 
     821                       self.kNNOptimization.setStatusBarText("Evaluated %(n)s projections (attribute %(attra)s/%(attrb)s). Last accuracy was: %2.2(acc)f%%" % {"n": orngVisFuncts.createStringFromNumber(self.triedPossibilities), "attra": orngVisFuncts.createStringFromNumber(attrIndex), "attrb": strTotalAtts, "acc": acc}) 
    822822                        if min(acc, accuracy)/max(acc, accuracy) > 0.98:  # if the found projection is at least 98% as good as the one optimized, add it to the list of projections anyway 
    823823                            addResultFunct(acc, other_results, lenTable, [self.attributeNames[i] for i in attrList], 1, generalDict = {"reverse": reverse}) 
  • orange/OrangeWidgets/Visualize/OWScatterPlot.py

    r3788 r4016  
    7676        #x attribute 
    7777        self.attrX = "" 
    78         self.attrXCombo = OWGUI.comboBox(self.GeneralTab, self, "attrX", "X Axis Attribute", callback = self.majorUpdateGraph, sendSelectedValue = 1, valueType = str) 
     78        self.attrXCombo = OWGUI.comboBox(self.GeneralTab, self, "attrX", "X-axis attribute", callback = self.majorUpdateGraph, sendSelectedValue = 1, valueType = str) 
    7979 
    8080        # y attribute 
    8181        self.attrY = "" 
    82         self.attrYCombo = OWGUI.comboBox(self.GeneralTab, self, "attrY", "Y Axis Attribute", callback = self.majorUpdateGraph, sendSelectedValue = 1, valueType = str) 
     82        self.attrYCombo = OWGUI.comboBox(self.GeneralTab, self, "attrY", "Y-axis attribute", callback = self.majorUpdateGraph, sendSelectedValue = 1, valueType = str) 
    8383 
    8484        # coloring 
    8585        self.showColorLegend = 0 
    8686        self.attrColor = "" 
    87         box = OWGUI.widgetBox(self.GeneralTab, "Color Attribute") 
     87        box = OWGUI.widgetBox(self.GeneralTab, "Colors") 
    8888        OWGUI.checkBox(box, self, 'showColorLegend', 'Show color legend', callback = self.updateGraph) 
    89         self.attrColorCombo = OWGUI.comboBox(box, self, "attrColor", callback = self.updateGraph, sendSelectedValue=1, valueType = str, emptyString = "(One color)") 
     89        self.attrColorCombo = OWGUI.comboBox(box, self, "attrColor", callback = self.updateGraph, sendSelectedValue=1, valueType = str, emptyString = "(Same color)") 
    9090 
    9191        # labelling 
     
    9595        # shaping 
    9696        self.attrShape = "" 
    97         self.attrShapeCombo = OWGUI.comboBox(self.GeneralTab, self, "attrShape", "Shape Attribute", callback = self.updateGraph, sendSelectedValue=1, valueType = str, emptyString = "(One shape)") 
     97        self.attrShapeCombo = OWGUI.comboBox(self.GeneralTab, self, "attrShape", "Shape", callback = self.updateGraph, sendSelectedValue=1, valueType = str, emptyString = "(Same shape)") 
    9898 
    9999        # sizing 
    100100        self.attrSize = "" 
    101         self.attrSizeCombo = OWGUI.comboBox(self.GeneralTab, self, "attrSize", "Size Attribute", callback = self.updateGraph, sendSelectedValue=1, valueType = str, emptyString = "(One size)") 
     101        self.attrSizeCombo = OWGUI.comboBox(self.GeneralTab, self, "attrSize", "Size", callback = self.updateGraph, sendSelectedValue=1, valueType = str, emptyString = "(Same size)") 
    102102 
    103103##        # cluster dialog 
     
    109109 
    110110 
    111         self.optimizationButtons = OWGUI.widgetBox(self.GeneralTab, "Optimization Dialogs", orientation = "horizontal") 
     111        self.optimizationButtons = OWGUI.widgetBox(self.GeneralTab, "Optimization dialogs", orientation = "horizontal") 
    112112        OWGUI.button(self.optimizationButtons, self, "VizRank", callback = self.vizrank.reshow, tooltip = "Opens VizRank dialog, where you can search for interesting projections with different subsets of attributes.", debuggingEnabled = 0) 
    113113         
     
    124124        # SETTINGS TAB 
    125125        # point width 
    126         OWGUI.hSlider(self.SettingsTab, self, 'graph.pointWidth', box=' Point Size ', minValue=1, maxValue=20, step=1, callback = self.pointSizeChange) 
     126        OWGUI.hSlider(self.SettingsTab, self, 'graph.pointWidth', box='Symbol size', minValue=1, maxValue=20, step=1, callback = self.pointSizeChange) 
    127127 
    128128        # ##### 
    129129        # jittering options 
    130         box2 = OWGUI.widgetBox(self.SettingsTab, "Jittering Options") 
     130        box2 = OWGUI.widgetBox(self.SettingsTab, "Jittering options") 
    131131        box3 = OWGUI.widgetBox(box2, orientation = "horizontal") 
    132132        self.jitterLabel = QLabel('Jittering size (% of size)  ', box3) 
     
    135135 
    136136        # general graph settings 
    137         box4 = OWGUI.collapsableWidgetBox(self.SettingsTab, "General Graph Settings", self, "boxGeneral") 
     137        box4 = OWGUI.collapsableWidgetBox(self.SettingsTab, "General graph settings", self, "boxGeneral") 
    138138        OWGUI.checkBox(box4, self, 'graph.showXaxisTitle', 'X axis title', callback = self.graph.setShowXaxisTitle) 
    139139        OWGUI.checkBox(box4, self, 'graph.showYLaxisTitle', 'Y axis title', callback = self.graph.setShowYLaxisTitle) 
     
    156156 
    157157        box7 = OWGUI.widgetBox(box4, orientation = "horizontal") 
    158         OWGUI.separator(box7, 20) 
     158        OWGUI.separator(box7, 17) 
    159159        OWGUI.checkBox(box7, self, 'graph.spaceBetweenCells', 'Show space between cells', callback = self.updateGraph) 
    160160        hider.setWidgets([box6, box7]) 
     
    165165        OWGUI.button(self.colorButtonsBox, self, "Set Colors", self.setColors, tooltip = "Set the canvas background color, grid color and color palette for coloring continuous variables", debuggingEnabled = 0) 
    166166 
    167         box5 = OWGUI.widgetBox(self.SettingsTab, "Tooltips Settings") 
    168         OWGUI.comboBox(box5, self, "graph.tooltipKind", items = ["Don't show tooltips", "Show visible attributes", "Show all attributes"], callback = self.updateGraph) 
     167        box5 = OWGUI.widgetBox(self.SettingsTab, "Tooltips settings") 
     168        OWGUI.comboBox(box5, self, "graph.tooltipKind", items = ["Don't Show Tooltips", "Show Visible Attributes", "Show All Attributes"], callback = self.updateGraph) 
    169169 
    170170        OWGUI.checkBox(self.SettingsTab, self, 'autoSendSelection', 'Auto send selected data', box = "Data selection", callback = self.setAutoSendSelection, tooltip = "Send signals with selected data whenever the selection changes.") 
     
    293293        if isinstance(results, orngTest.ExperimentResults) and len(results.results) > 0 and len(results.results[0].probabilities) > 0: 
    294294            self.classificationResults = [results.results[i].probabilities[0][results.results[i].actualClass] for i in range(len(results.results))] 
    295             self.classificationResults = (self.classificationResults, "Probability of correct classificatioin = %.2f%%") 
     295            self.classificationResults = (self.classificationResults, "Probability of correct classification = %.2f%%") 
    296296 
    297297        self.updateGraph() 
     
    374374        if self.data == None: return 
    375375 
    376         self.attrColorCombo.insertItem("(One color)") 
     376        self.attrColorCombo.insertItem("(Same color)") 
    377377        self.attrLabelCombo.insertItem("(No labels)") 
    378         self.attrShapeCombo.insertItem("(One shape)") 
    379         self.attrSizeCombo.insertItem("(One size)") 
     378        self.attrShapeCombo.insertItem("(Same shape)") 
     379        self.attrSizeCombo.insertItem("(Same size)") 
    380380 
    381381        #labels are usually chosen from meta variables, put them on top 
     
    483483        c.createDiscretePalette("Discrete Palette") 
    484484        c.createContinuousPalette("contPalette", "Continuous palette") 
    485         box = c.createBox("otherColors", "Other Colors") 
     485        box = c.createBox("otherColors", "Other colors") 
    486486        c.createColorButton(box, "Canvas", "Canvas color", Qt.white) 
    487487        box.addSpace(5) 
  • orange/OrangeWidgets/Visualize/OWScatterPlotMatrix.py

    r3663 r4016  
    7171 
    7272        #add controls to self.controlArea widget 
    73         self.shownAttribsGroup = OWGUI.widgetBox(self.GeneralTab, "Shown Attributes") 
     73        self.shownAttribsGroup = OWGUI.widgetBox(self.GeneralTab, "Shown attributes") 
    7474        self.shownAttribsGroup.setMinimumWidth(200) 
    7575        hbox = OWGUI.widgetBox(self.shownAttribsGroup, orientation = 'horizontal') 
    7676        self.addRemoveGroup = OWGUI.widgetBox(self.GeneralTab, 1, orientation = "horizontal" ) 
    77         self.hiddenAttribsGroup = OWGUI.widgetBox(self.GeneralTab, "Hidden Attributes") 
     77        self.hiddenAttribsGroup = OWGUI.widgetBox(self.GeneralTab, "Hidden attributes") 
    7878 
    7979        self.shownAttribsLB = QListBox(hbox) 
     
    103103        # #################################### 
    104104        # settings tab 
    105         OWGUI.hSlider(self.SettingsTab, self, 'pointWidth', box=' Point Size ', minValue=1, maxValue=20, step=1, callback = self.setPointWidth) 
    106  
    107         box2 = OWGUI.widgetBox(self.SettingsTab, "Jittering Options") 
     105        OWGUI.hSlider(self.SettingsTab, self, 'pointWidth', box=' Point size ', minValue=1, maxValue=20, step=1, callback = self.setPointWidth) 
     106 
     107        box2 = OWGUI.widgetBox(self.SettingsTab, "Jittering options") 
    108108        box3 = OWGUI.widgetBox(box2, orientation = "horizontal") 
    109109        self.jitterLabel = QLabel('Jittering size (% of size)  ', box3) 
     
    111111        OWGUI.checkBox(box2, self, 'jitterContinuous', 'Jitter continuous attributes', callback = self.updateJitteringSettings, tooltip = "Does jittering apply also on continuous attributes?") 
    112112 
    113         box4 = OWGUI.widgetBox(self.SettingsTab, "General Graph Settings") 
     113        box4 = OWGUI.widgetBox(self.SettingsTab, "General graph settings") 
    114114        OWGUI.checkBox(box4, self, 'showAxisScale', 'Show axis scale', callback = self.updateSettings) 
    115115        OWGUI.checkBox(box4, self, 'showXaxisTitle', 'X axis title', callback = self.updateSettings) 
     
    145145    def createColorDialog(self): 
    146146        c = OWDlgs.ColorPalette(self, "Color Palette") 
    147         c.createDiscretePalette("Discrete Palette") 
     147        c.createDiscretePalette("Discrete palette") 
    148148        c.createContinuousPalette("contPalette", "Continuous palette") 
    149         box = c.createBox("otherColors", "Other Colors") 
     149        box = c.createBox("otherColors", "Other colors") 
    150150        c.createColorButton(box, "Canvas", "Canvas color", Qt.white) 
    151151        box.addSpace(5) 
     
    281281 
    282282    def saveToFileAccept(self): 
    283         qfileName = QFileDialog.getSaveFileName("graph.png","Portable Network Graphics (*.PNG);;Windows Bitmap (*.BMP);;Graphics Interchange Format (*.GIF)", None, "Save to..", "Save to..") 
     283        qfileName = QFileDialog.getSaveFileName("graph.png","Portable Network Graphics (*.PNG);;Windows Bitmap (*.BMP);;Graphics Interchange Format (*.GIF)", None, "Save to..", "Save to...") 
    284284        fileName = str(qfileName) 
    285285        if fileName == "": return 
  • orange/OrangeWidgets/Visualize/OWSieveDiagram.py

    r3483 r4016  
    6060         
    6161        #GUI 
    62         self.attrSelGroup = OWGUI.widgetBox(self.controlArea, box = "Shown Attributes") 
    63  
    64         self.attrXCombo = OWGUI.comboBoxWithCaption(self.attrSelGroup, self, "attrX", "X Attribute:", tooltip = "Select an attribute to be shown on the X axis", callback = self.updateData, sendSelectedValue = 1, valueType = str, labelWidth = 70) 
    65         self.attrYCombo = OWGUI.comboBoxWithCaption(self.attrSelGroup, self, "attrY", "Y Attribute:", tooltip = "Select an attribute to be shown on the Y axis", callback = self.updateData, sendSelectedValue = 1, valueType = str, labelWidth = 70) 
    66  
     62        self.attrSelGroup = OWGUI.widgetBox(self.controlArea, box = "Shown attributes") 
     63 
     64        self.attrXCombo = OWGUI.comboBoxWithCaption(self.attrSelGroup, self, "attrX", "X attribute:", tooltip = "Select an attribute to be shown on the X axis", callback = self.updateData, sendSelectedValue = 1, valueType = str, labelWidth = 70) 
     65        self.attrYCombo = OWGUI.comboBoxWithCaption(self.attrSelGroup, self, "attrY", "Y attribute:", tooltip = "Select an attribute to be shown on the Y axis", callback = self.updateData, sendSelectedValue = 1, valueType = str, labelWidth = 70) 
     66 
     67        OWGUI.separator(self.controlArea) 
     68         
    6769        self.conditionGroup = OWGUI.widgetBox(self.controlArea, box = "Condition") 
    6870        self.attrConditionCombo      = OWGUI.comboBoxWithCaption(self.conditionGroup, self, "attrCondition", "Attribute:", callback = self.updateConditionAttr, sendSelectedValue = 1, valueType = str, labelWidth = 70) 
    6971        self.attrConditionValueCombo = OWGUI.comboBoxWithCaption(self.conditionGroup, self, "attrConditionValue", "Value:", callback = self.updateData, sendSelectedValue = 1, valueType = str, labelWidth = 70) 
    7072 
    71  
    72         box2 = OWGUI.widgetBox(self.controlArea, box = "Visual Settings") 
    73         OWGUI.checkBox(box2, self, "showLines", "Show Lines", callback = self.updateData) 
     73        OWGUI.separator(self.controlArea) 
     74         
     75        box2 = OWGUI.widgetBox(self.controlArea, box = "Visual settings") 
     76        OWGUI.checkBox(box2, self, "showLines", "Show lines", callback = self.updateData) 
    7477        hbox = OWGUI.widgetBox(box2, orientation = "horizontal") 
    75         OWGUI.checkBox(hbox, self, "showCases", "Show Data Examples...", callback = self.updateData) 
    76         OWGUI.checkBox(hbox, self, "showInColor", "...In Color", callback = self.updateData) 
    77          
    78         self.interestingGroupBox = OWGUI.widgetBox(self.controlArea, box = "Interesting Attribute Pairs") 
     78        OWGUI.checkBox(hbox, self, "showCases", "Show data examples...", callback = self.updateData) 
     79        OWGUI.checkBox(hbox, self, "showInColor", "...in color", callback = self.updateData) 
     80 
     81        OWGUI.separator(self.controlArea) 
     82         
     83        self.interestingGroupBox = OWGUI.widgetBox(self.controlArea, box = "Interesting attribute pairs") 
    7984         
    8085        self.calculateButton = OWGUI.button(self.interestingGroupBox, self, "Calculate Chi Squares", callback = self.calculatePairs) 
     
    221226        if not (xAttr and yAttr): return         
    222227         
    223         if self.attrCondition == "[None]": 
     228        if self.attrCondition == "(None)": 
    224229            data = self.data.select([xAttr, yAttr]) 
    225230        else: 
     
    234239        self.attrConditionValueCombo.clear() 
    235240         
    236         if self.attrCondition == "[None]": 
     241        if self.attrCondition == "(None)": 
    237242            self.updateData() 
    238243            return 
     
    248253        self.attrYCombo.clear() 
    249254        self.attrConditionCombo.clear()         
    250         self.attrConditionCombo.insertItem("[None]") 
     255        self.attrConditionCombo.insertItem("(None)") 
    251256        self.attrConditionValueCombo.clear() 
    252257 
     
    329334 
    330335        # print graph name 
    331         if self.attrCondition == "[None]": 
     336        if self.attrCondition == "(None)": 
    332337            name  = "P(%s, %s) =\\= P(%s)*P(%s)" %(self.attrX, self.attrY, self.attrX, self.attrY) 
    333338        else: 
  • orange/OrangeWidgets/Visualize/OWSieveMultigram.py

    r3483 r4016  
    5858        self.createShowHiddenLists(self.GeneralTab, callback = self.interestingSubsetSelection) 
    5959         
    60         self.interestingButton = QPushButton("Find interesting attr.", self.GeneralTab) 
     60        self.interestingButton = QPushButton("Find Interesting Attr.", self.GeneralTab) 
    6161        self.connect(self.interestingButton, SIGNAL("clicked()"),self.interestingSubsetSelection)  
    6262 
     
    233233        self.residualLabel = QLabel('Max residual', self.hbox2) 
    234234        self.pearsonMaxResCombo = QComboBox(self.hbox2) 
    235         QToolTip.add(self.hbox2, "What is maximum expected Pearson standardized residual. Greater the maximum, brighter the colors.") 
     235        QToolTip.add(self.hbox2, "The maximum expected Pearson standardized residual. Greater the maximum, brighter the colors.") 
    236236 
    237237        self.hbox3 = QHBox(self.pearsonGroup, "minimum") 
    238238        self.residualLabel2 = QLabel('Min residual   ', self.hbox3) 
    239239        self.minResidualEdit = QLineEdit(self.hbox3) 
    240         QToolTip.add(self.hbox3, "What is minimal absolute residual value that will be shown in graph.") 
    241  
    242         self.applyButton = QPushButton("Apply changes", self) 
     240        QToolTip.add(self.hbox3, "The minimal absolute residual value that will be shown in graph.") 
     241 
     242        self.applyButton = QPushButton("&Apply", self) 
    243243 
    244244        self.initSettings()         
  • orange/OrangeWidgets/Visualize/OWSurveyPlot.py

    r3700 r4016  
    2323    settingsList = ["attrDiscOrder", "attrContOrder", "graph.globalValueScaling", "graph.exampleTracking", "graph.enabledLegend", 
    2424                    "graph.tooltipKind", "showAllAttributes", "colorSettings", "selectedSchemaIndex"] 
    25     attributeContOrder = ["None","ReliefF", "Fisher discriminant"] 
    26     attributeDiscOrder = ["None","ReliefF","GainRatio"] 
     25    attributeContOrder = ["Unordered","ReliefF", "Fisher discriminant"] 
     26    attributeDiscOrder = ["Unordered","ReliefF","GainRatio"] 
    2727 
    2828    def __init__(self,parent=None, signalManager = None): 
     
    4646        self.graph.enabledLegend = 1 
    4747        self.graph.tooltipKind = 1 
    48         self.attrDiscOrder = "None" 
    49         self.attrContOrder = "None" 
     48        self.attrDiscOrder = "Unordered" 
     49        self.attrContOrder = "Unordered" 
    5050        self.attributeSelectionList = None 
    5151        self.graphCanvasColor = str(Qt.white.name()) 
     
    7676        box = OWGUI.widgetBox(self.SettingsTab, "Visual settings") 
    7777        OWGUI.checkBox(box, self, "graph.globalValueScaling", "Global value scaling", callback = self.setGlobalValueScaling) 
    78         OWGUI.checkBox(box, self, "graph.exampleTracking", "Enable example tracking", callback = self.updateGraph) 
     78        OWGUI.checkBox(box, self, "graph.exampleTracking", "Example tracking", callback = self.updateGraph) 
    7979        OWGUI.checkBox(box, self, "graph.enabledLegend", "Show legend", callback = self.updateGraph) 
    8080 
     
    8383 
    8484        box = OWGUI.widgetBox(self.SettingsTab, "Tooltips settings") 
    85         OWGUI.comboBox(box, self, "graph.tooltipKind", items = ["Don't show tooltips", "Show visible attributes", "Show all attributes"], callback = self.updateGraph) 
     85        OWGUI.comboBox(box, self, "graph.tooltipKind", items = ["Don't Show Tooltips", "Show Visible Attributes", "Show All Attributes"], callback = self.updateGraph) 
    8686 
    8787        self.colorButtonsBox = OWGUI.widgetBox(self.SettingsTab, "Colors", orientation = "horizontal") 
     
    9292        # add a settings dialog and initialize its values 
    9393        self.activateLoadedSettings() 
    94         self.resize(700,700) 
     94        self.resize(750,700) 
    9595 
    9696        # this is needed so that the tabs are wide enough! 
Note: See TracChangeset for help on using the changeset viewer.