From b611624229dd364cbce21561807d0e5c6d1a0550 Mon Sep 17 00:00:00 2001
From: Juan Pablo Caram <jpcaram@gmail.com>
Date: Fri, 3 Jan 2014 01:13:42 -0500
Subject: [PATCH] Some adjustments to look and feel of plots

---
 camlib.py  |  15 ++++++++++++-
 camlib.pyc | Bin 44531 -> 45030 bytes
 cirkuix.py |  15 ++++++++++---
 cirkuix.ui |  62 ++++++++++++++++++++++++++++++++---------------------
 4 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/camlib.py b/camlib.py
index b74a33e4..3d81060c 100644
--- a/camlib.py
+++ b/camlib.py
@@ -46,7 +46,20 @@ class Gerber():
         self.flashes = []
         
         # Final geometry: MultiPolygon
-        self.solid_geometry = None        
+        self.solid_geometry = None
+        
+    def bounds(self):
+        if self.solid_geometry == None:
+            print "Warning: solid_geometry not computed yet."
+            return (0,0,0,0)
+        return self.solid_geometry.bounds
+        
+    def size(self):
+        if self.solid_geometry == None:
+            print "Warning: solid_geometry not computed yet."
+            return 0
+        bounds = self.bounds()
+        return (bounds[2]-bounds[0], bounds[3]-bounds[1])
         
     def fix_regions(self):
         '''
diff --git a/camlib.pyc b/camlib.pyc
index 55cc6f2a049efd1dcf3b9124a72c0c2e40b62158..db626d70cd5f9911bfa0e3f24dc4352566873742 100644
GIT binary patch
delta 5094
zcmb7Id32Q3760C3X0kzmKu9JDWFQHdEV2kD5Eh9^WQ!@hAc9NcBr_x*PG*MrK1_xR
z32tbuV0~`TDy<7t1+0E8E=628wN^da9*=EL_0$Ec7LRr7X|4Xz-rs#86L2{t=ge>J
zTkpNUd*6L;^7-qo_uh1+r+q#;YiG-I52yFJ#5y(LS~@Y5Zd`2`7iJov3>LBs*%ruj
zUUapK0bv-1n?8;7v8EDSVHg_>BV-ttxr{`C5fa9drJ*#VP4{nb8EpZ~Z?!53F9;^0
zX0*HBZ^a^JsG~a^>kZq9q(2(7{avx%_$E6X@+ZUgbdx3<ypW|~@Edw0jfQ0&U;=^d
zCFqQ8iiRw8xUzJhfSR-EV`UH+VvO(zx9EcDF8U0ce=aq?(R?x*{VwAw!`LE>D}+HF
z`S9g3d<FP+>!ydA>)|2{7<Tc()9}%RMJC)aVPD{6$0R%nV2YdwC{Wvqi;8V{V40i4
z^YEQTaKgt?!YOlKB*bDh=-J_sJ{nQ^-Z^5DYVj@;E1cWB(_F%*p3KM>W$LwzV`7!_
zc&1N?xbte(YcB5;nlJt8;OG@&3Q4q}r@W!5NlsH4IsT$bYO=kpfgH>P_3{kBRMnU>
zPt>X{Ia5Tb+LJRge+G5i=>%pp6z*@DEoWlh9J0UIGoQrEo%Aus#eg5Z0YC*{F#uMx
z8d-&A8K4?{AV|Wnz-UNKfN_9wKnY+xU<|+mm;^wU+L;7aPdt+B=#2GCv}7)k6CYPy
z<i|Jy*kvZVB4KTW)~XJT+aMlNQ*!G>wpy24UXFOMfm$6au0`M305~RB8*1=C$wY~`
zz#NP87+#TClIhJ%cV5VS#3hQ<mb~IT*l)v3rbu$+r>cW_XL#GFQ?6BS=k<6lCh-NQ
zb>e3t`vUF-G^rH@v#Xglb`whj$aSe#Lb`;&M&?8;*{<#{Sm?Qk8Xw>DVS$*$nlZmC
z7PW(B)Y8he0+mr%rFFH_3~3_e)Y`%vms>bJg|~<@3*9zg6CeRd0xk#i0s1-4`6NzI
z4aFti^U=9RtuL<g#7P|M++DoSwRA3tOn_x4%=l0yVJ1hGs)`|}1L_F^9MlCQ*+_%+
zyso>eH)P3;>PID2qFo&>nIcT}*OGa{?-cky5(D4IVmio%`Ct0e>9Yk*`WOKur`8^i
zn6}(X&2Ke<wQH4jxZjq8C)P&HXqYU(+HHU<0apR8HYo2TQ+N&9*8;W!pk7`FxSqM)
zbHJ0?9S<g~@T|^N&MQ;DNE4On`DwLYCN-hl6$`VG!<v@3YN?nk2GwO13&nNn{)!%P
zg_9fjgAjjG?^a%!_j8)4iwGBtp)^JaZ>t(F-c%1%eL3TPnq%VxTVcBc9(44XA-hLD
zi2hL{`@4d1c~HGtz1DjNb<169R!yyV$LXm#>ZJlwGdnrJuHTBmTL=QBkocUYvIHjS
zTG0#%TI2!1e!#<k2LJ~NxMVa^R)Xb|?6hK=5?$erM0cl@nCK>0Z>q96MRN~f^&<cW
z@Jm1{g*Zung+9*IM<G21NUFX$)tx^fk*foUU>>*@^ac~%W>i*U;!eQbfO`P<0`3F+
z44^57^aKHCXO!d4VwbE_?z8H}Kb*7AO1ix~`LH@Nuczg7Xpv81fAArX0KkBJ3h*@G
z8MSC}K_1h<r-q%^j;cNNlgfUBNzVbk-5>Q<eSRKC`DBNvcp!T!=1-v4!Gig5zdp;@
z4Ch<N@7IuC1pJ<>pI7dq#vh$e=Rce_=_L~RD(UxAsc};)NrL9>uzKq3HD#O^6R;dP
zARhw!0>ExR4e7gFT)#NE7%tkVgJ!Sw9bRIqmjSN;M!2g=8hl;^aLC_v4cX#OC){wC
z$WC$ApmG`u%5dZ9S`bcj_DdK)+)U~+yhtr?EK6Ufb*M%AO1!d>8t*x~8?#51*O918
z(g$R*1*^-?ZDXr-qv1TdaaUd1EGpF4l?(heG{MRwsQ1S@6L{vZ<(7-OWR0v+k(GzN
z4QQOBrmrfVKNsRW04k^Cl;CTcdFE0w9Ro0lISY1L`bZpA*Q~0TgDNZEIWgG0vW*Yh
z>UArdS!i2!VYB=T=DZGA2w0@vTD4>>S354$GtjwC)yYz?AEHlPDhqY?SF1r;>$<}r
zTKwwIGGBb<d?FW&K2286nkL`I#{UO5VGlc_-dNc(f~A4eVM!i?uEzjJ0q+9-26&Gk
zz$a#yHTgaUJ^=h3a4J>kJ8r1f&io}GLq3%?^zj2H2ht~iPXT^_5AYe_bAUdpYJX=z
z`WI*q(Hi%-)$z`3@jK^Voo(KtRKn35!$j6`aat`aRLHFL>I_#uHS11gr3ss!l0ck0
z>=~yL66G6N8IJ+5GE}Q0VNN!>?8$u^!qvgGHmYyYkEq?GD<@uKp@bQsw+kO4CIMda
zLE{l-f*&~jGx;kyQ;wwIi4Eh#?aoUZ23;$jrG=+j$UedT0N0%~y0fI4K<_w9?>I~I
z%N`DKbbIePd93DnZ2CCh-vCs}Vh=Lp6K70xQJR>pS~phsm_OtQUomzp7KsP#9!qXe
zJ2oB_zg03(UiBu{zlAw)d$WEG?nY-RI@1a8PNVxzecJ2uRFIY9oTn0Zc|z<2tAHn|
zvd3%AYgoH%b+go|3ksOK*6%HAYv%EWHA{FL;SAt?&FUngAWK09`}MMVrhm;D!}Lfm
zM$!QpfJ_4BD%!8Vk}}I_O6Cf6({{ILa4y>XRod)tGm~G9`e6r8Pttn*)~S`O6$*7w
z&g1~Gavh#CPuQTQ6c>3W(8Ld&e{M~8Wy4$T_xsAbt)yglBY7T-Mx3<|t&r+e)3*Nf
zA$NGIB&{!Uj&0lH9(#)I`Re9t>n7`5ph-G;I81J8T4r}tmZ<lyt;yEp!H#w{d3)j9
zFo_)BSR`bHyJZwZ)uf&e2ldR9D@L?t$>lJOk275!K58s>Zrxtv6(RNPjb(W$vxaS<
zA7NkJcy4wF)?ErXrdoCc#|25`!`=|!Ur43u$d1BuUWR(kYuF&aDZXs6hvr=#PS}<#
z!Mp&L;UO(osKTA~_2*-A7j=e$BW~1P)WPpd`W<YC>0R4pn=$&4!G$h_)nUOrUqZ6u
z9Nf7it%b8V<qJoU>*z7sY{>GIa_q4cfd5B)&3e_Kj*QB}$RJ>wR<@Dke5d-BL!vRI
zhgI}p7I@N^H|OFVPzFczbAed`BN8slHF`@dY<HS&>vs*LXisg<KJ{ZhoZxFA;Df|O
zuo`Bg3sW?!kW#_m97vtGt1)^FAm#fFX#P-8t>xp5Sar%9(YZsl?wXv=fv(o(wo`YX
zqjudes_IV6$OE7_$y|~+JFSS>ML%fxweTfIJZkCQ#@f3f-UGN7a32BZ?dD#JFfxC0
zZ?J#Fn_F|Bp4mH|e#*SIw{-cBq3R}@7|6y3d{=Ttq1@<eVN<WZ7E&)W&Ld=CC>*ha
zvK)Kt=GW*Y`!dD7PWL{ayKwj<1ah(SusiZ;wfn&t3sceXpYSoZ$)<la*%>rFN(Zku
z9JTe{9FgPLWyl6RQAVNu_9aX^+_7YqI&*)AIH+#kzj9zXb=z>p>Iuffk>vDP+|vJ7
z$ifa61MrJm#sG1^4*)v=djb0ZeEYlssS)rWfF>T^;y#fm__6?i5~qJ^`zAxg`H{$L
W$tjHZ$^(EyYT!VlcvKxdF!O&+MF$`N

delta 4659
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

diff --git a/cirkuix.py b/cirkuix.py
index 1ec50eba..05028bed 100644
--- a/cirkuix.py
+++ b/cirkuix.py
@@ -33,11 +33,16 @@ class App:
         Gtk.main()
         
     def mplpaint(self):
-        f = Figure(figsize=(5,4), dpi=50)
+        f = Figure(dpi=50)
         a = f.add_subplot(111)
-        t = arange(0.0,3.0,0.01)
+        a.set_aspect(1)
+        t = arange(0.0,5.0,0.01)
         s = sin(2*pi*t)
         a.plot(t,s)
+        a.grid()
+        #a.patch.set_visible(False) Background of the axes
+        f.patch.set_visible(False)
+        f.tight_layout()
         
         canvas = FigureCanvas(f)  # a Gtk.DrawingArea
         canvas.set_size_request(600,400)
@@ -102,14 +107,18 @@ class App:
         dialog.destroy()
         
     def plot_gerber(self, gerber):
-        f = Figure(figsize=(5,4), dpi=200)
+        
+        f = Figure(dpi=75)
         a = f.add_subplot(111)
+        a.set_aspect(1)
         for poly in gerber.solid_geometry:
             x, y = poly.exterior.xy
             a.plot(x, y)
             for ints in poly.interiors:
                 x, y = ints.coords.xy
                 a.plot(x, y)
+        a.grid()
+        f.tight_layout()
         canvas = FigureCanvas(f)  # a Gtk.DrawingArea
         canvas.set_size_request(600,400)
         self.grid.attach(canvas,1,1,600,400)
diff --git a/cirkuix.ui b/cirkuix.ui
index 5b794be4..a7d5408d 100644
--- a/cirkuix.ui
+++ b/cirkuix.ui
@@ -195,6 +195,36 @@
                     <property name="margin_right">3</property>
                     <property name="margin_top">3</property>
                     <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton1">
+                        <property name="label" translatable="yes">Merge Geometry</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="checkbutton2">
+                        <property name="label" translatable="yes">Different Colors</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <object class="GtkBox" id="box4">
                         <property name="visible">True</property>
@@ -203,7 +233,7 @@
                           <object class="GtkLabel" id="label2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Tool dia.:</property>
+                            <property name="label" translatable="yes">Scale (pix./unit): </property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -212,10 +242,13 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEntry" id="entry2">
+                          <object class="GtkSpinButton" id="spinbutton1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
                             <property name="invisible_char">●</property>
+                            <property name="climb_rate">10</property>
+                            <property name="snap_to_ticks">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -227,22 +260,16 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                 </child>
                 <child type="tab">
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Isolation Routing</property>
+                    <property name="label" translatable="yes">Gerber</property>
                   </object>
                   <packing>
                     <property name="tab_fill">False</property>
@@ -293,21 +320,6 @@
                         <child>
                           <placeholder/>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                   </object>