Skip to content

Commit 1bb716b

Browse files
committed
test all branches with travis
1 parent a040b0c commit 1bb716b

2 files changed

Lines changed: 19 additions & 19 deletions

File tree

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ script:
3131
after_success:
3232
- coveralls
3333

34-
branches:
35-
only:
36-
- master
37-
- "3.0"
38-
- "2.3"
34+
# branches:
35+
# only:
36+
# - master
37+
# - "3.0"
38+
# - "2.3"

ete3/treeview/node_gui_actions.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,32 +93,32 @@ def __init__(self):
9393
def mouseReleaseEvent(self, e):
9494
if not self.node:
9595
return
96-
96+
9797
if e.button() == QtCore.Qt.RightButton:
9898
self.showActionPopup()
9999
elif e.button() == QtCore.Qt.LeftButton:
100100
self.scene().view.set_focus(self.node)
101-
101+
102102
if isinstance(self.node, EvolTree) and self.node.get_tree_root()._is_mark_mode():
103103
root = self.node.get_tree_root()
104104
all_marks = set([getattr(n, "mark", '').replace('#', '').strip()
105-
for n in root.traverse() if n is not self.node])
105+
for n in root.traverse() if n is not self.node])
106106
all_marks.discard('')
107-
107+
108108
max_value = max(map(int, all_marks)) if all_marks else 0
109-
109+
110110
current_mark = getattr(self.node, "mark", "")
111111
try:
112112
current_mark = int(current_mark.replace('#', ''))
113113
except:
114114
current_mark = 0
115-
115+
116116
if current_mark > max_value:
117117
self._gui_unmark_node()
118118
else:
119119
self._gui_mark_node('#%d'% (current_mark + 1))
120-
121-
120+
121+
122122
#self.scene().view.prop_table.update_properties(self.node)
123123

124124

@@ -146,7 +146,7 @@ def mouseDoubleClickEvent(self,e):
146146
self.scene().view.highlight_node(self.node, fullRegion=True,
147147
bg=random_color(l=0.5, s=0.5), permanent=True)
148148

149-
149+
150150

151151
def showActionPopup(self):
152152
contextMenu = QtGui.QMenu()
@@ -178,23 +178,23 @@ def showActionPopup(self):
178178
for n in root.traverse() if n is not self.node])
179179
all_marks.discard('')
180180
max_value = max(map(int, all_marks)) if all_marks else 1
181-
181+
182182
current_mark = getattr(self.node, "mark", '').replace('#', '').strip()
183183
current_mark = int(current_mark) if current_mark != '' else 0
184-
184+
185185
if current_mark <= max_value:
186186
mark = "#%d" %(current_mark + 1)
187187
contextMenu.addAction("ETE-evol: mark node as " + mark, partial(
188188
self._gui_mark_node, mark))
189189
contextMenu.addAction("ETE-evol: mark group as " + mark, partial(
190190
self._gui_mark_group, mark))
191-
191+
192192
if getattr(self.node, "mark", None):
193193
contextMenu.addAction("ETE-evol: clear mark in node", partial(
194194
self._gui_unmark_node))
195195
contextMenu.addAction("ETE-evol: clear mark in group", partial(
196196
self._gui_unmark_group))
197-
197+
198198

199199
contextMenu.addAction( "Show newick", self.show_newick)
200200
contextMenu.exec_(QtGui.QCursor.pos())
@@ -207,7 +207,7 @@ def _gui_mark_node(self, mark=None):
207207
mark = '#1'
208208
self.node.mark_tree([self.node.node_id], marks=[mark])
209209
self.scene().GUI.redraw()
210-
210+
211211

212212
def _gui_unmark_node(self):
213213
self.node.mark = ""

0 commit comments

Comments
 (0)