Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
Printrun
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
Printrun
Commits
eddb60dc
Commit
eddb60dc
authored
Sep 02, 2012
by
Guillaume Seguin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix imports of stlview and projectlayer
parent
ffd655d8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
plater.py
plater.py
+1
-1
pronterface.py
pronterface.py
+2
-2
No files found.
plater.py
View file @
eddb60dc
...
@@ -35,7 +35,7 @@ from printrun.printrun_utils import pixmapfile
...
@@ -35,7 +35,7 @@ from printrun.printrun_utils import pixmapfile
glview
=
False
glview
=
False
if
"-nogl"
not
in
sys
.
argv
:
if
"-nogl"
not
in
sys
.
argv
:
try
:
try
:
import
stlview
from
printrun
import
stlview
glview
=
True
glview
=
True
except
:
except
:
pass
pass
...
...
pronterface.py
View file @
eddb60dc
...
@@ -410,7 +410,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
...
@@ -410,7 +410,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
return
baselist
+
glob
.
glob
(
'/dev/ttyUSB*'
)
+
glob
.
glob
(
'/dev/ttyACM*'
)
+
glob
.
glob
(
"/dev/tty.*"
)
+
glob
.
glob
(
"/dev/cu.*"
)
+
glob
.
glob
(
"/dev/rfcomm*"
)
return
baselist
+
glob
.
glob
(
'/dev/ttyUSB*'
)
+
glob
.
glob
(
'/dev/ttyACM*'
)
+
glob
.
glob
(
"/dev/tty.*"
)
+
glob
.
glob
(
"/dev/cu.*"
)
+
glob
.
glob
(
"/dev/rfcomm*"
)
def
project
(
self
,
event
):
def
project
(
self
,
event
):
import
projectlayer
from
printrun
import
projectlayer
if
(
self
.
p
.
online
):
if
(
self
.
p
.
online
):
projectlayer
.
setframe
(
self
,
self
.
p
)
.
Show
()
projectlayer
.
setframe
(
self
,
self
.
p
)
.
Show
()
else
:
else
:
...
@@ -785,7 +785,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
...
@@ -785,7 +785,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self
.
gviz
.
showall
=
1
self
.
gviz
.
showall
=
1
try
:
try
:
raise
""
raise
""
import
stlview
from
printrun
import
stlview
self
.
gwindow
=
stlview
.
GCFrame
(
None
,
wx
.
ID_ANY
,
'Gcode view, shift to move view, mousewheel to set layer'
,
size
=
(
600
,
600
))
self
.
gwindow
=
stlview
.
GCFrame
(
None
,
wx
.
ID_ANY
,
'Gcode view, shift to move view, mousewheel to set layer'
,
size
=
(
600
,
600
))
except
:
except
:
self
.
gwindow
=
gviz
.
window
([],
self
.
gwindow
=
gviz
.
window
([],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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