Updated translations

src/Mod/Arch/ArchCommands.py

@@ -660,13 +660,34 @@ def getIfcExtrusionData(obj,scale=1):
                 import Part
                 if len(p.Edges) == 1:
                     if isinstance(p.Edges[0].Curve,Part.Circle):
+                        # Circle profile
                         r1 = p.Edges[0].Curve.Radius*scale
                         return "circle", [getTuples(p.Edges[0].Curve.Center,scale), r1], getTuples(v,scale), d
                     elif isinstance(p.Edges[0].Curve,Part.Ellipse):
+                        # Ellipse profile
                         r1 = p.Edges[0].Curve.MajorRadius*scale
                         r2 = p.Edges[0].Curve.MinorRadius*scale
                         return "ellipse", [getTuples(p.Edges[0].Curve.Center,scale), r1, r2], getTuples(v,scale), d
-                return "polyline", getTuples(p,scale), getTuples(v,scale), d
+                curves = False
+                for e in p.Edges:
+                    if isinstance(e.Curve,Part.Circle):
+                        curves = True
+                    elif not isinstance(e.Curve,Part.Line):
+                        print "Arch.getIfcExtrusionData: Warning: unsupported edge type in profile"
+                if curves:
+                    # Composite profile
+                    ecurves = []
+                    for e in p.Edges:
+                        if isinstance(e.Curve,Part.Circle):
+                            p1 = e.FirstParameter
+                            p2 = e.LastParameter
+                            ecurves.append(["arc",getTuples(e.Curve.Center,scale),e.Curve.Radius*scale,[p1,p2]])
+                        else:
+                            ecurves.append(["line",[getTuples(vt.Point,scale) for vt in e.Vertexes]])
+                    return "composite", ecurves, getTuples(v,scale), d
+                else:
+                    # Polyline profile
+                    return "polyline", getTuples(p,scale), getTuples(v,scale), d
     return None   
     
 def getIfcBrepFacesData(obj,scale=1,tessellation=1):

src/Mod/Arch/ArchComponent.py

@@ -325,7 +325,7 @@ class Component:
             if obj.Base.isDerivedFrom("Part::Feature"):
                 if obj.Base.Shape:
                     if (len(obj.Base.Shape.Wires) == 1) and not(obj.Base.Shape.Faces):
-                        if not obj.Base.Shape.Wires.isClosed():
+                        if not obj.Base.Shape.Wires[0].isClosed():
                             return obj.Base.Shape.copy()
                     elif not(obj.Base.Shape.Solids):
                         p1 = obj.Base.Shape.CenterOfMass
@@ -391,6 +391,8 @@ class Component:
                                         sh = DraftGeomUtils.bind(w1,w2)
                                     if sh:
                                         wires.append(sh)
+                                else:
+                                    wires.append(wire)
         else:
             if (Draft.getType(obj) == "Structure") and (l > h):
                 if noplacement:

src/Mod/Arch/ifcWriter.py

@@ -508,18 +508,34 @@ class IfcDocument(object):
         isi = create(self._fileobject,"IfcStyledItem",[rep,[psa],None])
         return isi
         
-    def addProfile(self,ifctype,data):
+    def addProfile(self,ifctype,data,curvetype="AREA"):
         """addProfile(ifctype,data): creates a 2D profile of the given type, with the given
         data as arguments, which must be formatted correctly according to the type."""
         if ifctype == "IfcPolyline":
             pts = [create(self._fileobject,"IfcCartesianPoint",getTuple(p)[:2]) for p in data]
             pol = create(self._fileobject,"IfcPolyline",[pts])
-            profile = create(self._fileobject,"IfcArbitraryClosedProfileDef",["AREA",None,pol])
+            profile = create(self._fileobject,"IfcArbitraryClosedProfileDef",[curvetype,None,pol])
+        elif ifctype == "IfcCompositeCurve":
+            curves = []
+            for curve in data:
+                cur = None
+                if curve[0] == "line":
+                    cur = self.addProfile("IfcPolyline",curve[1])
+                elif curve[0] == "arc":
+                    pla = self.addPlacement(origin=curve[1],local=False,flat=True)
+                    cir = create(self._fileobject,"IfcCircle",[pla,curve[2]])
+                    trim1 = create(None,"IfcParameterValue",[curve[3][0]])
+                    trim2 = create(None,"IfcParameterValue",[curve[3][1]])
+                    cur = create(self._fileobject,"IfcTrimmedCurve",[cir,[trim1],[trim2]])
+                if cur:
+                    seg = create(self._fileobject,"IfcCompositeCurveSegment",["CONTINUOUS",True,cur])
+                    curves.append(seg)
+            profile = create(self._fileobject,"IfcCompositeCurve",[curves,False])
         else:
             if not isinstance(data,list):
                 data = [data]
             p = self.addPlacement(local=False,flat=True)
-            profile = create(self._fileobject,ifctype,["AREA",None,p]+data)
+            profile = create(self._fileobject,ifctype,[curvetype,None,p]+data)
         return profile
 
     def addExtrusion(self,profile,extrusion,placement=None):
@@ -565,6 +581,17 @@ class IfcDocument(object):
             self.addColor(color,exp)
         return exp
         
+    def addExtrudedCompositeCurve(self,curves,extrusion,placement=None,color=None):
+        """addExtrudedCompositeCurve(curves,extrusion,[placement,color]): makes an extruded polyline
+        from the given curves and the given extrusion vector"""
+        ccu = self.addProfile("IfcCompositeCurve",curves)
+        if not placement:
+            placement = self.addPlacement(origin=center,local=False)
+        exp = self.addExtrusion(ccu,extrusion,placement)
+        if color:
+            self.addColor(color,exp)
+        return exp
+        
     def addFace(self,face):
         """addFace(face): creates a face from the given face data (a list of lists of points).
         The first is the outer wire, the next are optional inner wires. They must be reversed in order"""

src/Mod/Arch/importIFC.py

@@ -1048,6 +1048,8 @@ def export(exportList,filename):
                     representation = ifc.addExtrudedCircle(gdata[1][0], gdata[1][1], gdata[2], color=color)
                 elif gdata[0] == "ellipse":
                     representation = ifc.addExtrudedEllipse(gdata[1][0], gdata[1][1], gdata[1][2], gdata[2], color=color)
+                elif gdata[0] == "composite":
+                    representation = ifc.addExtrudedCompositeCurve(gdata[1], gdata[2], color=color)
                 else:
                     print "debug: unknow extrusion type"
             elif fdata:

src/Mod/Assembly/Gui/Resources/translations/Assembly_af.ts

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
-<context>
+<TS version="2.0" language="af" sourcelanguage="en">
+  <context>
     <name>AssemblyGui::Workbench</name>
     <message>
-        <location filename="../../Workbench.cpp" line="+50"/>
-        <source>Assembly</source>
-        <translation>Samevoeging</translation>
+      <location filename="../../Workbench.cpp" line="+50"/>
+      <source>Assembly</source>
+      <translation>Samevoeging</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>CmdAssemblyConstraintAxle</name>
     <message>
-        <location filename="../../Command.cpp" line="+42"/>
-        <source>Assembly</source>
-        <translation>Samevoeging</translation>
+      <location filename="../../Command.cpp" line="+42"/>
+      <source>Assembly</source>
+      <translation>Samevoeging</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Constraint Axle...</source>
-        <translation>Beperking met &apos;n as...</translation>
+      <location line="+1"/>
+      <source>Constraint Axle...</source>
+      <translation>Beperking met 'n as...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>set a axle constraint between two objects</source>
-        <translation>definieer &apos;n bewegingsbeperking tussen twee voorwerpe met &apos;n as</translation>
+      <location line="+1"/>
+      <source>set a axle constraint between two objects</source>
+      <translation>definieer 'n bewegingsbeperking tussen twee voorwerpe met 'n as</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>Workbench</name>
     <message>
-        <source>Assembly</source>
-        <translation type="obsolete">Samevoeging</translation>
+      <source>Assembly</source>
+      <translation type="obsolete">Samevoeging</translation>
     </message>
-</context>
+  </context>
 </TS>

src/Mod/Assembly/Gui/Resources/translations/Assembly_cs.ts

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
-<context>
+<TS version="2.0" language="cs" sourcelanguage="en">
+  <context>
     <name>AssemblyGui::Workbench</name>
     <message>
-        <location filename="../../Workbench.cpp" line="+50"/>
-        <source>Assembly</source>
-        <translation>Sestava</translation>
+      <location filename="../../Workbench.cpp" line="+50"/>
+      <source>Assembly</source>
+      <translation>Sestava</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>CmdAssemblyConstraintAxle</name>
     <message>
-        <location filename="../../Command.cpp" line="+42"/>
-        <source>Assembly</source>
-        <translation>Sestava</translation>
+      <location filename="../../Command.cpp" line="+42"/>
+      <source>Assembly</source>
+      <translation>Sestava</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Constraint Axle...</source>
-        <translation>Vazba osy...</translation>
+      <location line="+1"/>
+      <source>Constraint Axle...</source>
+      <translation>Vazba osy...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>set a axle constraint between two objects</source>
-        <translation>Vlož osovou vazbu mezi dva objekty</translation>
+      <location line="+1"/>
+      <source>set a axle constraint between two objects</source>
+      <translation>Nastavit vazbu os mezi dvěma objekty</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>Workbench</name>
     <message>
-        <source>Assembly</source>
-        <translation type="obsolete">Sestava</translation>
+      <source>Assembly</source>
+      <translation type="obsolete">Sestava</translation>
     </message>
-</context>
+  </context>
 </TS>

src/Mod/Assembly/Gui/Resources/translations/Assembly_es-ES.ts

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
-<context>
+<TS version="2.0" language="es-ES" sourcelanguage="en">
+  <context>
     <name>AssemblyGui::Workbench</name>
     <message>
-        <location filename="../../Workbench.cpp" line="+50"/>
-        <source>Assembly</source>
-        <translation>Ensamblaje</translation>
+      <location filename="../../Workbench.cpp" line="+50"/>
+      <source>Assembly</source>
+      <translation>Ensamblaje</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>CmdAssemblyConstraintAxle</name>
     <message>
-        <location filename="../../Command.cpp" line="+42"/>
-        <source>Assembly</source>
-        <translation>Ensamblaje</translation>
+      <location filename="../../Command.cpp" line="+42"/>
+      <source>Assembly</source>
+      <translation>Ensamblaje</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Constraint Axle...</source>
-        <translation>Restricción de eje...</translation>
+      <location line="+1"/>
+      <source>Constraint Axle...</source>
+      <translation>Restricción de eje...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>set a axle constraint between two objects</source>
-        <translation>definir una restricción de eje entre dos objetos</translation>
+      <location line="+1"/>
+      <source>set a axle constraint between two objects</source>
+      <translation>definir una restricción de eje entre dos objetos</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>Workbench</name>
     <message>
-        <source>Assembly</source>
-        <translation type="obsolete">Ensamblaje</translation>
+      <source>Assembly</source>
+      <translation type="obsolete">Ensamblaje</translation>
     </message>
-</context>
+  </context>
 </TS>

src/Mod/Assembly/Gui/Resources/translations/Assembly_fi.ts

@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
-<context>
+<TS version="2.0" language="fi" sourcelanguage="en">
+  <context>
     <name>AssemblyGui::Workbench</name>
     <message>
-        <location filename="../../Workbench.cpp" line="+50"/>
-        <source>Assembly</source>
-        <translation>Kokoonpano</translation>
+      <location filename="../../Workbench.cpp" line="+50"/>
+      <source>Assembly</source>
+      <translation>Kokoonpano</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>CmdAssemblyConstraintAxle</name>
     <message>
-        <location filename="../../Command.cpp" line="+42"/>
-        <source>Assembly</source>
-        <translation>Kokoonpano</translation>
+      <location filename="../../Command.cpp" line="+42"/>
+      <source>Assembly</source>
+      <translation>Kokoonpano</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>Constraint Axle...</source>
-        <translation>Akseli rajoite...</translation>
+      <location line="+1"/>
+      <source>Constraint Axle...</source>
+      <translation>Akseli rajoite...</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <source>set a axle constraint between two objects</source>
-        <translation>aseta akselirajoite kahden kohteen välille</translation>
+      <location line="+1"/>
+      <source>set a axle constraint between two objects</source>
+      <translation>aseta akselirajoite kahden kohteen välille</translation>
     </message>
-</context>
-<context>
+  </context>
+  <context>
     <name>Workbench</name>
     <message>
-        <source>Assembly</source>
-        <translation type="obsolete">Kokoonpano</translation>
+      <source>Assembly</source>
+      <translation type="obsolete">Kokoonpano</translation>
     </message>
-</context>
+  </context>
 </TS>