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
7edb74b1
Commit
7edb74b1
authored
Aug 06, 2012
by
Guillaume Seguin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove try: except: pass around status check
parent
f68636bb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
43 deletions
+40
-43
pronterface.py
pronterface.py
+40
-43
No files found.
pronterface.py
View file @
7edb74b1
...
@@ -1333,51 +1333,48 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
...
@@ -1333,51 +1333,48 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self
.
logbox
.
Clear
()
self
.
logbox
.
Clear
()
def
statuschecker
(
self
):
def
statuschecker
(
self
):
try
:
while
self
.
statuscheck
:
while
self
.
statuscheck
:
string
=
""
string
=
""
wx
.
CallAfter
(
self
.
tempdisp
.
SetLabel
,
self
.
tempreport
.
strip
()
.
replace
(
"ok "
,
""
))
wx
.
CallAfter
(
self
.
tempdisp
.
SetLabel
,
self
.
tempreport
.
strip
()
.
replace
(
"ok "
,
""
))
try
:
#self.hottgauge.SetValue(parse_temperature_report(self.tempreport, "T:"))
wx
.
CallAfter
(
self
.
graph
.
SetExtruder0Temperature
,
parse_temperature_report
(
self
.
tempreport
,
"T:"
))
#self.bedtgauge.SetValue(parse_temperature_report(self.tempreport, "B:"))
wx
.
CallAfter
(
self
.
graph
.
SetBedTemperature
,
parse_temperature_report
(
self
.
tempreport
,
"B:"
))
except
:
pass
fractioncomplete
=
0.0
if
self
.
sdprinting
:
fractioncomplete
=
float
(
self
.
percentdone
/
100.0
)
string
+=
_
(
" SD printing:
%04.2
f
%%
"
)
%
(
self
.
percentdone
,)
if
self
.
p
.
printing
:
fractioncomplete
=
float
(
self
.
p
.
queueindex
)
/
len
(
self
.
p
.
mainqueue
)
string
+=
_
(
" Printing:
%04.2
f
%%
|"
)
%
(
100
*
float
(
self
.
p
.
queueindex
)
/
len
(
self
.
p
.
mainqueue
),)
string
+=
_
(
" Line#
%
d of
%
d lines |"
)
%
(
self
.
p
.
queueindex
,
len
(
self
.
p
.
mainqueue
))
if
fractioncomplete
>
0.0
:
secondselapsed
=
int
(
time
.
time
()
-
self
.
starttime
+
self
.
extra_print_time
)
secondsestimate
=
secondselapsed
/
fractioncomplete
secondsremain
=
secondsestimate
-
secondselapsed
string
+=
_
(
" Est:
%
s of
%
s remaining | "
)
%
(
format_time
(
secondsremain
),
format_time
(
secondsestimate
))
string
+=
_
(
" Z:
%0.2
f mm"
)
%
self
.
curlayer
wx
.
CallAfter
(
self
.
status
.
SetStatusText
,
string
)
wx
.
CallAfter
(
self
.
gviz
.
Refresh
)
if
(
self
.
monitor
and
self
.
p
.
online
):
if
self
.
sdprinting
:
self
.
p
.
send_now
(
"M27"
)
if
not
hasattr
(
self
,
"auto_monitor_pattern"
):
self
.
auto_monitor_pattern
=
re
.
compile
(
r"(ok\s+)?T:[\d\.]+(\s+B:[\d\.]+)?(\s+@:[\d\.]+)?\s*"
)
self
.
capture_skip
[
self
.
auto_monitor_pattern
]
=
self
.
capture_skip
.
setdefault
(
self
.
auto_monitor_pattern
,
0
)
+
1
self
.
p
.
send_now
(
"M105"
)
time
.
sleep
(
self
.
monitor_interval
)
while
not
self
.
sentlines
.
empty
():
try
:
try
:
#self.hottgauge.SetValue(parse_temperature_report(self.tempreport, "T:"))
gc
=
self
.
sentlines
.
get_nowait
()
wx
.
CallAfter
(
self
.
graph
.
SetExtruder0Temperature
,
parse_temperature_report
(
self
.
tempreport
,
"T:"
))
wx
.
CallAfter
(
self
.
gviz
.
addgcode
,
gc
,
1
)
#self.bedtgauge.SetValue(parse_temperature_report(self.tempreport, "B:"))
wx
.
CallAfter
(
self
.
graph
.
SetBedTemperature
,
parse_temperature_report
(
self
.
tempreport
,
"B:"
))
except
:
except
:
pass
break
fractioncomplete
=
0.0
wx
.
CallAfter
(
self
.
status
.
SetStatusText
,
_
(
"Not connected to printer."
))
if
self
.
sdprinting
:
fractioncomplete
=
float
(
self
.
percentdone
/
100.0
)
string
+=
_
(
" SD printing:
%04.2
f
%%
"
)
%
(
self
.
percentdone
,)
if
self
.
p
.
printing
:
fractioncomplete
=
float
(
self
.
p
.
queueindex
)
/
len
(
self
.
p
.
mainqueue
)
string
+=
_
(
" Printing:
%04.2
f
%%
|"
)
%
(
100
*
float
(
self
.
p
.
queueindex
)
/
len
(
self
.
p
.
mainqueue
),)
string
+=
_
(
" Line#
%
d of
%
d lines |"
)
%
(
self
.
p
.
queueindex
,
len
(
self
.
p
.
mainqueue
))
if
fractioncomplete
>
0.0
:
secondselapsed
=
int
(
time
.
time
()
-
self
.
starttime
+
self
.
extra_print_time
)
secondsestimate
=
secondselapsed
/
fractioncomplete
secondsremain
=
secondsestimate
-
secondselapsed
string
+=
_
(
" Est:
%
s of
%
s remaining | "
)
%
(
format_time
(
secondsremain
),
format_time
(
secondsestimate
))
string
+=
_
(
" Z:
%0.2
f mm"
)
%
self
.
curlayer
wx
.
CallAfter
(
self
.
status
.
SetStatusText
,
string
)
wx
.
CallAfter
(
self
.
gviz
.
Refresh
)
if
(
self
.
monitor
and
self
.
p
.
online
):
if
self
.
sdprinting
:
self
.
p
.
send_now
(
"M27"
)
if
not
hasattr
(
self
,
"auto_monitor_pattern"
):
self
.
auto_monitor_pattern
=
re
.
compile
(
r"(ok\s+)?T:[\d\.]+(\s+B:[\d\.]+)?(\s+@:[\d\.]+)?\s*"
)
self
.
capture_skip
[
self
.
auto_monitor_pattern
]
=
self
.
capture_skip
.
setdefault
(
self
.
auto_monitor_pattern
,
0
)
+
1
self
.
p
.
send_now
(
"M105"
)
time
.
sleep
(
self
.
monitor_interval
)
while
not
self
.
sentlines
.
empty
():
try
:
gc
=
self
.
sentlines
.
get_nowait
()
wx
.
CallAfter
(
self
.
gviz
.
addgcode
,
gc
,
1
)
except
:
break
wx
.
CallAfter
(
self
.
status
.
SetStatusText
,
_
(
"Not connected to printer."
))
except
:
pass
#if window has been closed
def
capture
(
self
,
func
,
*
args
,
**
kwargs
):
def
capture
(
self
,
func
,
*
args
,
**
kwargs
):
stdout
=
sys
.
stdout
stdout
=
sys
.
stdout
...
...
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