Solves seed painting problem in issue #102.
This commit is contained in:
parent
0cee5d95cc
commit
fd2657a8d7
@ -1,8 +1,6 @@
|
||||
import traceback
|
||||
import sys
|
||||
import urllib
|
||||
import getopt
|
||||
from copy import copy
|
||||
import random
|
||||
import logging
|
||||
import simplejson as json
|
||||
@ -10,9 +8,8 @@ import re
|
||||
import webbrowser
|
||||
import os
|
||||
import Tkinter
|
||||
import re
|
||||
from PyQt4 import QtCore
|
||||
import time
|
||||
import time # Just used for debugging. Double check before removing.
|
||||
|
||||
########################################
|
||||
## Imports part of FlatCAM ##
|
||||
@ -61,7 +58,7 @@ class App(QtCore.QObject):
|
||||
log.addHandler(handler)
|
||||
|
||||
## Version
|
||||
version = 8.1
|
||||
version = 8.11
|
||||
version_date = "2015/01"
|
||||
|
||||
## URL for update checks and statistics
|
||||
@ -624,9 +621,10 @@ class App(QtCore.QObject):
|
||||
if retval and retfcn(retval):
|
||||
self.shell.append_output(retfcn(retval) + "\n")
|
||||
|
||||
except:
|
||||
self.shell.append_error(''.join(traceback.format_exc()))
|
||||
except Exception, e:
|
||||
#self.shell.append_error(''.join(traceback.format_exc()))
|
||||
#self.shell.append_error("?\n")
|
||||
self.shell.append_error(str(e) + "\n")
|
||||
|
||||
def info(self, msg):
|
||||
"""
|
||||
@ -1172,7 +1170,9 @@ class App(QtCore.QObject):
|
||||
|
||||
# Keep this for later
|
||||
try:
|
||||
name = copy(self.collection.get_active().options["name"])
|
||||
#name = copy(self.collection.get_active().options["name"])
|
||||
# Shouldn't need to copy. String are immutable.
|
||||
name = self.collection.get_active().options["name"]
|
||||
except AttributeError:
|
||||
self.log.debug("Nothing selected for deletion")
|
||||
return
|
||||
|
@ -329,10 +329,6 @@ class Geometry(object):
|
||||
:return:
|
||||
"""
|
||||
|
||||
# Estimate good seedpoint if not provided.
|
||||
if seedpoint is None:
|
||||
seedpoint = polygon.representative_point()
|
||||
|
||||
# Current buffer radius
|
||||
radius = tooldia / 2 * (1 - overlap)
|
||||
|
||||
@ -342,6 +338,10 @@ class Geometry(object):
|
||||
# Path margin
|
||||
path_margin = polygon.buffer(-tooldia / 2)
|
||||
|
||||
# Estimate good seedpoint if not provided.
|
||||
if seedpoint is None:
|
||||
seedpoint = path_margin.representative_point()
|
||||
|
||||
# Grow from seed until outside the box.
|
||||
while 1:
|
||||
path = Point(seedpoint).buffer(radius).exterior
|
||||
|
Loading…
Reference in New Issue
Block a user