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
f8b7a52c
Commit
f8b7a52c
authored
Sep 05, 2012
by
Guillaume Seguin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Whitespace cleanup (extra newlines) on graph.py
parent
37a442e6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
12 deletions
+0
-12
graph.py
printrun/graph.py
+0
-12
No files found.
printrun/graph.py
View file @
f8b7a52c
...
@@ -51,13 +51,10 @@ class Graph(BufferedCanvas):
...
@@ -51,13 +51,10 @@ class Graph(BufferedCanvas):
self
.
_lastyvalue
=
0
self
.
_lastyvalue
=
0
#self.sizer = wx.BoxSizer(wx.HORIZONTAL)
#self.sizer = wx.BoxSizer(wx.HORIZONTAL)
#self.sizer.Add(wx.Button(self, -1, "Button1", (0, 0)))
#self.sizer.Add(wx.Button(self, -1, "Button1", (0, 0)))
#self.SetSizer(self.sizer)
#self.SetSizer(self.sizer)
def
OnPaint
(
self
,
evt
):
def
OnPaint
(
self
,
evt
):
dc
=
wx
.
PaintDC
(
self
)
dc
=
wx
.
PaintDC
(
self
)
gc
=
wx
.
GraphicsContext
.
Create
(
dc
)
gc
=
wx
.
GraphicsContext
.
Create
(
dc
)
...
@@ -66,7 +63,6 @@ class Graph(BufferedCanvas):
...
@@ -66,7 +63,6 @@ class Graph(BufferedCanvas):
#call the super method
#call the super method
super
(
wx
.
Panel
,
self
)
.
Destroy
()
super
(
wx
.
Panel
,
self
)
.
Destroy
()
def
updateTemperatures
(
self
,
event
):
def
updateTemperatures
(
self
,
event
):
self
.
AddBedTemperature
(
self
.
bedtemps
[
-
1
])
self
.
AddBedTemperature
(
self
.
bedtemps
[
-
1
])
self
.
AddBedTargetTemperature
(
self
.
bedtargettemps
[
-
1
])
self
.
AddBedTargetTemperature
(
self
.
bedtargettemps
[
-
1
])
...
@@ -76,7 +72,6 @@ class Graph(BufferedCanvas):
...
@@ -76,7 +72,6 @@ class Graph(BufferedCanvas):
#self.AddExtruder1TargetTemperature(self.extruder1targettemps[-1])
#self.AddExtruder1TargetTemperature(self.extruder1targettemps[-1])
self
.
Refresh
()
self
.
Refresh
()
def
drawgrid
(
self
,
dc
,
gc
):
def
drawgrid
(
self
,
dc
,
gc
):
#cold, medium, hot = wx.Colour(0, 167, 223), wx.Colour(239, 233, 119), wx.Colour(210, 50.100)
#cold, medium, hot = wx.Colour(0, 167, 223), wx.Colour(239, 233, 119), wx.Colour(210, 50.100)
#col1 = wx.Colour(255, 0, 0, 255)
#col1 = wx.Colour(255, 0, 0, 255)
...
@@ -105,7 +100,6 @@ class Graph(BufferedCanvas):
...
@@ -105,7 +100,6 @@ class Graph(BufferedCanvas):
#gc.DrawPath(path)
#gc.DrawPath(path)
#gc.StrokePath(path)
#gc.StrokePath(path)
font
=
wx
.
Font
(
10
,
wx
.
DEFAULT
,
wx
.
NORMAL
,
wx
.
BOLD
)
font
=
wx
.
Font
(
10
,
wx
.
DEFAULT
,
wx
.
NORMAL
,
wx
.
BOLD
)
gc
.
SetFont
(
font
,
wx
.
Colour
(
23
,
44
,
44
))
gc
.
SetFont
(
font
,
wx
.
Colour
(
23
,
44
,
44
))
...
@@ -192,7 +186,6 @@ class Graph(BufferedCanvas):
...
@@ -192,7 +186,6 @@ class Graph(BufferedCanvas):
if
(
len
(
self
.
bedtemps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
if
(
len
(
self
.
bedtemps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
self
.
bedtemps
.
pop
(
0
)
self
.
bedtemps
.
pop
(
0
)
def
SetBedTargetTemperature
(
self
,
value
):
def
SetBedTargetTemperature
(
self
,
value
):
self
.
bedtargettemps
.
pop
()
self
.
bedtargettemps
.
pop
()
self
.
bedtargettemps
.
append
(
value
)
self
.
bedtargettemps
.
append
(
value
)
...
@@ -202,7 +195,6 @@ class Graph(BufferedCanvas):
...
@@ -202,7 +195,6 @@ class Graph(BufferedCanvas):
if
(
len
(
self
.
bedtargettemps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
if
(
len
(
self
.
bedtargettemps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
self
.
bedtargettemps
.
pop
(
0
)
self
.
bedtargettemps
.
pop
(
0
)
def
SetExtruder0Temperature
(
self
,
value
):
def
SetExtruder0Temperature
(
self
,
value
):
self
.
extruder0temps
.
pop
()
self
.
extruder0temps
.
pop
()
self
.
extruder0temps
.
append
(
value
)
self
.
extruder0temps
.
append
(
value
)
...
@@ -212,7 +204,6 @@ class Graph(BufferedCanvas):
...
@@ -212,7 +204,6 @@ class Graph(BufferedCanvas):
if
(
len
(
self
.
extruder0temps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
if
(
len
(
self
.
extruder0temps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
self
.
extruder0temps
.
pop
(
0
)
self
.
extruder0temps
.
pop
(
0
)
def
SetExtruder0TargetTemperature
(
self
,
value
):
def
SetExtruder0TargetTemperature
(
self
,
value
):
self
.
extruder0targettemps
.
pop
()
self
.
extruder0targettemps
.
pop
()
self
.
extruder0targettemps
.
append
(
value
)
self
.
extruder0targettemps
.
append
(
value
)
...
@@ -222,7 +213,6 @@ class Graph(BufferedCanvas):
...
@@ -222,7 +213,6 @@ class Graph(BufferedCanvas):
if
(
len
(
self
.
extruder0targettemps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
if
(
len
(
self
.
extruder0targettemps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
self
.
extruder0targettemps
.
pop
(
0
)
self
.
extruder0targettemps
.
pop
(
0
)
def
SetExtruder1Temperature
(
self
,
value
):
def
SetExtruder1Temperature
(
self
,
value
):
self
.
extruder1temps
.
pop
()
self
.
extruder1temps
.
pop
()
self
.
extruder1temps
.
append
(
value
)
self
.
extruder1temps
.
append
(
value
)
...
@@ -232,7 +222,6 @@ class Graph(BufferedCanvas):
...
@@ -232,7 +222,6 @@ class Graph(BufferedCanvas):
if
(
len
(
self
.
extruder1temps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
if
(
len
(
self
.
extruder1temps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
self
.
extruder1temps
.
pop
(
0
)
self
.
extruder1temps
.
pop
(
0
)
def
SetExtruder1TargetTemperature
(
self
,
value
):
def
SetExtruder1TargetTemperature
(
self
,
value
):
self
.
extruder1targettemps
.
pop
()
self
.
extruder1targettemps
.
pop
()
self
.
extruder1targettemps
.
append
(
value
)
self
.
extruder1targettemps
.
append
(
value
)
...
@@ -242,7 +231,6 @@ class Graph(BufferedCanvas):
...
@@ -242,7 +231,6 @@ class Graph(BufferedCanvas):
if
(
len
(
self
.
extruder1targettemps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
if
(
len
(
self
.
extruder1targettemps
)
-
1
)
*
float
(
self
.
width
)
/
self
.
xsteps
>
self
.
width
:
self
.
extruder1targettemps
.
pop
(
0
)
self
.
extruder1targettemps
.
pop
(
0
)
def
StartPlotting
(
self
,
time
):
def
StartPlotting
(
self
,
time
):
self
.
Refresh
()
self
.
Refresh
()
self
.
timer
.
Start
(
time
)
self
.
timer
.
Start
(
time
)
...
...
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