Some reworks of AIRCAPs contributions, updated version and documentation

Author: chbergmann

CurvedArray.py

@@ -190,23 +190,19 @@ def execute(self, prop):
             self.makeRibs(prop)
             return
 
-    def onChanged(self, fp, prop):
-        proplist = ["Base", "Hullcurves", "Axis", "Items", "Positions", "OffsetStart", "OffsetEnd", "Twist", "Surface", "Solid", "Distribution", "DistributionReverse"]
-        for p in proplist:
-            if not hasattr(fp, p):
-                return
-        CurvedShapes.addObjectProperty(fp, "App::PropertyInteger", "LoftMaxDegree", "CurvedArray",   "Max Degree for Surface or Solid", init_val=5) # backwards compatibility - this upgrades older documents
-
-        if prop in proplist:                
-            if "Positions" in prop and len(fp.Positions) != 0:
-                setattr(fp,"Items",str(len(fp.Positions)))
-                outOfBounds = False
-                for p in fp.Positions:
-                    if (p < 0.0 or p > 1.0):
-                        outOfBounds = True
-                        break
-                if outOfBounds:
-                    FreeCAD.Console.PrintWarning("Some positions are out of bounds, should all be between 0.0 and 1.0, inclusive\n")
+    def onChanged(self, fp, prop):            
+        if not hasattr(fp, 'LoftMaxDegree'):
+            CurvedShapes.addObjectProperty(fp, "App::PropertyInteger", "LoftMaxDegree", "CurvedPathArray",   "Max Degree for Surface or Solid", init_val=5) # backwards compatibility - this upgrades older documents
+           
+        if "Positions" in prop and len(fp.Positions) != 0:
+            setattr(fp,"Items",str(len(fp.Positions)))
+            outOfBounds = False
+            for p in fp.Positions:
+                if (p < 0.0 or p > 1.0):
+                    outOfBounds = True
+                    break
+            if outOfBounds:
+                FreeCAD.Console.PrintWarning("Some positions are out of bounds, should all be between 0.0 and 1.0, inclusive\n")
 
 #background compatibility
 CurvedArrayWorker = CurvedArray

CurvedPathArray.py

@@ -182,11 +182,8 @@ def execute(self, prop):
             return
 
     def onChanged(self, fp, prop):
-        proplist = ["Base", "Hullcurves", "Path", "Items", "OffsetStart", "OffsetEnd", "Twist", "Surface", "Solid", "ScaleX", "ScaleY", "ScaleZ"]
-        for p in proplist:
-            if not hasattr(fp, p):
-                return 
-        CurvedShapes.addObjectProperty(obj,"App::PropertyInteger", "LoftMaxDegree", "CurvedPathArray",   "Max Degree for Surface or Solid", init_val=5) # backwards compatibility - this upgrades older documents
+        if not hasattr(fp, 'LoftMaxDegree'):
+            CurvedShapes.addObjectProperty(fp, "App::PropertyInteger", "LoftMaxDegree", "CurvedPathArray",   "Max Degree for Surface or Solid", init_val=5) # backwards compatibility - this upgrades older documents
 
 #background compatibility
 CurvedPathArrayWorker = CurvedPathArray

CurvedSegment.py

@@ -101,12 +101,10 @@ def execute(self, fp):
         self.update = True
 
 
-    def onChanged(self, fp, prop):
-        proplist = ["Shape1", "Shape2", "Hullcurves", "NormalShape1", "NormalShape2", "Items", "makeSurface", "makeSolid", "InterpolationPoints", "Twist", "TwistReverse", "Distribution", "DistributionReverse"]
-        for p in proplist:
-            if not hasattr(fp, p):
-                return
-        CurvedShapes.addObjectProperty(fp,"App::PropertyInteger", "LoftMaxDegree", "CurvedSegment",   "Max Degree for Surface or Solid", init_val=5) # backwards compatibility - this upgrades older documents
+    def onChanged(self, fp, prop):   
+        if not hasattr(fp, 'LoftMaxDegree'):
+            CurvedShapes.addObjectProperty(fp, "App::PropertyInteger", "LoftMaxDegree", "CurvedSegment",   "Max Degree for Surface or Solid", init_val=5) # backwards compatibility - this upgrades older documents
+
 
     def makeRibs(self, fp):
         interpolate = False

