try huge master merge

FritzingInfo.plist

@@ -33,11 +33,11 @@ $Date: 2009-01-03 18:55:48 +0100 (Sat, 03 Jan 2009) $
 	<key>CFBundleExecutable</key>
 	<string>Fritzing</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Fritzing 0.8.4 (b048f 2013-07-28)</string>
+	<string>Fritzing 0.8.5 (b8b2c 2013-12-16)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.4</string>
+	<string>0.8.5</string>
 	<key>CFBundleVersion</key>
-	<string>b048f</string>
+	<string>b8b2c</string>
 	<key>CFBundleIconFile</key>
 	<string>fritzing_icon.icns</string>
 	<key>CFBundleIdentifier</key>

README.txt

@@ -65,5 +65,5 @@ using the following steps (qmake is a tool supplied by Qt):
 Fritzing requires Qt 4.6 and up, and the Qt-sqlite and Qt-jpeg plugins.
 
 
-(c) 2007-2011 Fachhochschule Potsdam
+(c) 2007-2013 Fachhochschule Potsdam
 design.fh-potsdam.de

bins/core.fzb

@@ -871,7 +871,7 @@
           </iconView>
         </views>
       </instance>
-      <instance moduleIdRef="BreadboardLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/breadboardlogoimage.fzp">
+      <instance moduleIdRef="newBreadboardLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/newbreadboardlogoimage.fzp">
         <views>
           <iconView layer="icon">
             <geometry z="-1" x="-1" y="-1"/>
@@ -929,7 +929,7 @@
           </iconView>
         </views>
       </instance>
-      <instance moduleIdRef="SchematicLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/schematiclogoimage.fzp">
+      <instance moduleIdRef="newSchematicLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/newschematiclogoimage.fzp">
         <views>
           <iconView layer="icon">
             <geometry z="-1" x="-1" y="-1"/>
@@ -967,7 +967,7 @@
           </iconView>
         </views>
       </instance>
-      <instance moduleIdRef="LogoImageModuleID" modelIndex="57" path=":/resources/parts/core/logoimage.fzp">
+      <instance moduleIdRef="newLogoImageModuleID" modelIndex="57" path=":/resources/parts/core/newlogoimage.fzp">
         <views>
           <iconView layer="icon">
             <geometry z="-1" x="-1" y="-1"/>

bins/more/Atlas Scientific.fzb

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module fritzingVersion="0.8.0b.06.12.08d5" icon="atlas-scientific.png">
+    <title>Atlas Scientific</title>
+    <instances>
+        <instance moduleIdRef="atlas-sientific_PWR-SNS" modelIndex="1682" path="pdb/core/atlas-sientific_PWR-SNS.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_Serial Port Connector" modelIndex="1683" path="pdb/core/atlas-sientific_Serial Port Connector.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_pH Circuit" modelIndex="1684" path="pdb/core/atlas-sientific_pH Circuit.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_ORP Circuit" modelIndex="1685" path="pdb/core/atlas-sientific_ORP Circuit.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_RJ-11" modelIndex="1686" path="pdb/core/atlas-sientific_RJ-11.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_FLO-30 Circuit" modelIndex="1687" path="pdb/core/atlas-sientific_FLO-30 Circuit.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_ENV-32X" modelIndex="1725" path="pdb/core/atlas-sientific_ENV-32X.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_Conductivity Circuit" modelIndex="1790" path="pdb/core/atlas-sientific_Conductivity Circuit.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_D.O. Circuit" modelIndex="1845" path="pdb/core/atlas-sientific_D.O. Circuit.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_Pre-AssembledFemaleBNC" modelIndex="1930" path="pdb/core/atlas-sientific_Pre-AssembledFemaleBNC.fzp">
+            <views/>
+        </instance>
+        <instance moduleIdRef="atlas-sientific_Debugger" modelIndex="2043" path="pdb/core/atlas-sientific_Debugger.fzp">
+            <views/>
+        </instance>
+    </instances>
+</module>

bins/more/lilypad.fzb

@@ -86,7 +86,7 @@
                 </iconView>
             </views>
         </instance>	
-						<instance moduleIdRef="Lilypad_PowerSupply-v16" modelIndex="5584" path="pdb/core/Lilypad_PowerSupply-v18.fzp">
+						<instance moduleIdRef="Lilypad_PowerSupply-v18" modelIndex="5584" path="pdb/core/Lilypad_PowerSupply-v18.fzp">
             <views>
                 <iconView layer="">
                     <geometry z="0" x="-1" y="-1"/>
@@ -176,6 +176,16 @@
                     <geometry z="0" x="-1" y="-1"/>
                 </iconView>
             </views>
+        </instance>	
+			<instance moduleIdRef="LilyPad Vibe Motor" modelIndex="5584" path="pdb/core/LilyPad Vibe Motor.fzp">
+            <views>
+                <iconView layer="">
+                    <geometry z="0" x="-1" y="-1"/>
+                </iconView>
+                <iconView layer="">
+                    <geometry z="0" x="-1" y="-1"/>
+                </iconView>
+            </views>
         </instance>	
     </instances>
 </module>

fritzing.rc

