On Fri, Mar 12, 2010 at 01:42:22AM +0300, Alexey Starikovskiy wrote: > @@ -50,6 +50,8 @@ class GLCanon(Translated, ArcsToSegmentsMixin): > self.lo = (0,) * 9 > self.first_move = True > self.offset_x = self.offset_y = self.offset_z = 0 > + self.offset_a = self.offset_b = self.offset_c = 0 > + self.offset_u = self.offset_v = self.offset_w = 0 > self.geometry = geometry > self.min_extents = [9e99,9e99,9e99] > self.max_extents = [-9e99,-9e99,-9e99]
I know emc is far from consistent on this, but if you can please try to follow the surrounding style as far as spaces vs tabs goes. This file is all or almost all spaces, and few or no tabs. > diff --git a/nc_files/systems.ngc b/nc_files/systems.ngc > index 1594b66..6f49b61 100644 > --- a/nc_files/systems.ngc > +++ b/nc_files/systems.ngc This shouldn't be here > +#define max(a,b) (a)>(b)?(a):(b) I know we don't use a lot of the C++ standard library, but consider using std::min instead. > void ARC_FEED(int line_number, ... doesn't this change mean that *no* user of gcodemodule can get actual arc moves anymore, only offset and rotated straightened moves? This is a big change for the other, possibly hypothetical users of the gcode module. > + int steps = max(3, int(32 * abs(theta1 - theta2) / M_PI)); Please remember that changing the default number of arc segments is a different discussion. > + PyObject_CallMethod(callback, "straight_arcsegment", "fffffffff", > + p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], > p[8]); In some changes I haven't shown yet, I found a nice speed bump from gathering up all the segments on an arc in a list, and passing them in a single call to a new method 'straight_arcsegments'. > void STRAIGHT_TRAVERSE(int line_number, > double x, double y, double z, > double a, double b, double c, Again, by moving offsetting and rotation into here, you're making a big change for the other, possibly hypothetical users of the gcode module. Jeff ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