CurvedShapes.py

@@ -297,10 +297,11 @@ def makeCurvedArray(Base = None,
                     Distribution = 'linear',
                     DistributionReverse = False,
                     extract=False,
-                    Twists = []):
+                    Twists = [],
+                    LoftMaxDegree=5):
     import CurvedArray
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","CurvedArray")
-    CurvedArray.CurvedArray(obj, Base, Hullcurves, Axis, Items, Position, OffsetStart, OffsetEnd, Twist, Surface, Solid, Distribution, DistributionReverse, False, Twists)
+    CurvedArray.CurvedArray(obj, Base, Hullcurves, Axis, Items, Position, OffsetStart, OffsetEnd, Twist, Surface, Solid, Distribution, DistributionReverse, False, Twists, LoftMaxDegree)
     if FreeCAD.GuiUp:
         CurvedArray.CurvedArrayViewProvider(obj.ViewObject)
     FreeCAD.ActiveDocument.recompute()
@@ -322,10 +323,11 @@ def makeCurvedPathArray(Base = None,
                     Surface=False, 
                     Solid=False, 
                     doScale = [True, True, True],
-                    extract=False):
+                    extract=False,
+                    LoftMaxDegree=5):
     import CurvedPathArray
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","CurvedPathArray")
-    CurvedPathArray.CurvedPathArray(obj, Base, Path, Hullcurves, Items, OffsetStart, OffsetEnd, Twist, Surface, Solid, doScale, extract)
+    CurvedPathArray.CurvedPathArray(obj, Base, Path, Hullcurves, Items, OffsetStart, OffsetEnd, Twist, Surface, Solid, doScale, extract, LoftMaxDegree)
     if FreeCAD.GuiUp:
         CurvedPathArray.CurvedPathArrayViewProvider(obj.ViewObject)
     FreeCAD.ActiveDocument.recompute()
@@ -344,10 +346,11 @@ def makeCurvedSegment(Shape1 = None,
                     Twist = 0.0,
                     TwistReverse = False,
                     Distribution = 'linear',
-                    DistributionReverse = False):
+                    DistributionReverse = False,
+                    LoftMaxDegree=5):
     import CurvedSegment
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","CurvedSegment")
-    CurvedSegment.CurvedSegment(obj, Shape1, Shape2, Hullcurves, NormalShape1, NormalShape2, Items, Surface, Solid, InterpolationPoints, Twist, TwistReverse, Distribution, DistributionReverse)
+    CurvedSegment.CurvedSegment(obj, Shape1, Shape2, Hullcurves, NormalShape1, NormalShape2, Items, Surface, Solid, InterpolationPoints, Twist, TwistReverse, Distribution, DistributionReverse, LoftMaxDegree)
     if FreeCAD.GuiUp:
         CurvedSegment.CurvedSegmentViewProvider(obj.ViewObject)
     FreeCAD.ActiveDocument.recompute()
@@ -362,10 +365,11 @@ def makeInterpolatedMiddle(Shape1 = None,
                     Solid=False,
                     InterpolationPoints=16,
                     Twist = 0.0,
-                    TwistReverse = False):
+                    TwistReverse = False,
+                    LoftMaxDegree=5):
     import InterpolatedMiddle
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","InterpolatedMiddle")
-    InterpolatedMiddle.InterpolatedMiddle(obj, Shape1, Shape2, NormalShape1, NormalShape2, Surface, Solid, InterpolationPoints, Twist, TwistReverse)
+    InterpolatedMiddle.InterpolatedMiddle(obj, Shape1, Shape2, NormalShape1, NormalShape2, Surface, Solid, InterpolationPoints, Twist, TwistReverse, LoftMaxDegree)
     if FreeCAD.GuiUp:
         InterpolatedMiddle.InterpolatedMiddleViewProvider(obj.ViewObject)
     FreeCAD.ActiveDocument.recompute()

