remove properties for direct data class access

Author: Gemini

examples/Camp_Envy_tie_prune_label.lpy

@@ -122,7 +122,7 @@ class Branch(BasicWood):
     self.contour = create_noisy_circle_curve(1, .2, 30)
 
   def is_bud_break(self, num_buds_segment):
-      return (rd.random() < 0.01*(1 - self.num_buds_segment/self.max_buds_segment))
+      return (rd.random() < 0.01*(1 - self.num_buds_segment/self.growth.max_buds_segment))
 
   def create_branch(self):
       self.num_buds_segment += 1
@@ -154,7 +154,7 @@ class Trunk(BasicWood):
     self.contour = create_noisy_circle_curve(1, .2, 30)
 
   def is_bud_break(self, num_buds_segment):
-    if (rd.random() > 0.2*(1 - num_buds_segment/self.max_buds_segment)):
+    if (rd.random() > 0.2*(1 - num_buds_segment/self.growth.max_buds_segment)):
       return False
     return True
 
@@ -186,7 +186,7 @@ class NonTrunk(BasicWood):
     self.contour = create_noisy_circle_curve(1, .2, 30)
 
   def is_bud_break(self, num_buds_segment):
-      return (rd.random() < 0.02*(1 - num_buds_segment/self.max_buds_segment))
+      return (rd.random() < 0.02*(1 - num_buds_segment/self.growth.max_buds_segment))
 
   def create_branch(self):
       if rd.random()>0.9:
@@ -291,7 +291,7 @@ def pruning_strategy(lstring): #Remove remnants of cut
   for j,i in enumerate(lstring):
     if i.name == 'C' and i[0].type.info.age > 6 and i[0].type.tying.has_tied == False and i[0].type.info.cut == False:
 
-      i[0].type.cut = True      
+      i[0].type.info.cut = True      
       #print("Cutting", i[0].type.name) 
       lstring = cut_using_string_manipulation(j, lstring)
       return True
@@ -528,7 +528,7 @@ bud(t) :
    parent_child_dict[t.type.name].append(new_object)
    #Store new object somewhere
    t.num_buds+=1
-   t.type.num_branches+=1
+   t.type.info.num_branches+=1
 
    # set a different cross section for every branch
    if 'Leaf' not in new_object.name and 'Apple' not in new_object.name:

examples/Envy_tie_prune_label.lpy

@@ -36,7 +36,7 @@ class Spur(BasicWood):
 
     # Keep count of number of leaves to not go over max_leaves
     self.num_leaves = 0
-    self.prunable = False
+    self.info.prunable = False
 
     # Every branch gets its own contour when it is constructed to ensure
     # branches each having a unique profile curve 
@@ -77,7 +77,7 @@ class Branch(BasicWood):
   def is_bud_break(self, num_break_buds):
       if num_break_buds >= 1:
         return False
-      return (rd.random() < 0.5*(1 - self.num_buds_segment/self.max_buds_segment))
+      return (rd.random() < 0.5*(1 - self.num_buds_segment/self.growth.max_buds_segment))
 
   def create_branch(self):
       self.num_buds_segment += 1
@@ -141,7 +141,7 @@ class NonTrunk(BasicWood):
     if not name:
       self.name = str(self.__class__.__name__) +'_'+ str(self.__class__.count)      
     Branch.count+=1
-    self.prunable = False
+    self.info.prunable = False
 
     # Every branch gets its own contour when it is constructed to ensure
     # branches each having a unique profile curve
@@ -255,7 +255,7 @@ def pruning_strategy(lstring):  # Remove remnants of cut
     cut = False  # Initialize the cut flag
     for j, i in enumerate(lstring):  # Loop through each element in the lstring
         if i.name == 'C' and i[0].type.info.age > 6 and i[0].type.tying.has_tied == False and i[0].type.info.cut == False and i[0].type.info.prunable and i[0].type.tying.guide_target==-1:
-            i[0].type.cut = True  # Set the cut flag to True
+            i[0].type.info.cut = True  # Set the cut flag to True
             lstring = cut_from(j, lstring)  # Cut the branch using string manipulation
             #TODO: Remove branch from parent_child dict and wire
             #if i[0].type.guide_target!=-1:
@@ -361,7 +361,7 @@ bud(t) :
      parent_child_dict[t.type.name].append(new_object)
      #Store new object somewhere
      t.num_buds+=1
-     t.type.num_branches+=1
+     t.type.info.num_branches+=1
 
      # Set a curve for tertiary branches to follow as they grow 
      if 'NonTrunk' in new_object.name:

examples/UFO_tie_prune_label.lpy

@@ -102,7 +102,7 @@ class Branch(BasicWood):
   def is_bud_break(self, num_buds_segment):
       if num_buds_segment >= 2:
         return False
-      if (rd.random() < 0.2*(1 - self.num_buds/self.max_buds_segment)):
+      if (rd.random() < 0.2*(1 - self.num_buds/self.growth.max_buds_segment)):
 
         return True  
 
@@ -319,7 +319,7 @@ bud(t) :
    parent_child_dict[t.type.name].append(new_object)
    #Store new object somewhere
    t.num_buds+=1
-   t.type.num_branches+=1
+   t.type.info.num_branches+=1
 
    if 'LittleBranch' in new_object.name:
      import time