set version to 0.03

rename property horizontal_shift -> vertical_shift
add update functions to update freecad objects to newer versions of openglider

Author: looooo

docs/ideas/induced-aoa-and-profile-drag.md

@@ -0,0 +1,13 @@
+# profile-drag
+
+To make good prediction of the position of the lower attachment point (connection harness/glider) it's necessary to know about all acting forces. All forces are split into drag (parallel to v_inf) and lift (perpendicular to v_inf)
+- Lift of the wing:
+		Predicted via the panel-method (para-bem) by summing pressure over all surfaces and computing the v_inf perpendicular part. Dependent on wake definitions.
+- Induced drag:
+		Predicted via the panel-method (para-bem) by summing pressure over all surfaces and computing the v_inf parallel part.
+- Line drag are predicted with a specific cd-value for each line and is accessible via `lineset.get_drag`.
+- Pilot drag:
+		Best to predict with experiement / calibration.  s * rho * v**2 / 2  (s ~ 0.8, rho = 1.2, v ~ 11)
+- Profile-drag:
+		Lift and drag predicted by computing the potential-flow does not take viscous drag into account. A prediction can be made by using the known drag and a given glide-angle.
+

freecad/freecad_glider/init_gui.py

@@ -10,44 +10,6 @@
 
 
 
-# as long as this isn't part of std pivy:
-########################################################################################
-def SoGroup__iadd__(self, other):
-    if isinstance(other, (list, tuple)):
-        for other_i in other:
-            self.__iadd__(other_i)
-        return self
-    else:
-        try:
-            self.addChild(other)
-            return self
-        except TypeError as e:
-            raise TypeError(str(self.__class__) + " accepts only objects of type pivy.coin.SoNode")
-
-def SoGroup__isub__(self, other):
-    if isinstance(other, (list, tuple)):
-        for other_i in other:
-            self.__isub__(other_i)
-        return self
-    else:
-        try:
-            self.removeChild(other)
-            return self
-        except TypeError as e:
-            raise TypeError(str(self.__class__) + " can't remove child of type " + str(type(other)))
-
-
-def SoGroup_getByName(self, name):
-    for child in self:
-        if name == child.getName():
-            return child
-    return None
-
-
-coin.SoGroup.__iadd__ = SoGroup__iadd__
-coin.SoGroup.__isub__ = SoGroup__isub__
-coin.SoGroup.getByName = SoGroup_getByName
-########################################################################################
 
 Dir = os.path.abspath(os.path.dirname(__file__))
 Gui.addIconPath(os.path.join(Dir, 'icons'))
@@ -151,8 +113,7 @@ def Initialize(self):
         self.appendToolbar('GliderView', self.viewBox)
         self.appendToolbar('Develop', self.devBox)
 
-
-        Gui.addPreferencePage(Dir + '/ui/preferences.ui', 'Display')
+        # Gui.addPreferencePage(Dir + '/ui/preferences.ui', 'glider')
 
     def Activated(self):
         pass

freecad/freecad_glider/tools/backward_comatipility.py

@@ -0,0 +1,39 @@
+# updaing projects to newer versions of openglider and dependencies
+# defining an interface to do this?
+
+import openglider
+from freecad import app
+from .glider import addProperty
+
+# 1 write update function:
+# 2 append function to "version_update"
+
+def version_update(obj):
+    from_0_01_to_0_02(obj)
+    from_0_02_to_0_03(obj)
+
+def from_0_01_to_0_02(obj):
+    # no version was specified so we have to update to 0.2
+    if not hasattr(obj, "openglider_version"):
+        obj.addProperty('App::PropertyString',
+                'openglider_version', 'metadata',
+                'the version of openglider used to create this glider', 1)
+
+        obj.addProperty('App::PropertyString',
+                'freecad_version', 'metadata',
+                'the version of openglider used to create this glider', 1)
+
+        obj.openglider_version = "0.02"
+        obj.freecad_version = "{}.{}".format(*app.Version())
+        app.Console.PrintWarning("updating {} from openglider 0.01 to openglider 0.02\n".format(obj.Label))
+
+def from_0_02_to_0_03(obj):
+    if obj.openglider_version == "0.02":
+        if hasattr(obj, "horizontal_shift"):
+            value = obj.horizontal_shift
+            obj.removeProperty("horizontal_shift")
+            addProperty(obj, 'vertical_shift', value, 'hole', 'relative vertical shift')
+        obj.openglider_version = "0.03"
+        app.Console.PrintWarning("updating {} from openglider 0.02 to openglider 0.03\n".format(obj.Label))
+
+

