Skip to content

Commit 9ea919b

Browse files
author
Ram Rachum
committed
-
1 parent e583dcf commit 9ea919b

File tree

2 files changed

+88
-98
lines changed

2 files changed

+88
-98
lines changed

‎garlicsim.wpu‎

Lines changed: 66 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -139,42 +139,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
139139
'notebook_percent': 0.0,
140140
'override_title': None,
141141
'pagelist': [],
142-
'primary_view_state': {'editor_states': {'bookmarks': ([(loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/seek_bar.py'),
143-
{'attrib-starts': [('SeekBar',
144-
18),
145-
('SeekBar.on_mouse_event',
146-
161)],
147-
'first-line': 161,
142+
'primary_view_state': {'editor_states': {'bookmarks': ([(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
143+
{'attrib-starts': [('Frame',
144+
32),
145+
('Frame.__organize_workspace_widgets',
146+
245)],
147+
'first-line': 225,
148148
'folded-linenos': [],
149-
'sel-line': 184,
150-
'sel-line-start': 6774,
151-
'selection_end': 6774,
152-
'selection_start': 6774},
153-
1264000123.937),
154-
(loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/seek_bar.py'),
155-
{'attrib-starts': [('SeekBar',
156-
18),
157-
('SeekBar.on_mouse_event',
158-
161)],
159-
'first-line': 191,
160-
'folded-linenos': [],
161-
'sel-line': 174,
162-
'sel-line-start': 6375,
163-
'selection_end': 6375,
164-
'selection_start': 6375},
165-
1264000124.2030001),
166-
(loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
167-
{'attrib-starts': [('Frame',
168-
32),
169-
('Frame.__organize_workspace_widgets',
170-
245)],
171-
'first-line': 225,
172-
'folded-linenos': [],
173-
'sel-line': 246,
174-
'sel-line-start': 8334,
175-
'selection_end': 8342,
176-
'selection_start': 8342},
177-
1264000284.796),
149+
'sel-line': 246,
150+
'sel-line-start': 8334,
151+
'selection_end': 8342,
152+
'selection_start': 8342},
153+
1264000284.796),
178154
(loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/framemanager.py'),
179155
{'attrib-starts': [('AuiManager',
180156
3309),
@@ -373,9 +349,33 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
373349
'sel-line-start': 276748,
374350
'selection_end': 276748,
375351
'selection_start': 276748},
376-
1264110791.687]],
352+
1264110791.687],
353+
(loc('garlicsim_wx/garlicsim_wx/gui_project.py'),
354+
{'attrib-starts': [('GuiProject',
355+
30),
356+
('GuiProject.__init_gui',
357+
118)],
358+
'first-line': 114,
359+
'folded-linenos': [],
360+
'sel-line': 128,
361+
'sel-line-start': 4273,
362+
'selection_end': 4277,
363+
'selection_start': 4277},
364+
1264110957.4679999),
365+
[loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'),
366+
{'attrib-starts': [('TreeBrowser',
367+
26),
368+
('TreeBrowser.on_paint',
369+
70)],
370+
'first-line': 66,
371+
'folded-linenos': [],
372+
'sel-line': 84,
373+
'sel-line-start': 2849,
374+
'selection_end': 2849,
375+
'selection_start': 2849},
376+
1264110985.109]],
377377
19),
378-
'current-loc': loc('garlicsim_wx/garlicsim_wx/gui_project.py'),
378+
'current-loc': loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'),
379379
'editor-states': {loc('garlicsim/garlicsim/general_misc/queue_tools.py'): {''\
380380
'attrib-starts': [('iterate',
381381
21)],
@@ -399,14 +399,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
399399
loc('garlicsim_wx/garlicsim_wx/gui_project.py'): {''\
400400
'attrib-starts': [('GuiProject',
401401
30),
402-
('GuiProject.make_initial_dialog',
403-
139)],
402+
('GuiProject.__init_gui',
403+
118)],
404404
'first-line': 114,
405405
'folded-linenos': [],
406-
'sel-line': 144,
407-
'sel-line-start': 4821,
408-
'selection_end': 4821,
409-
'selection_start': 4821},
406+
'sel-line': 128,
407+
'sel-line-start': 4273,
408+
'selection_end': 4277,
409+
'selection_start': 4277},
410410
loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widget.py'): {''\
411411
'attrib-starts': [('WorkspaceWidget',
412412
6),
@@ -430,27 +430,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
430430
'selection_end': 6375,
431431
'selection_start': 6375},
432432
loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'): {''\
433-
'attrib-starts': [('TreeBrowser',
434-
26),
435-
('TreeBrowser.on_paint',
436-
70)],
437-
'first-line': 66,
438-
'folded-linenos': [],
439-
'sel-line': 84,
440-
'sel-line-start': 2849,
441-
'selection_end': 2849,
442-
'selection_start': 2849},
443-
loc('../../../../../Python26/Lib/site-packages/wx/_core.py'): {''\
444-
'attrib-starts': [('Window',
445-
8420),
446-
('Window.PushEventHandler',
447-
9499)],
448-
'first-line': 9490,
449-
'folded-linenos': [],
450-
'sel-line': 9507,
451-
'sel-line-start': 355615,
452-
'selection_end': 355683,
453-
'selection_start': 355683},
433+
'attrib-starts': [('NiftyPaintDC',
434+
141),
435+
('NiftyPaintDC.draw_tree',
436+
248)],
437+
'first-line': 228,
438+
'folded-linenos': [],
439+
'sel-line': 254,
440+
'sel-line-start': 8369,
441+
'selection_end': 8380,
442+
'selection_start': 8380},
454443
loc('../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/framemanager.py'): {''\
455444
'attrib-starts': [],
456445
'first-line': 93,
@@ -462,11 +451,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
462451
'has-focus': True},
463452
'open_files': [u'garlicsim_wx/garlicsim_wx/widgets/workspace_widget.py',
464453
u'garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/seek_bar.py',
465-
u'garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py',
466454
u'../../../../../Python26/Lib/site-packages/wx/lib/agw/aui/framemanager.py',
467455
u'garlicsim/garlicsim/general_misc/queue_tools.py',
468456
u'garlicsim_wx/garlicsim_wx/frame/frame.py',
469-
u'garlicsim_wx/garlicsim_wx/gui_project.py']},
457+
u'garlicsim_wx/garlicsim_wx/gui_project.py',
458+
u'garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py']},
470459
'split_percents': {0: 0.5},
471460
'splits': 1,
472461
'tab_location': 'top',
@@ -842,7 +831,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
842831
'user_data': {'origin-window': 'yZ2qXe8ceW6MqtuWo8cELPLG2V'\
843832
'vxKCCZ'}},
844833
'window-alloc': None}]}
845-
guimgr.recent-documents = [loc('../../../../../Python26/Lib/site-packages/wx/_core.py'),
834+
guimgr.recent-documents = [loc('garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py'),
846835
loc('garlicsim_wx/garlicsim_wx/gui_project.py'),
847836
loc('garlicsim_wx/garlicsim_wx/frame/frame.py'),
848837
loc('garlicsim/garlicsim/general_misc/queue_tools.py')]
@@ -2246,16 +2235,16 @@ guimgr.visual-state = {loc('../../../Local Settings/Application Data/Wing IDE 3/
22462235
'selection_end': 68496,
22472236
'selection_start': 68496},
22482237
loc('../../../../../Python26/Lib/site-packages/wx/_core.py'): {''\
2249-
'attrib-starts': [('PyApp',
2250-
7160),
2251-
('PyApp.MainLoop',
2252-
7295)],
2253-
'first-line': 7445,
2254-
'folded-linenos': [],
2255-
'sel-line': 7302,
2256-
'sel-line-start': 276748,
2257-
'selection_end': 276748,
2258-
'selection_start': 276748},
2238+
'attrib-starts': [('Window',
2239+
8420),
2240+
('Window.PushEventHandler',
2241+
9499)],
2242+
'first-line': 9484,
2243+
'folded-linenos': [],
2244+
'sel-line': 9511,
2245+
'sel-line-start': 355796,
2246+
'selection_end': 355837,
2247+
'selection_start': 355837},
22592248
loc('../../../../../Python26/Lib/site-packages/wx/_gdi.py'): {''\
22602249
'attrib-starts': [('ClientDC',
22612250
4751)],

‎garlicsim_wx/garlicsim_wx/widgets/workspace_widgets_warehouse/tree_browser/tree_browser.py‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -254,27 +254,28 @@ def draw_tree(self, tree):
254254
root!
255255
'''
256256

257-
self.clickable_map = {}
258-
self.active_node = self.gui_project.active_node
259-
try:
260-
self.active_soft_block = self.active_node.soft_get_block()
261-
except AttributeError:
262-
self.active_soft_block = None
263-
264-
sizes = []
265-
pos = vectorish.add((connector_length, connector_length), self.origin)
266-
for root in tree.roots:
267-
size = self.draw_sub_tree(
268-
pos,
269-
tree,
270-
root.soft_get_block()
271-
)
272-
pos = vectorish.add(pos, (size[0], 0))
273-
sizes.append(size)
274-
275-
width = sum(size[0] for size in sizes) + (connector_length * len(sizes))
276-
height = max(size[1] for size in sizes) + connector_length
277-
return (self.clickable_map, (width, height))
257+
if self.gui_project:
258+
self.clickable_map = {}
259+
self.active_node = self.gui_project.active_node
260+
try:
261+
self.active_soft_block = self.active_node.soft_get_block()
262+
except AttributeError:
263+
self.active_soft_block = None
264+
265+
sizes = []
266+
pos = vectorish.add((connector_length, connector_length), self.origin)
267+
for root in tree.roots:
268+
size = self.draw_sub_tree(
269+
pos,
270+
tree,
271+
root.soft_get_block()
272+
)
273+
pos = vectorish.add(pos, (size[0], 0))
274+
sizes.append(size)
275+
276+
width = sum(size[0] for size in sizes) + (connector_length * len(sizes))
277+
height = max(size[1] for size in sizes) + connector_length
278+
return (self.clickable_map, (width, height))
278279

279280

280281
'''

0 commit comments

Comments
 (0)