Merge pull request #51 from piac/master

changes and fixes for post-Grasshopper 0.9.61 full compatibility.

Author: sbaer

Component/ComponentIOMarshal.cs

@@ -19,23 +19,22 @@ abstract class ComponentIOMarshal
 
   sealed class NewComponentIOMarshal : ComponentIOMarshal
   {
-    private readonly ZuiPythonComponent _component;
-
-    private readonly GrasshopperDocument _document;
-    private readonly CustomTable _objectTable;
+    private readonly ZuiPythonComponent m_component;
+    private readonly CustomTable m_objectTable;
+    private readonly GrasshopperDocument m_document;
 
     public NewComponentIOMarshal(GrasshopperDocument document, ZuiPythonComponent component)
     {
-      _document = document;
-      _objectTable = _document.Objects;
-      _component = component;
+      m_document = document;
+      m_objectTable = m_document.Objects;
+      m_component = component;
     }
 
     #region Inputs
 
     public override object GetInput(IGH_DataAccess DA, int i)
     {
-      var input = (Param_ScriptVariable) _component.Params.Input[i];
+      var input = (Param_ScriptVariable) m_component.Params.Input[i];
       bool addIntoGhDoc = input.TypeHint is GhDocGuidHint;
 
       object o;
@@ -76,7 +75,7 @@ private object GetListFromParameter(IGH_DataAccess DA, int index, bool addIntoGh
     {
       List<IGH_Goo> list2 = new List<IGH_Goo>();
       DA.GetDataList(index, list2);
-      IGH_TypeHint typeHint = ((Param_ScriptVariable) _component.Params.Input[index]).TypeHint;
+      IGH_TypeHint typeHint = ((Param_ScriptVariable) m_component.Params.Input[index]).TypeHint;
       var t = Type.GetType("IronPython.Runtime.List,IronPython");
       IList list = Activator.CreateInstance(t) as IList;
 
@@ -97,7 +96,7 @@ private object GetTreeFromParameter(IGH_DataAccess DA, int index, bool addIntoGh
     {
       GH_Structure<IGH_Goo> structure;
       DA.GetDataTree(index, out structure);
-      IGH_TypeHint typeHint = ((Param_ScriptVariable) _component.Params.Input[index]).TypeHint;
+      IGH_TypeHint typeHint = ((Param_ScriptVariable) m_component.Params.Input[index]).TypeHint;
       var tree = new DataTree<object>();
 
       for (int i = 0; i < structure.PathCount; i++)
@@ -120,7 +119,7 @@ private object GetTreeFromParameter(IGH_DataAccess DA, int index, bool addIntoGh
 
     private object TypeCast(IGH_Goo data, int index)
     {
-      Param_ScriptVariable variable = (Param_ScriptVariable) _component.Params.Input[index];
+      Param_ScriptVariable variable = (Param_ScriptVariable) m_component.Params.Input[index];
       return this.TypeCast(data, variable.TypeHint);
     }
 
@@ -146,11 +145,11 @@ public void DocumentSingle(ref object input, bool addIntoGhDoc)
       {
         if (input is GeometryBase)
         {
-          input = _objectTable.__InternalAdd(input as dynamic);
+          input = m_objectTable.__InternalAdd(input as dynamic);
         }
         else if (input is Point3d)
         {
-          input = _objectTable.AddPoint((Point3d) input);
+          input = m_objectTable.AddPoint((Point3d) input);
         }
       }
     }
@@ -186,8 +185,9 @@ public override void SetOutput(object o, IGH_DataAccess DA, int index)
         {
           o = (this as dynamic).GeometryTree(o as dynamic);
         }
-        catch
+        catch (Exception ex)
         {
+          Rhino.Runtime.HostUtils.ExceptionReport(ex);
         }
         DA.SetDataTree(index, o as IGH_DataTree);
       }
@@ -211,7 +211,7 @@ private void GeometrySingle(ref object input)
     {
       if (input is Guid)
       {
-        AttributedGeometry a = _objectTable.Find((Guid) input);
+        AttributedGeometry a = m_objectTable.Find((Guid) input);
         input = a.Geometry;
       }
     }
@@ -423,8 +423,9 @@ public override void SetOutput(object o, IGH_DataAccess DA, int index)
           {
             o = (this as dynamic).GeometryTree(o as dynamic);
           }
-          catch
+          catch (Exception ex)
           {
+            Rhino.Runtime.HostUtils.ExceptionReport(ex);
           }
         }
         DA.SetDataTree(index, o as IGH_DataTree);

Component/DocStringUtils.cs

@@ -5,26 +5,26 @@
 
 namespace GhPython.Component
 {
-/*
-# based on DocStrings as defined in
-# http://google-styleguide.googlecode.com/svn/trunk/pyguide.html#Comments
-""""""
-Title: Arithmetic Series
-Description: Computes the Sum of an Arithmetic Progression, or the
-sum of all numbers from F to L, included.
-    Args:
-        F: the first number included in the series.
-        L: the last number included in the series.
-    Returns:
-        S: If F > L, then sum of all numbers [F,L].
-            If F = L, then 0.
-            If F < L, then sum of all numbers (L,F).
-        K: Not used.
-    Help:
-        See also the Gauss elementary school story:
-        http://mathworld.wolfram.com/ArithmeticSeries.html
-""""""
-*/
+  /*
+  # based on DocStrings as defined in
+  # http://google-styleguide.googlecode.com/svn/trunk/pyguide.html#Comments
+  """"""
+  Title: Arithmetic Series
+  Description: Computes the Sum of an Arithmetic Progression, or the
+  sum of all numbers from F to L, included.
+      Args:
+          F: the first number included in the series.
+          L: the last number included in the series.
+      Returns:
+          S: If F > L, then sum of all numbers [F,L].
+              If F = L, then 0.
+              If F < L, then sum of all numbers (L,F).
+          K: Not used.
+      Help:
+          See also the Gauss elementary school story:
+          http://mathworld.wolfram.com/ArithmeticSeries.html
+  """"""
+  */
   class DocStringUtils
   {
     public static bool FindApplyDocString(string code, ScriptingAncestorComponent component)
@@ -55,7 +55,8 @@ public static bool FindApplyDocString(string code, ScriptingAncestorComponent co
         int endSeparator = line.IndexOf(_docStringSeparator);
         if (endSeparator != -1) line = line.Substring(0, endSeparator);
 
-        if (IsEmptyLine(line)) {
+        if (IsEmptyLine(line))
+        {
           if (endSeparator != -1) break;
           continue;
         }
@@ -141,7 +142,7 @@ private static void Send(string variable, ref StringBuilder result, KeywordType
     {
       if (variable != null)
       {
-        switch(type)
+        switch (type)
         {
           case KeywordType.Description:
             component.Description = result.ToString();
@@ -153,7 +154,7 @@ private static void Send(string variable, ref StringBuilder result, KeywordType
             FindAndDescribe(component.Params.Output, variable, result.ToString());
             break;
           case KeywordType.Help:
-            component.SpecialPythonHelpContent = result.ToString();
+            component.AdditionalHelpFromDocStrings = result.ToString();
             break;
         }
         result = new StringBuilder();
@@ -181,12 +182,6 @@ enum KeywordType
       Help,
     }
 
-    //private static void AppendText(StringBuilder result, string text)
-    //{
-    //  if (result.Length != 0) result.Append(" ");
-    //  result.Append(text);
-    //}
-
     private static void AddLine(StringBuilder result, string text)
     {
       if (result.Length != 0) result.AppendLine();
@@ -237,7 +232,7 @@ private static bool IsEmptyOrFullyCommentedOutLine(string line)
 
     public static string Htmlify(string input)
     {
-      string firstRepl = System.Text.RegularExpressions.Regex.Replace(input, "[<>&\"'\n]",
+      string firstRepl = System.Text.RegularExpressions.Regex.Replace(input, "[<>&\"'\n\r]",
         t =>
         {
           switch (t.Value)
@@ -254,6 +249,8 @@ public static string Htmlify(string input)
               return "&#39;";
             case "\n":
               return "<br>";
+            case "\r":
+              return string.Empty;
           }
           return string.Empty;
         });

Component/GHComponentsLoader.cs

@@ -72,7 +72,8 @@ public static void Add(IGH_Component component)
             {
                 object newobj = System.Activator.CreateInstance(t);
             }
-            catch(Exception ex)
+            
+ * (Exception ex)
             {
                 int h = 0; 
                     

Component/PyUpgrader.cs

@@ -14,24 +14,11 @@ public IGH_DocumentObject Upgrade(IGH_DocumentObject target, GH_Document documen
 
       ZuiPythonComponent component_new = new ZuiPythonComponent();
 
-      bool show_code_input = false;
-      if (component_OBSOLETE.CodeInputVisible)
-      {
-        // see if the "code" input on the old component really has anything
-        // hooked up to it.  If not, don't show the input
-        show_code_input = component_OBSOLETE.Params.Input[0].SourceCount > 0;
-      }
-      component_new.CodeInputVisible = show_code_input;
-
-      component_new.HideCodeOutput = component_OBSOLETE.HideCodeOutput;
+      component_new.HiddenCodeInput = component_OBSOLETE.HiddenCodeInput;
+      component_new.HiddenOutOutput = component_OBSOLETE.HiddenOutOutput;
 
-      if (component_new.HideCodeOutput)
-        component_new.Params.Output.RemoveAt(0);
-
-      if (!component_new.CodeInputVisible)
-        component_new.CodeInput = component_OBSOLETE.CodeInput;
-
-      component_OBSOLETE.Dispose();
+      if (!component_new.HiddenCodeInput)
+        component_new.Code = component_OBSOLETE.Code;
 
       if (GH_UpgradeUtil.SwapComponents(component_OBSOLETE, component_new))
       {
@@ -55,7 +42,8 @@ public IGH_DocumentObject Upgrade(IGH_DocumentObject target, GH_Document documen
           }
         }
 
-        component_new.CodeInputVisible = show_code_input;
+        component_OBSOLETE.Dispose();
+
         return component_new;
       }
       return null;
@@ -73,7 +61,7 @@ public Guid UpgradeTo
 
     public DateTime Version
     {
-      get { return new DateTime(2012, 3, 19, 21, 0, 0); }
+      get { return new DateTime(2013, 10, 14, 0, 0, 0); }
     }
   }
 }

Component/PythonComponent.cs

@@ -14,8 +14,8 @@ public class PythonComponent_OBSOLETE : ScriptingAncestorComponent, IGH_VarParam
   {
     protected override void AddDefaultInput(GH_Component.GH_InputParamManager inputManager)
     {
-      inputManager.RegisterParam(ConstructVariable(GH_VarParamSide.Input, "x"));
-      inputManager.RegisterParam(ConstructVariable(GH_VarParamSide.Input, "y"));
+      inputManager.AddParameter(ConstructVariable(GH_VarParamSide.Input, "x"));
+      inputManager.AddParameter(ConstructVariable(GH_VarParamSide.Input, "y"));
     }
 
     protected override void AddDefaultOutput(GH_Component.GH_OutputParamManager outputManager)
@@ -43,21 +43,21 @@ protected override void SetScriptTransientGlobals()
         case DocStorage.InGrasshopperMemory:
         case DocStorage.AutomaticMarshal:
           {
-            _py.ScriptContextDoc = _document;
-            _marshal = new OldComponentIOMarshal(_document, this);
-            _py.SetVariable(DOCUMENT_NAME, _document);
-            _py.SetIntellisenseVariable(DOCUMENT_NAME, _document);
+            m_py.ScriptContextDoc = m_document;
+            m_marshal = new OldComponentIOMarshal(m_document, this);
+            m_py.SetVariable(DOCUMENT_NAME, m_document);
+            m_py.SetIntellisenseVariable(DOCUMENT_NAME, m_document);
             break;
           }
         case DocStorage.InRhinoDoc:
           {
-            _py.ScriptContextDoc = Rhino.RhinoDoc.ActiveDoc;
-            _marshal = new OldComponentIOMarshal(Rhino.RhinoDoc.ActiveDoc, this);
+            m_py.ScriptContextDoc = Rhino.RhinoDoc.ActiveDoc;
+            m_marshal = new OldComponentIOMarshal(Rhino.RhinoDoc.ActiveDoc, this);
             Rhino.RhinoDoc.ActiveDoc.UndoRecordingEnabled = true;
-            if (_py.ContainsVariable(DOCUMENT_NAME))
+            if (m_py.ContainsVariable(DOCUMENT_NAME))
             {
-              _py.RemoveVariable(DOCUMENT_NAME);
-              _py.SetIntellisenseVariable(DOCUMENT_NAME, null);
+              m_py.RemoveVariable(DOCUMENT_NAME);
+              m_py.SetIntellisenseVariable(DOCUMENT_NAME, null);
             }
             break;
           }
@@ -88,7 +88,7 @@ public void SetDoc(object sender, EventArgs e)
       {
         try
         {
-          Component.CheckAndSetupActions();
+          Component.CheckIfSetupActionsAreNecessary();
 
           Component.DocStorageMode = NewDocStorage;
           Component.SetScriptTransientGlobals();
@@ -181,13 +181,13 @@ public bool IsOutputVariable
 
     public bool IsVariableParam(GH_VarParamEventArgs e)
     {
-      return e.Index > (!CodeInputVisible ? -1 : 0);
+      return e.Index > (!HiddenCodeInput ? -1 : 0);
     }
 
     public void ManagerConstructed(GH_VarParamSide side, Grasshopper.GUI.GH_VariableParameterManager manager)
     {
       string pool = (side == GH_VarParamSide.Input) ? "xyzuvw" : "abcdef";
-      manager.NameConstructor = new GH_CharPatternParamNameConstructor(pool, 4);
+      manager.NameConstructor = new Grasshopper.Kernel.GH_StringPattern(pool, 4);
     }
 
     public void ParametersModified(GH_VarParamSide side)