freecad/freecad_glider/tools/features.py

@@ -63,16 +63,17 @@ def onDocumentRestored(self, obj):
                 self.obj.parent.ViewObject.Visibility = False
             self.obj.parent.Proxy.onDocumentRestored(self.obj.parent)
 
+            from . import backward_comatipility as bc
+            bc.version_update(obj)
+
+            # if we have modified the glider without gui, the view-provider is empty and we
+            # have to resore it:
             if App.GuiUp and not self.obj.ViewObject.Proxy:
                 self.restore_view_provider()  # defined in parent class
-            # backward compatibility (remove this)
-            # self.obj.Proxy.addProperties()
 
             self.obj.ViewObject.Proxy.recompute = True
             # we have blocked the automatic update mechanism. so now we have to call it manually
             if self.obj.ViewObject.Visibility:
-                print(self)
-                print("updating the view")
                 self.obj.ViewObject.Proxy.updateData(prop='Visibility')
 #########################################################################################
 
@@ -184,7 +185,6 @@ def __init__(self, obj, parent):
     def getGliderInstance(self):
         glider = copy.deepcopy(self.obj.parent.Proxy.getGliderInstance())
         new_ribs = []
-        self.addProperties()
 
         single_skin_par = {'att_dist': self.obj.att_dist,
                            'height': self.obj.height,
@@ -221,7 +221,7 @@ def getGliderInstance(self):
                     att_pnt.rib_pos < self.obj.max_hole_pos):
                     att_pnt.rib.holes.append(RibHole(att_pnt.rib_pos,
                                                      size=hole_size,
-                                                     horizontal_shift=self.obj.horizontal_shift))
+                                                     vertical_shift=self.obj.vertical_shift))
         for i, rib in enumerate(glider.ribs):
             rib.xrot = self.obj.xrot[i]
 
@@ -239,7 +239,7 @@ def addProperties(self):
         self.addProperty('hole_height', 0.7, 'hole', 'height of ellipse')
         self.addProperty('hole_width', 0.3, 'hole', 'width of ellipse')
         self.addProperty('max_hole_pos', 1., 'hole', 'maximal relative position of hole')
-        self.addProperty('horizontal_shift', 0.2, 'hole', 'relative horizontal shift')
+        self.addProperty('vertical_shift', 0.2, 'hole', 'relative vertical shift')
         self.addProperty('min_hole_pos', 0.2, 'hole', 'minimal relative position of hole')
         self.addProperty('continued_min', False, 'bows', 'add an offset to the airfoil')
         self.addProperty('continued_min_end', 0.9, 'bows', 'no idea')
@@ -269,7 +269,6 @@ def addProperties(self):
     def getGliderInstance(self):
         glider = copy.deepcopy(self.obj.parent.Proxy.getGliderInstance())
         new_ribs = []
-        self.addProperties()
 
         for i, rib in enumerate(glider.ribs):
             if i in self.obj.flap_ribs:
@@ -292,7 +291,6 @@ def getGliderInstance(self):
 
         ribs = [rib for i, rib in enumerate(glider.ribs) if i in self.obj.ribs]
         new_ribs = []
-        self.addProperties()
 
         hole_size = np.array([self.obj.hole_width, self.obj.hole_height])
         if self.obj.holes:
@@ -302,7 +300,7 @@ def getGliderInstance(self):
                     att_pnt.rib_pos < self.obj.max_hole_pos):
                     att_pnt.rib.holes.append(RibHole(att_pnt.rib_pos,
                                                      size=hole_size,
-                                                     horizontal_shift=self.obj.horizontal_shift,
+                                                     vertical_shift=self.obj.vertical_shift,
                                                      rotation=self.obj.rotation))
 
         return glider
@@ -313,7 +311,7 @@ def addProperties(self):
         self.addProperty('hole_height', 0.7, 'hole', 'height of ellipse')
         self.addProperty('hole_width', 0.3, 'hole', 'width of ellipse')
         self.addProperty('max_hole_pos', 1., 'hole', 'maximal relative position of hole')
