Ignore:
Timestamp:
06/10/13 14:20:29 (10 months ago)
Author:
Martin Frlin <martin.frlin@…>
Branch:
default
Parents:
11672:abbe39492734 (diff), 11591:05936ca5105f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged biolab/orange into default

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Orange/OrangeWidgets/Data/OWPaintData.py

    r11575 r11673  
    723723        self.classVariable = orange.EnumVariable("Class label", values=["Class 1", "Class 2"], baseValue=0) 
    724724 
    725         ur = OWGUI.widgetBox(self.controlArea, "Undo / Redo") 
    726         undo = QAction("Undo", self) 
    727         undo.pyqtConfigure(toolTip="Undo action") 
    728         self.connect(undo, SIGNAL("triggered()"), self.undoAction) 
    729  
    730         redo = QAction("Redo", self) 
    731         redo.pyqtConfigure(toolTip="Redo action") 
    732         self.connect(redo, SIGNAL("triggered()"), self.redoAction) 
    733  
    734         actionsWidget =  ModelActionsWidget([undo, redo], self) 
    735         actionsWidget.layout().addStretch(10) 
    736         actionsWidget.layout().setSpacing(1) 
    737  
    738         ur.layout().addWidget(actionsWidget) 
    739  
    740725        w = OWGUI.widgetBox(self.controlArea, "Class Label") 
    741726         
     
    794779        self.toolsStackCache = {} 
    795780        optionsbox = OWGUI.widgetBox(self.controlArea, "Options", orientation=self.optionsLayout) 
    796          
    797 #        OWGUI.checkBox(self.controlArea, self, "addClassAsMeta", "Add class ids as meta attributes") 
     781 
     782 
     783        ur = OWGUI.widgetBox(self.controlArea, "") 
     784        undo = QAction("Undo", self) 
     785        undo.pyqtConfigure(toolTip="Undo action") 
     786        undo.setShortcut("Ctrl+Z") 
     787        self.connect(undo, SIGNAL("triggered()"), self.undoAction) 
     788 
     789        redo = QAction("Redo", self) 
     790        redo.pyqtConfigure(toolTip="Redo action") 
     791        redo.setShortcut("Ctrl+Shift+Z") 
     792        self.connect(redo, SIGNAL("triggered()"), self.redoAction) 
     793 
     794        actionsWidget =  ModelActionsWidget([undo, redo], self) 
     795        actionsWidget.layout().addStretch(10) 
     796        actionsWidget.layout().setSpacing(1) 
     797 
     798        ur.layout().addWidget(actionsWidget) 
     799 
    798800        OWGUI.rubber(self.controlArea) 
    799801        box = OWGUI.widgetBox(self.controlArea, "Commit") 
  • Orange/OrangeWidgets/Data/OWPaintData.py

    r11672 r11673  
    922922        # if we start updating from previously undone actions, we cut off redos in our history 
    923923        if not self.historyCounter == len(self.dataHistory)-1: 
    924             self.dataHistory = self.dataHistory[0:self.historyCounter+1] 
     924            self.dataHistory = self.dataHistory[:self.historyCounter+1] 
    925925        # append an update of labels and data 
    926926        labels = list(self.classValuesModel) 
     
    947947            # if not, update data 
    948948            else: 
    949                 self.graph.data = data 
     949                self.graph.data = copy.deepcopy(data) 
    950950                self.graph.updateGraph() 
    951951            self.updateHistoryBool = True 
     
    962962                self.addNewClassLabel() 
    963963            else: 
    964                 self.graph.data = data 
     964                self.graph.data = copy.deepcopy(data) 
    965965                self.graph.updateGraph() 
    966966            self.updateHistoryBool = True 
Note: See TracChangeset for help on using the changeset viewer.