FlyingWingS800.py

@@ -81,7 +81,7 @@ def draw_S800():
     MiddleProfile = createSketch_MiddleProfile(doc)
     MiddleProfile.ViewObject.Visibility = False
 
-    MiddlePart1 = CurvedShapes.makeCurvedSegment(SplineFoilMiddle, SplineFoilWingInside, [MiddleProfile], Items=4, Surface=True, Solid=True, Distribution='elliptic', DistributionReverse=True)
+    MiddlePart1 = CurvedShapes.makeCurvedSegment(SplineFoilMiddle, SplineFoilWingInside, [MiddleProfile], Items=8, Surface=True, Solid=True, Distribution='elliptic', DistributionReverse=True, LoftMaxDegree=3)
     MiddlePart1.Label = "MiddlePart1"
     MiddlePart1.ViewObject.Visibility = False
 
@@ -104,8 +104,8 @@ def draw_S800():
     doc.recompute()
 
     sketchCutout = doc.addObject('Sketcher::SketchObject', 'sketchCutout')
-    sketchCutout.addGeometry(Part.LineSegment(Vector (0.0, 400.0, 0.0), Vector (274.99999999950205, 400.0, 0.0)), False)
-    sketchCutout.addGeometry(Part.LineSegment(Vector (274.99999999950205, 400.0, 0.0), Vector (75.0, 200.0, 0.0)), False)
+    sketchCutout.addGeometry(Part.LineSegment(Vector (0.0, 400.0, 0.0), Vector (275, 400.0, 0.0)), False)
+    sketchCutout.addGeometry(Part.LineSegment(Vector (275, 400.0, 0.0), Vector (75.0, 200.0, 0.0)), False)
     sketchCutout.addGeometry(Part.LineSegment(Vector (75.0, 200.0, 0.0), Vector (0.0, 200.0, 0.0)), False)
     sketchCutout.addGeometry(Part.LineSegment(Vector (0.0, 200.0, 0.0), Vector (0.0, 400.0, 0.0)), False)
     sketchCutout.addConstraint(Sketcher.Constraint('PointOnObject', 0, 1, -2))
@@ -121,7 +121,7 @@ def draw_S800():
     sketchCutout.addConstraint(Sketcher.Constraint('DistanceY', 2, 2, midLength))
     sketchCutout.addConstraint(Sketcher.Constraint('DistanceY', 3, 1, 3, 2, midLength))
     sketchCutout.ViewObject.Visibility = False
-    
+    sketchCutout.Placement.Base.x = -1
 
     cutout = doc.addObject('Part::Extrusion', 'cutout')
     cutout.Base = sketchCutout
@@ -164,9 +164,9 @@ def draw_S800():
         obj.ViewObject.hide()
 
     WingAndElevon = CompoundTools.Explode.explodeCompound(WingSlice)
-    Wing1 = WingAndElevon[0].Group[0]
+    Wing1 = WingAndElevon[0].Group[1]
     Wing1.Label = "Wing1"
-    ElevonLeft = WingAndElevon[0].Group[1]
+    ElevonLeft = WingAndElevon[0].Group[0]
     ElevonLeft.Label = "ElevonLeft"
 
 

InterpolatedMiddle.py

@@ -69,12 +69,10 @@ def execute(self, fp):
 
 
     def onChanged(self, fp, prop):
