From 6d8fb6015b1cd38efda5aa95ef8b4ee06f7272ae Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 3 Nov 2015 17:03:44 +0100 Subject: [PATCH] Fix Bug #1512726 (pl_editor can't not load template that have image with (option page1only) ) demo kit-dev-coldfire-xilinx_5213.kicad_pcb: minor 3d shape update --- common/page_layout/page_layout_reader.cpp | 4 + .../kit-dev-coldfire-xilinx_5213.kicad_pcb | 20 +- .../prj.3dshapes/push_butt_4pads.wings | Bin 0 -> 4661 bytes .../prj.3dshapes/push_butt_4pads.wrl | 883 ++++++++++++++++++ 4 files changed, 897 insertions(+), 10 deletions(-) create mode 100644 demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wings create mode 100644 demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wrl diff --git a/common/page_layout/page_layout_reader.cpp b/common/page_layout/page_layout_reader.cpp index 0dbecf4cc9..68c80bfecc 100644 --- a/common/page_layout/page_layout_reader.cpp +++ b/common/page_layout/page_layout_reader.cpp @@ -372,6 +372,10 @@ void PAGE_LAYOUT_READER_PARSER::parseBitmap( WORKSHEET_DATAITEM_BITMAP * aItem ) readPngdata( aItem ); break; + case T_option: + readOption( aItem ); + break; + default: Unexpected( CurText() ); break; diff --git a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb index dd78e72871..23e6402c33 100644 --- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb +++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb @@ -1,9 +1,9 @@ -(kicad_pcb (version 4) (host pcbnew "(2015-10-08 BZR 6256)-product") +(kicad_pcb (version 4) (host pcbnew "(2015-11-02 BZR 6292)-product") (general (links 534) (no_connects 0) - (area 66.45592 36.781599 233.50792 151.36432) + (area 70.929499 55.689499 228.790501 147.510501) (thickness 1.6) (drawings 8) (tracks 3535) @@ -5900,9 +5900,9 @@ (net 103 "Net-(ABRT_SW1-Pad1)")) (pad 2 thru_hole circle (at -3.81 2.54) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) (net 104 VDD)) - (model Buttons_Switches_ThroughHole.3dshapes/SW_PUSH.wrl + (model ${KIPRJMOD}/prj.3dshapes/push_butt_4pads.wrl (at (xyz 0 0 0)) - (scale (xyz 1.100000023841858 1.100000023841858 1.100000023841858)) + (scale (xyz 1.17 1.17 1.17)) (rotate (xyz 0 0 90)) ) ) @@ -5929,9 +5929,9 @@ (net 108 "Net-(C3-Pad1)")) (pad 2 thru_hole circle (at -3.81 2.54 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) (net 102 GND)) - (model Buttons_Switches_ThroughHole.3dshapes/SW_PUSH.wrl + (model ${KIPRJMOD}/prj.3dshapes/push_butt_4pads.wrl (at (xyz 0 0 0)) - (scale (xyz 1.100000023841858 1.100000023841858 1.100000023841858)) + (scale (xyz 1.17 1.17 1.17)) (rotate (xyz 0 0 90)) ) ) @@ -5958,9 +5958,9 @@ (net 166 /IRQ-4)) (pad 2 thru_hole circle (at -3.81 2.54) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) (net 102 GND)) - (model Buttons_Switches_ThroughHole.3dshapes/SW_PUSH.wrl + (model ${KIPRJMOD}/prj.3dshapes/push_butt_4pads.wrl (at (xyz 0 0 0)) - (scale (xyz 1.100000023841858 1.100000023841858 1.100000023841858)) + (scale (xyz 1.17 1.17 1.17)) (rotate (xyz 0 0 90)) ) ) @@ -5987,9 +5987,9 @@ (net 20 /IRQ-5)) (pad 2 thru_hole circle (at -3.81 2.54) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) (net 102 GND)) - (model Buttons_Switches_ThroughHole.3dshapes/SW_PUSH.wrl + (model ${KIPRJMOD}/prj.3dshapes/push_butt_4pads.wrl (at (xyz 0 0 0)) - (scale (xyz 1.100000023841858 1.100000023841858 1.100000023841858)) + (scale (xyz 1.17 1.17 1.17)) (rotate (xyz 0 0 90)) ) ) diff --git a/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wings b/demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wings new file mode 100644 index 0000000000000000000000000000000000000000..925f823bb3ee6f318a8a4006d0746c841e19bb69 GIT binary patch literal 4661 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 T#Pweg<^II_Eoo3jOV57+(3H