minimum changes to later get compilation to work

Author: piac

Component/PythonComponent.cs

@@ -43,10 +43,10 @@ protected override void SetScriptTransientGlobals()
         case DocStorage.InGrasshopperMemory:
         case DocStorage.AutomaticMarshal:
           {
-            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);
+            m_py.ScriptContextDoc = g_document;
+            m_marshal = new OldComponentIOMarshal(g_document, this);
+            m_py.SetVariable(DOCUMENT_NAME, g_document);
+            m_py.SetIntellisenseVariable(DOCUMENT_NAME, g_document);
             break;
           }
         case DocStorage.InRhinoDoc:

Component/ScriptingAncestorComponent.cs

@@ -18,8 +18,10 @@ namespace GhPython.Component
   public abstract class ScriptingAncestorComponent : SafeComponent
   {
     static bool g_resources_unpacked = false;
+    internal static GrasshopperDocument g_document = new GrasshopperDocument();
+
     private readonly StringList m_py_output = new StringList(); // python output stream is piped here
-    internal static GrasshopperDocument m_document = new GrasshopperDocument();
+
     internal ComponentIOMarshal m_marshal;
     protected PythonScript m_py;
     private PythonCompiledCode m_compiled_py;
@@ -80,7 +82,7 @@ private static void UnpackScriptResources()
         // if we get to here, we need to unpack the resources
         if (!Directory.Exists(settings_directory))
           Directory.CreateDirectory(settings_directory);
-        string ghpython_package_dir = Path.Combine(settings_directory, "lib", "ghpython");
+        string ghpython_package_dir = Path.Combine(settings_directory, "lib", "gh_python");
         if (Directory.Exists(ghpython_package_dir))
           Directory.Delete(ghpython_package_dir, true);
         Directory.CreateDirectory(ghpython_package_dir);
@@ -127,7 +129,6 @@ protected override void Initialize()
       m_py = PythonScript.Create();
       if (m_py != null)
       {
-        //UnpackScriptResources();
         SetScriptTransientGlobals();
         m_py.Output = m_py_output.Write;
         m_py.SetVariable("__name__", "__main__");
@@ -139,6 +140,11 @@ protected override void Initialize()
         m_py.ContextId = 2; // 2 is Grasshopper
 
         m_env.LoadAssembly(typeof(GH_Component).Assembly); //add Grasshopper.dll reference
+        m_env.LoadAssembly(typeof(ZuiPythonComponent).Assembly); //add GHPython.dll reference
+
+        UnpackScriptResources();
+
+        m_env.AddGhPythonPackage();
       }
     }
     #endregion
@@ -320,6 +326,8 @@ private static Param_String ConstructOutOutputParam()
 
     protected override void SafeSolveInstance(IGH_DataAccess da)
     {
+      m_env.DataAccessManager = da;
+
       if (m_py == null)
       {
         da.SetData(0, "No Python engine available. This component needs Rhino v5");
@@ -333,7 +341,7 @@ protected override void SafeSolveInstance(IGH_DataAccess da)
 
       var rhdoc = RhinoDoc.ActiveDoc;
       var prevEnabled = (rhdoc != null) && rhdoc.Views.RedrawEnabled;
-
+      
       try
       {
         // set output variables to "None"
@@ -424,7 +432,7 @@ protected override void SafeSolveInstance(IGH_DataAccess da)
 
     private bool AddLocalPath(out string path)
     {
-      string probe_location = m_document.Path;
+      string probe_location = g_document.Path;
       if (string.IsNullOrWhiteSpace(probe_location)) { path = null; return false; }
 
       probe_location = Path.GetDirectoryName(probe_location);
@@ -533,8 +541,24 @@ protected virtual void SetScriptTransientGlobals()
 
     private void OnDocSolutionEnd(object sender, GH_SolutionEventArgs e)
     {
-      if (m_document != null)
-        m_document.Objects.Clear();
+      if (g_document != null)
+        g_document.Objects.Clear();
+    }
+
+    internal void RemoveAllVariables()
+    {
+      var variables = m_py.GetVariableNames().ToArray();
+
+      for (int i = 0; i < variables.Length; i++)
+      {
+        var variable = variables[i];
+
+        if (string.IsNullOrWhiteSpace(variable)) continue;
+        if (variable.StartsWith("_")) continue;
+        if (variable == DOCUMENT_NAME || variable == PARENT_ENVIRONMENT_NAME) continue;
+        
+        m_py.RemoveVariable(variables[i]);
+      }
     }
 
     #endregion
@@ -815,5 +839,9 @@ protected override void Dispose(bool disposing)
       }
     }
     #endregion
+
+    #region Properties Access
+    internal PythonScript PythonScript { get { return m_py; } }
+    #endregion
   }
 }

Component/ZUIPythonComponent.cs

@@ -144,10 +144,10 @@ protected override void SetScriptTransientGlobals()
     {
       base.SetScriptTransientGlobals();
 
-      m_py.ScriptContextDoc = m_document;
-      m_marshal = new NewComponentIOMarshal(m_document, this);
-      m_py.SetVariable(DOCUMENT_NAME, m_document);
-      m_py.SetIntellisenseVariable(DOCUMENT_NAME, m_document);
+      m_py.ScriptContextDoc = g_document;
+      m_marshal = new NewComponentIOMarshal(g_document, this);
+      m_py.SetVariable(DOCUMENT_NAME, g_document);
+      m_py.SetIntellisenseVariable(DOCUMENT_NAME, g_document);
     }
 
     public override Guid ComponentGuid

Properties/AssemblyInfo.cs

@@ -17,5 +17,5 @@
 
 
 // [0.5.1.0] 6 August 2012 S. Baer - updated version numbers as minor update to be compatible with GH 0.9
-[assembly: AssemblyVersion("0.5.101.0")]
-[assembly: AssemblyFileVersion("0.5.101.0")]
+[assembly: AssemblyVersion("0.6.0.1")]
+[assembly: AssemblyFileVersion("0.6.0.1")]

package/components.py

@@ -90,7 +90,7 @@ def function_description(description, params):
         return '\n'.join(rc)
 
     import sys, types, re
-    core_module = sys.modules['ghpython.components']
+    core_module = sys.modules['gh_python.components']
     translate_from = u"|+-*\u2070\u00B9\u00B2\u00B3\u2074\u2075\u2076\u2077\u2078\u2079"
     translate_to = "X__x0123456789"
     transl = dict(zip(translate_from, translate_to))