-        proplist = ["Shape1", "Shape2", "NormalShape1", "NormalShape2", "makeSurface", "makeSolid", "InterpolationPoints", "Twist", "TwistReverse"]
-        for p in proplist:
-            if not hasattr(fp, p):
-                return
-        CurvedShapes.addObjectProperty(fp,"App::PropertyInteger", "LoftMaxDegree", "InterpolatedMiddle",   "Max Degree for Surface or Solid", init_val=5) # backwards compatibility - this upgrades older documents)
-         
+        if not hasattr(fp, 'LoftMaxDegree'):
+            CurvedShapes.addObjectProperty(fp, "App::PropertyInteger", "LoftMaxDegree", "InterpolatedMiddle",   "Max Degree for Surface or Solid", init_val=5) # backwards compatibility - this upgrades older documents
+
+
     def makeRibs(self, fp):
         interpolate = False
         if len(fp.Shape1.Shape.Edges) != len(fp.Shape2.Shape.Edges):
@@ -176,11 +174,15 @@ def Activated(self):
             FreeCADGui.doCommand("import CurvedShapes")
 
             selection = FreeCADGui.Selection.getSelectionEx()
-            for sel in selection:
-                if sel == selection[0]:
-                    FreeCADGui.doCommand("shape1 = FreeCAD.ActiveDocument.getObject('%s')"%(selection[0].ObjectName))
-                elif sel == selection[1]:
-                    FreeCADGui.doCommand("shape2 = FreeCAD.ActiveDocument.getObject('%s')"%(selection[1].ObjectName))
+            if len(selection) < 1:
+                FreeCADGui.doCommand('shape1 = None')
+            else:
+                FreeCADGui.doCommand("shape1 = FreeCAD.ActiveDocument.getObject('%s')"%(selection[0].ObjectName))
+            
+            if len(selection) < 2:
+                FreeCADGui.doCommand('shape2 = None')
+            else:
+                FreeCADGui.doCommand("shape2 = FreeCAD.ActiveDocument.getObject('%s')"%(selection[1].ObjectName))
 
             FreeCADGui.doCommand("CurvedShapes.makeInterpolatedMiddle(shape1, shape2, Surface=True, Solid=False)")
             FreeCAD.ActiveDocument.recompute()        

LIESMICH.md

@@ -42,6 +42,7 @@ Zuerst das Basisobjekt auswählen, danach die Hüllkurven. Dann ein Curved Array
 - Solid: Einen Festkörper erstellen (funktioniert nur, wenn Base eine geschlossene Form ist)
 - Distribution: Algorithmus zur Berechnung der Distanz zwischen den Elementen. Default ist 'linear'. Weitere Möglichkeiten: parabolic (x²), x³, sinusoidal, asinusoidal, elliptic
 - DistributionReverse: Kehrt die Richtung des Distrubution Algorithmus um
+- LoftMaxDegree: Gradzahl für die Erstellung von Oberflächen und Festkörpern. 
 
 Distribution Linear  
 ![Linear](Examples/CurvedArrayLinear.jpg)  
@@ -95,6 +96,7 @@ Zuerst das Basisobjekt auswählen, danach den Pfad, und zum Schluss die Hüllkur
 - ScaleX: Hullcurves können in X Richtung skalieren
 - ScaleY: Hullcurves können in Y Richtung skalieren
 - ScaleZ: Hullcurves können in Z Richtung skalieren
+- LoftMaxDegree: Gradzahl für die Erstellung von Oberflächen und Festkörpern. 
 
 Wenn Hullcurves verwendet werden und die Objekte nicht rechtwinklig zum Path angeordnet sind, muss evtl. die Skaliereng in eine Raumrichtung ausgeschaltet werden, in dem ScaleX, ScaleY oder ScaleZ auf false gesetzt wird.
 
@@ -121,6 +123,7 @@ Zuerst zwei 2D Kurven auswählen, dann optional noch eine oder mehrere Hüllkurv
 - TwistReverse: wenn True, wird die Drehrichtung geändert
 - Distribution: Algorithmus zur Berechnung der Distanz zwischen den Elementen. Default ist 'linear'. Weitere Möglichkeiten: parabolic (x²), x³, sinusoidal, elliptic
 - DistributionReverse: Kehrt die Richtung des Distrubution Algorithmus um