@@ -2,11 +2,11 @@ IDI_ICON1               ICON    DISCARDABLE     "resources/images/fritzing_icon.
 
 #include <windows.h>
 
-#define VER_FILEVERSION             0,8,4,0
-#define VER_FILEVERSION_STR         "0.8.4b\0"
+#define VER_FILEVERSION             0,8,5,0
+#define VER_FILEVERSION_STR         "0.8.5b\0"
 
-#define VER_PRODUCTVERSION          0,8,4,0
-#define VER_PRODUCTVERSION_STR      "0.8.4b\0"
+#define VER_PRODUCTVERSION          0,8,5,0
+#define VER_PRODUCTVERSION_STR      "0.8.5b\0"
 
 #define VER_COMPANYNAME_STR         "Fritzing"
 #define VER_FILEDESCRIPTION_STR     "Fritzing"

part-gen-scripts/misc_scripts/unzeroradius.py

@@ -0,0 +1,76 @@
+
+import getopt, sys, os, os.path, re, xml.dom.minidom, xml.dom
+
+def usage():
+        print """
+usage:
+    unzeroradius.py -d [svg folder]
+    if a file has <circle r='0' replace with r='.00000000001'
+"""
+
+
+
+def main():
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "hd:", ["help", "directory"])
+    except getopt.GetoptError, err:
+        # print help information and exit:
+        print str(err) # will print something like "option -a not recognized"
+        usage()
+        sys.exit(2)
+
+    dir = None
+
+    for o, a in opts:
+        #print o
+        #print a
+        if o in ("-d", "--directory"):
+            dir = a
+        elif o in ("-h", "--help"):
+            usage()
+            sys.exit(2)
+        else:
+            assert False, "unhandled option"
+
+    if(not(dir)):
+        usage()
+        sys.exit(2)            
+
+    for root, dirs, files in os.walk(dir, topdown=False):
+        for filename in files:
+            if not filename.endswith(".svg"): 
+                continue
+
+            svgFilename = os.path.join(root, filename)
+            try:
+                dom = xml.dom.minidom.parse(svgFilename)
+            except xml.parsers.expat.ExpatError, err:
+                print str(err), svgFilename
+                continue
+
+            svg = dom.documentElement
+            circleNodes = svg.getElementsByTagName("circle")
+
+            count = 0
+            for circle in circleNodes:
+                r = circle.getAttribute("r")
+                if r == "0":
+                    circle.setAttribute("r", "0.00000000001")
+                    count += 1
+
+            if count == 0:
+                #print ".",
+                continue
+
+            print "got zero", svgFilename
+            outfile = open(svgFilename, 'wb')
+            s = dom.toxml("UTF-8")
+            outfile.write(s)
+            outfile.flush()
+            outfile.close()                        
+
+if __name__ == "__main__":
+        main()
+
+
+

pdb/core/Arduino-Fio-v22.fzp

@@ -209,7 +209,7 @@ Arduino Fio is compatible with Funnel. It has connections for a Lithium Polymer
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector42pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector42pin' terminalId='connector42terminal'/></schematicView>
+<p layer='unknown' svgId='connector42pin' terminalId='connector42terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector42pad'/>
 
@@ -221,7 +221,7 @@ Arduino Fio is compatible with Funnel. It has connections for a Lithium Polymer
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector43pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector43pin' terminalId='connector43terminal'/></schematicView>
+<p layer='unknown' svgId='connector43pin' terminalId='connector43terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector43pad'/></pcbView>
 </views>
@@ -231,7 +231,7 @@ Arduino Fio is compatible with Funnel. It has connections for a Lithium Polymer
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector44pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector44pin' terminalId='connector44terminal'/></schematicView>
+<p layer='unknown' svgId='connector44pin' terminalId='connector44terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector44pad'/></pcbView>
 </views>
@@ -241,7 +241,7 @@ Arduino Fio is compatible with Funnel. It has connections for a Lithium Polymer
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector45pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector45pin' terminalId='connector45terminal'/></schematicView>
+<p layer='unknown' svgId='connector45pin' terminalId='connector45terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector45pad'/></pcbView>
 </views>
@@ -251,7 +251,7 @@ Arduino Fio is compatible with Funnel. It has connections for a Lithium Polymer
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector46pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector46pin' terminalId='connector46terminal'/></schematicView>
+<p layer='unknown' svgId='connector46pin' terminalId='connector46terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector46pad'/></pcbView>
 </views>
@@ -261,7 +261,7 @@ Arduino Fio is compatible with Funnel. It has connections for a Lithium Polymer
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector47pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector47pin' terminalId='connector47terminal'/></schematicView>
+<p layer='unknown' svgId='connector47pin' terminalId='connector47terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector47pad'/></pcbView>
 </views>

pdb/core/Arduino_Micro_Rev03.fzp

@@ -50,7 +50,7 @@ The Micro is similar to the Arduino Leonardo in that the ATmega32u4 has built-in
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector41pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector41pin' terminalId='connector41terminal'/></schematicView>
+<p layer='unknown' svgId='connector41pin' terminalId='connector41terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector41pad'/></pcbView>
 </views>