-        self.addProperty('horizontal_shift', 0.2, 'hole', 'relative horizontal shift')
+        self.addProperty('vertical_shift', 0.2, 'hole', 'relative vertical shift')
         self.addProperty('min_hole_pos', 0.2, 'hole', 'minimal relative position of hole')
         self.addProperty('rotation', 0.0, 'hole', 'docs')
 

freecad/freecad_glider/tools/glider.py

@@ -5,6 +5,7 @@
 import numpy as np
 
 import FreeCAD as App
+import openglider
 from openglider import jsonify, mesh
 from openglider.glider import ParametricGlider
 from openglider.glider.cell.elements import TensionLine
@@ -30,6 +31,7 @@ def coin_SoSwitch(parent, name):
 # a list of all default parameters
 preference_table = {'default_show_half_glider': (bool, True),
                     'default_show_panels': (bool, False),
+                    'default_fill_ribs': (bool, True),
                     'default_num_prof_points': (int, 20),
                     'default_num_cell_points': (int, 0),
                     'default_num_line_points': (int, 2),
@@ -79,7 +81,7 @@ def mesh_sep(mesh, color, draw_lines=False):
         sep += [line_mat, line_set]
     return sep
 
-def _addProperty(obj, name, value, group, docs, p_type=None):
+def addProperty(obj, name, value, group, docs, p_type=None):
     '''
     property_list:
     property_name property_value, property_group, property_docs
@@ -118,7 +120,16 @@ def _addProperty(obj, name, value, group, docs, p_type=None):
 
 class OGBaseObject(object):
     def __init__(self, obj):
+        obj.addProperty('App::PropertyString',
+                'openglider_version', 'metadata',
+                'the version of openglider used to create this glider', 1)
+
+        obj.addProperty('App::PropertyString',
+                'freecad_version', 'metadata',
+                'the version of openglider used to create this glider', 1)
         obj.Proxy = self
+        obj.openglider_version = openglider.__version__
+        obj.freecad_version = "{}.{}".format(*App.Version())
         self.obj = obj
 
     def addProperties(self):
@@ -128,7 +139,7 @@ def execute(self, fp):
         pass
 
     def addProperty(self, name, value, group, docs, p_type=None):
-        _addProperty(self.obj, name, value, group, docs, p_type)
+        addProperty(self.obj, name, value, group, docs, p_type)
 
     def restore_view_provider(self):
         # adding the Proxy to the ViewObject (FeaturePython)
@@ -144,7 +155,7 @@ def __init__(self, view_obj):
         self.obj = view_obj.Object
 
     def addProperty(self, name, value, group, docs, p_type=None, view_obj=None):
-        _addProperty(view_obj or self.view_obj, name, value, group, docs, p_type)        
+        addProperty(view_obj or self.view_obj, name, value, group, docs, p_type)        
 
     def attach(self, view_obj):
         self.view_obj = view_obj
@@ -235,20 +246,18 @@ def __setstate__(self, state):
     def onDocumentRestored(self, obj):
         if not hasattr(self, 'obj'):  # make sure this function is only run once
             self.obj = obj
+            from . import backward_comatipility as bc
 
-            # backward compatibility (remove this)
-            try:
-                self.obj.ViewObject.Proxy.addProperties(self.obj.ViewObject)
-            except AttributeError:
-                # this doesn't work always
-                pass
+            bc.version_update(obj)
 
+            # if we have modified the glider without gui, the view-provider is empty and we
+            # have to resore it:
             if App.GuiUp and not self.obj.ViewObject.Proxy:
                 self.restore_view_provider()
             self.obj.ViewObject.Proxy.recompute = True
             # we have blocked the automatic update mechanism. so now we have to call it manually
-            if self.obj.ViewObject.Visibility:
-                self.obj.ViewObject.Proxy.updateData(prop='Visibility')
+            # if self.obj.ViewObject.Visibility:
+            #     self.obj.ViewObject.Proxy.updateData(prop='Visibility')
 ##################################################################################
 
 # the update system on file-open of freecad is difficult.
@@ -309,7 +318,7 @@ def __init__(self, view_obj):
         view_obj.ribs = True
         view_obj.half_glider = get_parameter('default_show_half_glider')
         view_obj.hole_num = get_parameter('default_num_hole_points')
-        view_obj.fill_ribs = False
+        view_obj.fill_ribs = get_parameter('default_fill_ribs')
         view_obj.x = 0.
         view_obj.y = 0.
         view_obj.z = 0.