+- LoftMaxDegree: Gradzahl für die Erstellung von Oberflächen und Festkörpern. 
 
 ### ![](./Resources/icons/CornerShape.svg) Interpolated Middle
 Interpoliert eine 2D Kurve in der Mitte zwischen zwei 2D Kurven. Es kann ein Verbinder mit einem Knick zwischen den den Kurven generiert werden.
@@ -140,6 +143,7 @@ Interpoliert eine 2D Kurve in der Mitte zwischen zwei 2D Kurven. Es kann ein Ver
 - TwistReverse: wenn True, wird die Drehrichtung geändert
 - Distribution: Algorithmus zur Berechnung der Distanz zwischen den Elementen. Default ist 'linear'. Weitere Möglichkeiten: parabolic (x²), x³, sinusoidal, elliptic
 - DistributionReverse: Kehrt die Richtung des Distrubution Algorithmus um
+- LoftMaxDegree: Gradzahl für die Erstellung von Oberflächen und Festkörpern. 
 
 
 ### ![](./Resources/icons/surfaceCut.svg) Surface Cut

README.md

@@ -49,6 +49,7 @@ The first curve that you select for CurvedArray creation will be the item that i
 - Solid: make a solid if Base is a closed shape
 - Distribution: Algorithm for distance between array elements. Default is 'linear'. Also selectable: parabolic (x²), x³, sinusoidal, asinusoidal, elliptic
 - DistributionReverse: Reverses the direction of the Distribution algorithm
+- LoftMaxDegree: degree for surface or solid creation. Play with this parameter if your surface or solid looks distorted
 
 Distribution Linear  
 ![Linear](Examples/CurvedArrayLinear.jpg)  
@@ -102,6 +103,7 @@ The first curve that you select for Curved Path Array creation will be the base
 - ScaleX: Scale by hullcurves in X direction
 - ScaleY: Scale by hullcurves in Y direction
 - ScaleZ: Scale by hullcurves in Z direction
+- LoftMaxDegree: degree for surface or solid creation. Play with this parameter if your surface or solid looks distorted
 
 The parameters ScaleX, ScaleY and ScaleZ have been added because you may want to rescale the items only in one direction, but the hullcurves normally cover 2 or three room directions.  
 
@@ -127,6 +129,7 @@ Select two 2D shapes first. The curved segment will be created between them. If
 - TwistReverse: Reverses the rotation of one Shape
 - Distribution: Algorithm for distance between array elements. Default is 'linear'. Also selectable: parabolic (x²), x³, sinusoidal, elliptic
 - DistributionReverse: Reverses the direction of the Distribution algorithm
+- LoftMaxDegree: degree for surface or solid creation. Play with this parameter if your surface or solid looks distorted
 
 ### ![CornerShapeIcon](./Resources/icons/CornerShape.svg) Interpolated Middle
 Interpolates a 2D shape into the middle between two 2D curves. The base shapes can be connected to a shape with a sharp corner.
@@ -144,6 +147,7 @@ Interpolates a 2D shape into the middle between two 2D curves. The base shapes c
 - InterpolationPoints: ignored if Shape1 and Shape2 have the same number of edges and poles. Otherwise all edges will be split (discretized) into this number of points  
 - Twist: Compensates a rotation between Shape1 and Shape2
 - TwistReverse: Reverses the rotation of one Shape
+- LoftMaxDegree: degree for surface or solid creation. Play with this parameter if your surface or solid looks distorted
 
 
 ### ![surfaceCutIcon](./Resources/icons/surfaceCut.svg) Surface Cut

package.xml

@@ -2,8 +2,8 @@
 <package format="1" xmlns="https://wiki.freecad.org/Package_Metadata">
   <name>Curved Shapes</name>
   <description>Create 3D shapes from 2D curves.</description>
-  <version>1.00.09</version>
-  <date>2024-04-17</date>
+  <version>1.00.10</version>
+  <date>2024-09-20</date>
   <maintainer email="[email protected]">Christi</maintainer>
   <license file="LICENSE">LGPL-2.1</license>
   <url type="repository" branch="master">https://github.com/chbergmann/CurvedShapesWorkbench</url>