Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
OpenGEODE
Commits
c489f3fa
Commit
c489f3fa
authored
Mar 13, 2016
by
Maxime Perrotin
Browse files
Rename class variable to avoid ambiguity
parent
cbb7ca9c
Changes
1
Hide whitespace changes
Inline
Side-by-side
opengeode/opengeode.py
View file @
c489f3fa
...
...
@@ -1281,7 +1281,7 @@ class SDL_View(QtGui.QGraphicsView, object):
# Toolbar with the icons of the SDL symbols
self
.
toolbar
=
None
# Scene stack (used for nested symbols)
self
.
par
en
t
_s
cene
=
[]
self
.
sc
en
e
_s
tack
=
[]
# Set of PR files that are not saved back (e.g. system structure)
self
.
readonly_pr
=
None
# Context history referencing the AST entry corresponding to the scene
...
...
@@ -1335,7 +1335,7 @@ class SDL_View(QtGui.QGraphicsView, object):
self
.
lander
=
Lander
.
Lander
(
self
.
lander_scene
)
horpos
=
self
.
horizontalScrollBar
().
value
()
verpos
=
self
.
verticalScrollBar
().
value
()
self
.
par
en
t
_s
cene
.
append
((
self
.
scene
(),
horpos
,
verpos
))
self
.
sc
en
e
_s
tack
.
append
((
self
.
scene
(),
horpos
,
verpos
))
self
.
scene
().
clear_focus
()
self
.
setScene
(
self
.
lander_scene
)
self
.
up_button
.
setEnabled
(
True
)
...
...
@@ -1426,13 +1426,13 @@ class SDL_View(QtGui.QGraphicsView, object):
self
.
scene
().
clear_focus
()
# Scene may need to be informed when it is left:
self
.
scene
().
scene_left
.
emit
()
scene
,
horpos
,
verpos
=
self
.
par
en
t
_s
cene
.
pop
()
scene
,
horpos
,
verpos
=
self
.
sc
en
e
_s
tack
.
pop
()
self
.
setScene
(
scene
)
self
.
wrapping_window
.
setWindowTitle
(
self
.
scene
().
name
)
self
.
horizontalScrollBar
().
setSliderPosition
(
horpos
)
self
.
verticalScrollBar
().
setSliderPosition
(
verpos
)
#
self.horizontalScrollBar().setSliderPosition(horpos)
#
self.verticalScrollBar().setSliderPosition(verpos)
self
.
set_toolbar
()
if
not
self
.
par
en
t
_s
cene
:
if
not
self
.
sc
en
e
_s
tack
:
self
.
up_button
.
setEnabled
(
False
)
self
.
refresh
()
self
.
horizontalScrollBar
().
setSliderPosition
(
horpos
)
...
...
@@ -1482,7 +1482,7 @@ class SDL_View(QtGui.QGraphicsView, object):
horpos
=
self
.
horizontalScrollBar
().
value
()
verpos
=
self
.
verticalScrollBar
().
value
()
self
.
scene
().
name
=
self
.
wrapping_window
.
windowTitle
()
self
.
par
en
t
_s
cene
.
append
((
self
.
scene
(),
horpos
,
verpos
))
self
.
sc
en
e
_s
tack
.
append
((
self
.
scene
(),
horpos
,
verpos
))
self
.
scene
().
clear_focus
()
self
.
setScene
(
scene
)
self
.
scene
().
name
=
name
+
'[*]'
...
...
@@ -1558,8 +1558,8 @@ class SDL_View(QtGui.QGraphicsView, object):
+
'.autosave'
)
if
autosave
else
self
.
filename
# If the current scene is a nested one, save the top parent
if
self
.
par
en
t
_s
cene
:
scene
=
self
.
par
en
t
_s
cene
[
0
][
0
]
if
self
.
sc
en
e
_s
tack
:
scene
=
self
.
sc
en
e
_s
tack
[
0
][
0
]
else
:
scene
=
self
.
scene
()
...
...
@@ -1699,8 +1699,8 @@ class SDL_View(QtGui.QGraphicsView, object):
def
is_model_clean
(
self
):
''' Check recursively if anything has changed in any scene '''
if
self
.
par
en
t
_s
cene
:
scene
=
self
.
par
en
t
_s
cene
[
0
][
0
]
if
self
.
sc
en
e
_s
tack
:
scene
=
self
.
sc
en
e
_s
tack
[
0
][
0
]
else
:
scene
=
self
.
scene
()
for
each
in
chain
([
scene
],
scene
.
all_nested_scenes
):
...
...
@@ -1733,7 +1733,7 @@ class SDL_View(QtGui.QGraphicsView, object):
if
not
self
.
propose_to_save
():
return
False
self
.
need_new_scene
.
emit
()
self
.
par
en
t
_s
cene
=
[]
self
.
sc
en
e
_s
tack
=
[]
self
.
scene
().
undo_stack
.
clear
()
#self.scene().clear()
G_SYMBOLS
.
clear
()
...
...
@@ -1748,8 +1748,8 @@ class SDL_View(QtGui.QGraphicsView, object):
def
check_model
(
self
):
''' Parse the model and check for warnings and errors '''
# If the current scene is a nested one, save the top parent
if
self
.
par
en
t
_s
cene
:
scene
=
self
.
par
en
t
_s
cene
[
0
][
0
]
if
self
.
sc
en
e
_s
tack
:
scene
=
self
.
sc
en
e
_s
tack
[
0
][
0
]
else
:
scene
=
self
.
scene
()
...
...
@@ -1829,8 +1829,8 @@ class SDL_View(QtGui.QGraphicsView, object):
def
generate_ada
(
self
):
''' Generate Ada code '''
# If the current scene is a nested one, move to the top parent
if
self
.
par
en
t
_s
cene
:
scene
=
self
.
par
en
t
_s
cene
[
0
][
0
]
if
self
.
sc
en
e
_s
tack
:
scene
=
self
.
sc
en
e
_s
tack
[
0
][
0
]
else
:
scene
=
self
.
scene
()
pr_raw
=
Pr
.
parse_scene
(
scene
,
full_model
=
True
...
...
@@ -2016,8 +2016,8 @@ class OG_MainWindow(QtGui.QMainWindow, object):
Here we check if the Statechart tab is selected, and we draw/refresh
the statechart automatically in that case '''
if
mdi
==
self
.
statechart_mdi
and
graphviz
:
if
self
.
view
.
par
en
t
_s
cene
:
scene
=
self
.
view
.
par
en
t
_s
cene
[
0
][
0
]
if
self
.
view
.
sc
en
e
_s
tack
:
scene
=
self
.
view
.
sc
en
e
_s
tack
[
0
][
0
]
else
:
scene
=
self
.
view
.
scene
()
try
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment