Skip to content

Commit

Permalink
Merge branch 'master' into arch-roof-2
Browse files Browse the repository at this point in the history
  • Loading branch information
@j-wiedemann
j-wiedemann committed Mar 3, 2016
2 parents d113dea + 57c783e commit 2b66257
Show file tree
Hide file tree
Showing 134 changed files with 25,412 additions and 24,636 deletions.
22 changes: 11 additions & 11 deletions src/Mod/Arch/Resources/translations/Arch.ts
View file
Expand Up @@ -238,7 +238,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ArchStructure.py" line="523"/>
<location filename="ArchStructure.py" line="525"/>
<source>Axes systems this structure is built on</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -248,7 +248,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ArchStructure.py" line="524"/>
<location filename="ArchStructure.py" line="526"/>
<source>The element numbers to exclude when this structure is based on axes</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -618,7 +618,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ArchStructure.py" line="576"/>
<location filename="ArchStructure.py" line="578"/>
<source>Couldn&apos;t compute a shape</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -1348,7 +1348,7 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ArchStructure.py" line="400"/>
<location filename="ArchStructure.py" line="402"/>
<source>Unable to extrude the base shape
</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -2674,40 +2674,40 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela
<context>
<name>Workbench</name>
<message>
<location filename="InitGui.py" line="109"/>
<location filename="InitGui.py" line="73"/>
<source>Arch tools</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="110"/>
<location filename="InitGui.py" line="74"/>
<source>Draft tools</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="111"/>
<location filename="InitGui.py" line="75"/>
<source>Draft mod tools</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>arch</name>
<message>
<location filename="InitGui.py" line="113"/>
<location filename="InitGui.py" line="77"/>
<source>&amp;Architecture</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="116"/>
<location filename="InitGui.py" line="80"/>
<source>&amp;Draft</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="115"/>
<location filename="InitGui.py" line="79"/>
<source>Utilities</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="116"/>
<location filename="InitGui.py" line="80"/>
<source>Snapping</source>
<translation type="unfinished"></translation>
</message>
Expand Down
16 changes: 2 additions & 14 deletions src/Mod/Draft/DraftGeomUtils.py
View file
Expand Up @@ -2075,20 +2075,8 @@ def rebaseWire(wire,vidx):
if vidx > len(wire.Vertexes):
#print("Vertex index above maximum\n")
return wire
basepoint = wire.Vertexes[vidx-1].Point
#wire = Part.__sortEdges__(wire)
edges = []
start = False
for i in range(len(wire.Edges)):
if wire.Edges[i].Vertexes[0].Point == basepoint:
start = True
edges.append(wire.Edges[i])
elif start:
edges.append(wire.Edges[i])
if len(edges) < len(wire.Edges):
f = len(wire.Edges) - len(edges)
edges.extend(wire.Edges[0:f])
return Part.Wire(edges)
#This can be done in one step
return Part.Wire(wire.Edges[vidx-1:] + wire.Edges[:vidx-1])


# circle functions *********************************************************
Expand Down
70 changes: 35 additions & 35 deletions src/Mod/Draft/Resources/translations/Draft.ts
View file
Expand Up @@ -1754,12 +1754,12 @@ Values with differences below this value will be treated as same.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="127"/>
<location filename="InitGui.py" line="91"/>
<source>Draft creation tools</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="128"/>
<location filename="InitGui.py" line="92"/>
<source>Draft modification tools</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -2185,109 +2185,109 @@ Values with differences below this value will be treated as same.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2885"/>
<location filename="Draft.py" line="2889"/>
<source>Found groups: closing each open object inside
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2890"/>
<location filename="Draft.py" line="2894"/>
<source>Found mesh(es): turning into Part shapes
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2898"/>
<location filename="Draft.py" line="2902"/>
<source>Found 1 solidificable object: solidifying it
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2903"/>
<location filename="Draft.py" line="2907"/>
<source>Found 2 objects: fusing them
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2918"/>
<location filename="Draft.py" line="2922"/>
<source>Found 1 non-parametric objects: draftifying it
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2949"/>
<location filename="Draft.py" line="2953"/>
<source>Found 1 open wire: closing it
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2954"/>
<location filename="Draft.py" line="2958"/>
<source>Found several open wires: joining them
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2959"/>
<location filename="Draft.py" line="2963"/>
<source>Found several edges: wiring them
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2968"/>
<location filename="Draft.py" line="2972"/>
<source>Unable to upgrade these objects.
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3124"/>
<location filename="Draft.py" line="3128"/>
<source>Found 1 block: exploding it
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3136"/>
<location filename="Draft.py" line="3140"/>
<source>Found 1 parametric object: breaking its dependencies
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3143"/>
<location filename="Draft.py" line="3147"/>
<source>Found 2 objects: subtracting them
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3150"/>
<location filename="Draft.py" line="3154"/>
<source>Found several faces: splitting them
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3155"/>
<location filename="Draft.py" line="3159"/>
<source>Found several objects: subtracting them from the first one
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3160"/>
<location filename="Draft.py" line="3164"/>
<source>Found 1 face: extracting its wires
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3165"/>
<location filename="Draft.py" line="3169"/>
<source>Found only wires: extracting their edges
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3169"/>
<location filename="Draft.py" line="3173"/>
<source>No more downgrade possible
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="4600"/>
<location filename="Draft.py" line="4604"/>
<source>_BSpline.createGeometry: Closed with same first/last Point. Geometry not updated.
</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -2712,27 +2712,27 @@ Values with differences below this value will be treated as same.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="132"/>
<location filename="InitGui.py" line="96"/>
<source>&amp;Draft</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="130"/>
<location filename="InitGui.py" line="94"/>
<source>Utilities</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="131"/>
<location filename="InitGui.py" line="95"/>
<source>Wire tools</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="InitGui.py" line="132"/>
<location filename="InitGui.py" line="96"/>
<source>Snapping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="3130"/>
<location filename="Draft.py" line="3134"/>
<source>Found 1 multi-solids compound: exploding it
</source>
<translation type="unfinished"></translation>
Expand All @@ -2743,47 +2743,47 @@ Values with differences below this value will be treated as same.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2391"/>
<location filename="Draft.py" line="2393"/>
<source>BSplines and Bezier curves are not supported by this tool</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2387"/>
<location filename="Draft.py" line="2389"/>
<source>The given object is not planar and cannot be converted into a sketch.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2908"/>
<location filename="Draft.py" line="2912"/>
<source>Found several objects: creating a shell
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2913"/>
<location filename="Draft.py" line="2917"/>
<source>Found several coplanar objects or faces: creating one face
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2931"/>
<location filename="Draft.py" line="2935"/>
<source>Found 1 linear object: converting to line
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2939"/>
<location filename="Draft.py" line="2943"/>
<source>Found 1 closed sketch object: creating a face from it
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2944"/>
<location filename="Draft.py" line="2948"/>
<source>Found closed wires: creating faces
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2964"/>
<location filename="Draft.py" line="2968"/>
<source>Found several non-treatable objects: creating compound
</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -2897,13 +2897,13 @@ To enabled FreeCAD to download these libraries, answer Yes.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2507"/>
<location filename="Draft.py" line="2511"/>
<source>No object given
</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Draft.py" line="2510"/>
<location filename="Draft.py" line="2514"/>
<source>The two points are coincident
</source>
<translation type="unfinished"></translation>
Expand Down
10 changes: 5 additions & 5 deletions src/Mod/Fem/FemCommands.py
View file
Expand Up @@ -97,27 +97,27 @@ def analysis_has_solver(self):
return True
else:
return False

def hide_parts_constraints_show_meshes(self):
if FreeCAD.GuiUp:
for acnstrmesh in FreeCAD.activeDocument().Objects:
#if "Constraint" in acnstrmesh.TypeId:
# acnstrmesh.ViewObject.Visibility = False
if "Mesh" in acnstrmesh.TypeId:
aparttoshow = acnstrmesh.Name.replace("_Mesh","")
aparttoshow = acnstrmesh.Name.replace("_Mesh", "")
for apart in FreeCAD.activeDocument().Objects:
if aparttoshow == apart.Name:
apart.ViewObject.Visibility = False
acnstrmesh.ViewObject.Visibility = True #OvG: Hide constraints and parts and show meshes
acnstrmesh.ViewObject.Visibility = True # OvG: Hide constraints and parts and show meshes

def hide_meshes_show_parts_constraints(self):
if FreeCAD.GuiUp:
for acnstrmesh in FreeCAD.activeDocument().Objects:
if "Constraint" in acnstrmesh.TypeId:
acnstrmesh.ViewObject.Visibility = True
if "Mesh" in acnstrmesh.TypeId:
aparttoshow = acnstrmesh.Name.replace("_Mesh","")
aparttoshow = acnstrmesh.Name.replace("_Mesh", "")
for apart in FreeCAD.activeDocument().Objects:
if aparttoshow == apart.Name:
apart.ViewObject.Visibility = True
acnstrmesh.ViewObject.Visibility = False #OvG: Hide meshes and show constraints and meshed part e.g. on purging results
acnstrmesh.ViewObject.Visibility = False # OvG: Hide meshes and show constraints and meshed part e.g. on purging results

0 comments on commit 2b66257

Please sign in to comment.