@@ -60,7 +60,7 @@ The Micro is similar to the Arduino Leonardo in that the ATmega32u4 has built-in
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector42pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector42pin' terminalId='connector42terminal'/></schematicView>
+<p layer='unknown' svgId='connector42pin' terminalId='connector42terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector42pad'/></pcbView>
 </views>
@@ -70,7 +70,7 @@ The Micro is similar to the Arduino Leonardo in that the ATmega32u4 has built-in
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector43pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector43pin' terminalId='connector43terminal'/></schematicView>
+<p layer='unknown' svgId='connector43pin' terminalId='connector43terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector43pad'/></pcbView>
 </views>
@@ -80,7 +80,7 @@ The Micro is similar to the Arduino Leonardo in that the ATmega32u4 has built-in
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector44pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector44pin' terminalId='connector44terminal'/></schematicView>
+<p layer='unknown' svgId='connector44pin' terminalId='connector44terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector44pad'/></pcbView>
 </views>
@@ -90,7 +90,7 @@ The Micro is similar to the Arduino Leonardo in that the ATmega32u4 has built-in
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector45pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector45pin' terminalId='connector45terminal'/></schematicView>
+<p layer='unknown' svgId='connector45pin' terminalId='connector45terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector45pad'/></pcbView>
 </views>
@@ -100,7 +100,7 @@ The Micro is similar to the Arduino Leonardo in that the ATmega32u4 has built-in
 <breadboardView>
 <p layer='breadboardbreadboard' svgId='connector46pin'/></breadboardView>
 <schematicView>
-<p layer='schematic' svgId='connector46pin' terminalId='connector46terminal'/></schematicView>
+<p layer='unknown' svgId='connector46pin' terminalId='connector46terminal'/></schematicView>
 <pcbView>
 <p layer='unknown' svgId='connector46pad'/></pcbView>
 </views>

pdb/core/Lilypad Vibe Motor.fzp

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module fritzingVersion="0.4.3b.09.26.4458" moduleId="LilyPad Vibe Motor">
+    <author>J.A. Korten - JKSOFT Educational</author>
+    <title>Lilypad Vibe Motor</title>
+    <label>Lilypad Vibe</label>
+    <date>2010-11-18</date>
+    <tags>
+        <tag>Lilypad</tag>
+	<tag>Vibe</tag>
+	<tag>Motor</tag>
+    </tags>
+    <properties>
+        <property name="family">microcontroller board (lilypad)</property>
+        <property name="type">Vibe Board</property>
+    </properties>
+    <description>Description: Apply 5V and be shaken by this small, but powerful vibration motor. Works great as an physical indicator without notifying anyone but the wearer. (See: http://www.sparkfun.com/products/8468)</description>
+    <views>
+        <iconView>
+            <layers image="breadboard/Lilypad_Vib_Motor.svg">
+                <layer layerId="icon"/>
+            </layers>
+        </iconView>
+        <breadboardView>
+            <layers image="breadboard/Lilypad_Vibe_Motor.svg">
+                <layer layerId="breadboard"/>
+            </layers>
+        </breadboardView>
+        <schematicView>
+            <layers image="schematic/Lilypad_Vibe_Motor.svg">
+                <layer layerId="schematic"/>
+            </layers>
+        </schematicView>
+        <pcbView>
+            <layers image="pcb/Lilypad_Vibe_Motor.svg">
+                <layer layerId="copper0"/>
+                <layer layerId="silkscreen"/>
+                <layer layerId="copper1"/>
+            </layers>
+        </pcbView>
+    </views>
+    <connectors>
+        <connector id="connector18" type="female" name="Supply">
+            <description>Pin to 5V</description>
+            <views>
+                <breadboardView>
+                    <p layer="breadboard" svgId="connector18"/>
+                </breadboardView>
+                <schematicView>
+                    <p layer="schematic" svgId="connector18pin"/>
+                </schematicView>
+                <pcbView>
+                    <p layer="copper1" svgId="connector18"/>
+                    <p layer="copper0" svgId="connector18"/>
+                </pcbView>
+            </views>
+        </connector>
+        <connector id="connector1" type="female" name="GND">
+            <description>Pin to GND</description>
+            <views>
+                <breadboardView>
+                    <p layer="breadboard" svgId="connector1"/>
+                </breadboardView>
+                <schematicView>
+                    <p layer="schematic" svgId="connector1pin"/>
+                </schematicView>
+                <pcbView>
+                    <p layer="copper1" svgId="connector1"/>
+                    <p layer="copper0" svgId="connector1"/>
+                </pcbView>
+            </views>
+        </connector>
+    </connectors>
+</module>

pdb/core/Tricolor-LED v16.fzp

@@ -23,7 +23,7 @@ Thin 0.8mm PCB</description>
 <tag>Light</tag>
 </tags>
 <properties>
-<property name='family'>/obsolete/microcontroller board (lilypad)</property>
+<property name='family'>microcontroller board (lilypad)</property>
 <property name='type'>LED</property>
 <property name='Colors'>3</property>
 </properties>