From 6fd2e6ced0c120a091c9eee8ba2d9445b37d1fe1 Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Date: Sun, 8 Apr 2012 16:59:12 +0200 Subject: [PATCH] Fix units.i and add some extra wrappers wxSizeMM, wxSizeMils wxRectMM wxRectMils --- pcbnew/scripting/examples/createPcb.py | 3 ++- pcbnew/scripting/units.i | 23 ++++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pcbnew/scripting/examples/createPcb.py b/pcbnew/scripting/examples/createPcb.py index 5b8bee9882..f46b1f5a40 100755 --- a/pcbnew/scripting/examples/createPcb.py +++ b/pcbnew/scripting/examples/createPcb.py @@ -1,7 +1,8 @@ #!/usr/bin/env python2.7 +import pcbnew from pcbnew import * -size_0_6mm = wxSize(FromMM(0.6),FromMM(0.6)) +size_0_6mm = wxSizeMM(0.6,0.6) # create a blank board diff --git a/pcbnew/scripting/units.i b/pcbnew/scripting/units.i index adbd3a7ae8..09cb6fb320 100644 --- a/pcbnew/scripting/units.i +++ b/pcbnew/scripting/units.i @@ -50,9 +50,30 @@ elif type(iu) in [wxPoint,wxSize]: return tuple(map(ToMils,iu)) - def FromMils(mils): + def FromMils(iu): if type(iu) in [int,float]: return mils*10.0 elif type(iu) in [wxPoint,wxSize]: return tuple(map(FromMils,iu)) + + def wxSizeMM(mmx,mmy): return wxSize(FromMM(mmx),FromMM(mmy)) + def wxSizeMils(mmx,mmy): return wxSize(FromMils(mmx),FromMils(mmy)) + + def wxPointMM(mmx,mmy): return wxPoint(FromMM(mmx),FromMM(mmy)) + def wxPointMils(mmx,mmy): return wxPoint(FromMils(mmx),FromMils(mmy)) + + def wxRectMM(x,y,wx,wy): + x = int(FromMM(x)) + y = int(FromMM(y)) + wx = int(FromMM(wx)) + wy = int (FromMM(wy)) + return wxRect(x,y,wx,wy) + + def wxRectMils(x,y,wx,wy): + x = int(FromMils(x)) + y = int(FromMils(y)) + wx = int(FromMils(wx)) + wy = int (FromMils(wy)) + return wxRect(x,y,wx,wy) + } \ No newline at end of file