Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
pyMKcam
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
pyMKcam
Commits
15bf815d
Commit
15bf815d
authored
Aug 20, 2012
by
Lars Kruse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into libarea
parents
a28d4efc
30b554aa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
13 deletions
+9
-13
Polygon.py
pycam/Geometry/Polygon.py
+4
-10
GCodeParameters.py
pycam/Plugins/GCodeParameters.py
+2
-1
ProcessStrategies.py
pycam/Plugins/ProcessStrategies.py
+1
-1
log.py
pycam/Utils/log.py
+2
-1
No files found.
pycam/Geometry/Polygon.py
View file @
15bf815d
...
@@ -866,20 +866,11 @@ class Polygon(TransformableContainer):
...
@@ -866,20 +866,11 @@ class Polygon(TransformableContainer):
if
len
(
new_group
)
>
0
:
if
len
(
new_group
)
>
0
:
group_starts
=
[]
group_starts
=
[]
index1
=
0
index1
=
0
fallout3
=
0
while
index1
<
len
(
new_group
):
while
index1
<
len
(
new_group
):
index2
=
0
index2
=
0
fallout2
=
len
(
new_group
)
fallout3
+=
1
while
index2
<
len
(
new_group
):
while
index2
<
len
(
new_group
):
fallout2
-=
1
index_distance
=
min
(
abs
(
index2
-
index1
),
\
index_distance
=
min
(
abs
(
index2
-
index1
),
\
abs
(
len
(
new_group
)
-
(
index2
-
index1
)))
abs
(
len
(
new_group
)
-
(
index2
-
index1
)))
if
fallout3
>
10000
:
print
"FALLOUT3"
print
index_distance
,
index2
,
index1
,
len
(
new_group
),
len
(
group_starts
)
import
sys
sys
.
exit
(
1
)
# skip neighbours
# skip neighbours
if
index_distance
>
1
:
if
index_distance
>
1
:
line1
=
new_group
[
index1
]
line1
=
new_group
[
index1
]
...
@@ -915,7 +906,10 @@ class Polygon(TransformableContainer):
...
@@ -915,7 +906,10 @@ class Polygon(TransformableContainer):
groups
=
[]
groups
=
[]
last_start
=
0
last_start
=
0
for
group_start
in
group_starts
:
for
group_start
in
group_starts
:
groups
.
append
(
new_group
[
last_start
:
group_start
])
transfer_group
=
new_group
[
last_start
:
group_start
]
# add only non-empty groups
if
transfer_group
:
groups
.
append
(
transfer_group
)
last_start
=
group_start
last_start
=
group_start
# Add the remaining lines to the first group or as a new
# Add the remaining lines to the first group or as a new
...
...
pycam/Plugins/GCodeParameters.py
View file @
15bf815d
...
@@ -228,7 +228,8 @@ class GCodeCornerStyle(pycam.Plugins.PluginBase):
...
@@ -228,7 +228,8 @@ class GCodeCornerStyle(pycam.Plugins.PluginBase):
self
.
core
.
get
(
"unregister_parameter"
)(
"toolpath_processor"
,
name
)
self
.
core
.
get
(
"unregister_parameter"
)(
"toolpath_processor"
,
name
)
def
update_widgets
(
self
,
widget
=
None
):
def
update_widgets
(
self
,
widget
=
None
):
enable_tolerances
=
(
self
.
path_mode
.
get_value
()
==
"optimize_speed"
)
enable_tolerances
=
(
self
.
path_mode
.
get_value
()
==
\
CORNER_STYLE_OPTIMIZE_TOLERANCE
)
controls
=
(
self
.
motion_tolerance
,
self
.
naive_tolerance
)
controls
=
(
self
.
motion_tolerance
,
self
.
naive_tolerance
)
for
control
in
controls
:
for
control
in
controls
:
control
.
get_widget
()
.
set_sensitive
(
enable_tolerances
)
control
.
get_widget
()
.
set_sensitive
(
enable_tolerances
)
...
...
pycam/Plugins/ProcessStrategies.py
View file @
15bf815d
...
@@ -159,7 +159,7 @@ class ProcessStrategyEngraving(pycam.Plugins.PluginBase):
...
@@ -159,7 +159,7 @@ class ProcessStrategyEngraving(pycam.Plugins.PluginBase):
if
not
models
:
if
not
models
:
self
.
log
.
error
(
"No trace models given: you need to assign a "
+
\
self
.
log
.
error
(
"No trace models given: you need to assign a "
+
\
"2D model to the engraving process."
)
"2D model to the engraving process."
)
return
None
,
None
,
(
None
,
None
)
return
None
,
None
progress
=
self
.
core
.
get
(
"progress"
)
progress
=
self
.
core
.
get
(
"progress"
)
if
process
[
"parameters"
][
"radius_compensation"
]:
if
process
[
"parameters"
][
"radius_compensation"
]:
progress
.
update
(
text
=
"Offsetting models"
)
progress
.
update
(
text
=
"Offsetting models"
)
...
...
pycam/Utils/log.py
View file @
15bf815d
...
@@ -118,7 +118,8 @@ class RepetitionsFilter(logging.Filter):
...
@@ -118,7 +118,8 @@ class RepetitionsFilter(logging.Filter):
record
.
getMessage
()
.
startswith
(
record
.
getMessage
()
.
startswith
(
self
.
_last_record
.
getMessage
()[:
self
.
_cmp_len
])
self
.
_last_record
.
getMessage
()[:
self
.
_cmp_len
])
similarity
=
"similar"
similarity
=
"similar"
if
message_equal
and
(
now
-
self
.
_last_timestamp
<=
self
.
_delay
):
if
not
is_debug
()
and
\
(
message_equal
and
(
now
-
self
.
_last_timestamp
<=
self
.
_delay
)):
self
.
_suppressed_messages_counter
+=
1
self
.
_suppressed_messages_counter
+=
1
return
False
return
False
else
:
else
:
...
...
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