V0.0.9

Author: PRadatz

CHANGELOG.rst

@@ -2,6 +2,12 @@
 Changelog
 =========
 
+0.0.9 (2021-01-21)
+------------------
+
+* text method returns string values (Jouni request)
+* OpenDSS exe 64bits included
+
 0.0.8 (2020-12-10)
 ------------------
 

docs/conf.py

@@ -28,7 +28,7 @@
 year = '2020'
 author = 'Paulo Radatz'
 copyright = '{0}, {1}'.format(year, author)
-version = release = '0.0.8'
+version = release = '0.0.9'
 
 extensions = [
     'sphinx.ext.autodoc',

docs/my_doc/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: d0b6eb947c5a91a263e6f187c1f794c0
+config: 1ea5f4f6e7dab9226acbdffdf0dd3e35
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/my_doc/_modules/index.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Overview: module code &mdash; py_dss_interface 0.0.7 documentation</title>
+  <title>Overview: module code &mdash; py_dss_interface 0.0.9 documentation</title>
 
 
 
@@ -59,7 +59,7 @@
 
 
               <div class="version">
-                0.0.7
+                0.0.9
               </div>
 
 
@@ -170,7 +170,7 @@ <h1>All modules for which code is available</h1>
 
         &copy; Copyright 2020, Paulo Radatz
       <span class="lastupdated">
-        Last updated on Oct 22, 2020.
+        Last updated on Jan 21, 2021.
       </span>
 
     </p>

docs/my_doc/_modules/py_dss_interface/DSS.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>py_dss_interface.DSS &mdash; py_dss_interface 0.0.7 documentation</title>
+  <title>py_dss_interface.DSS &mdash; py_dss_interface 0.0.9 documentation</title>
 
 
 
@@ -59,7 +59,7 @@
 
 
               <div class="version">
-                0.0.7
+                0.0.9
               </div>
 
 
@@ -168,7 +168,7 @@ <h1>Source code for py_dss_interface.DSS</h1><div class="highlight"><pre>
 
 <div class="viewcode-block" id="DSSDLL"><a class="viewcode-back" href="../../py_dss_interface.html#py_dss_interface.DSS.DSSDLL">[docs]</a><span class="k">class</span> <span class="nc">DSSDLL</span><span class="p">:</span>
 
-    <span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">dll_folder</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
+    <span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">dll_folder</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">dll_name</span><span class="o">=</span><span class="s2">&quot;OpenDSSDirect.dll&quot;</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;</span>
 <span class="sd">        Class to create an OpenDSS object</span>
 <span class="sd">        :param dll_folder: None will use the OpenDSS available within the package. The DDLL path allows to use a different OpenDSS</span>
@@ -182,20 +182,22 @@ <h1>Source code for py_dss_interface.DSS</h1><div class="highlight"><pre>
 
         <span class="k">if</span> <span class="n">platform</span><span class="o">.</span><span class="n">architecture</span><span class="p">()[</span><span class="mi">0</span><span class="p">]</span> <span class="o">==</span> <span class="s2">&quot;64bit&quot;</span><span class="p">:</span>
             <span class="n">dll64_path</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x64&quot;</span><span class="p">)</span>
-            <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">dll64_path</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">pathsep</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="n">dll64_path</span> <span class="ow">in</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]:</span>
+                <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">dll64_path</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">pathsep</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]</span>
             <span class="k">try</span><span class="p">:</span>
                 <span class="n">os</span><span class="o">.</span><span class="n">chdir</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x64&quot;</span><span class="p">))</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">WinDLL</span><span class="p">(</span><span class="s2">&quot;OpenDSSDirect.dll&quot;</span><span class="p">)</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">WinDLL</span><span class="p">(</span><span class="n">dll_name</span><span class="p">)</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">opendss_started</span> <span class="o">=</span> <span class="kc">True</span>
             <span class="k">except</span><span class="p">:</span>
                 <span class="n">os</span><span class="o">.</span><span class="n">chdir</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x64&quot;</span><span class="p">))</span>
-                <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">WinDLL</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x64&quot;</span><span class="p">,</span> <span class="s2">&quot;OpenDSSDirect.dll&quot;</span><span class="p">))</span>
+                <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">WinDLL</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x64&quot;</span><span class="p">,</span> <span class="n">dll_name</span><span class="p">))</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">opendss_started</span> <span class="o">=</span> <span class="kc">True</span>
         <span class="k">elif</span> <span class="n">platform</span><span class="o">.</span><span class="n">architecture</span><span class="p">()[</span><span class="mi">0</span><span class="p">]</span> <span class="o">==</span> <span class="s2">&quot;32bit&quot;</span><span class="p">:</span>
             <span class="n">dll86_path</span> <span class="o">=</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x86&quot;</span><span class="p">)</span>
-            <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">dll86_path</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">pathsep</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]</span>
+            <span class="k">if</span> <span class="ow">not</span> <span class="n">dll86_path</span> <span class="ow">in</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]:</span>
+                <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">dll86_path</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">pathsep</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">environ</span><span class="p">[</span><span class="s1">&#39;PATH&#39;</span><span class="p">]</span>
             <span class="n">os</span><span class="o">.</span><span class="n">chdir</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x86&quot;</span><span class="p">))</span>
-            <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x86&quot;</span><span class="p">,</span> <span class="s2">&quot;OpenDSSDirect.dll&quot;</span><span class="p">))</span>
+            <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">CDLL</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">dll_folder</span><span class="p">,</span> <span class="s2">&quot;x86&quot;</span><span class="p">,</span> <span class="n">dll_name</span><span class="p">))</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">opendss_started</span> <span class="o">=</span> <span class="kc">True</span>
         <span class="k">else</span><span class="p">:</span>
             <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Make sure you are using the OpenDSS DLL and Python with the same bits&quot;</span><span class="p">)</span>
@@ -210,6 +212,8 @@ <h1>Source code for py_dss_interface.DSS</h1><div class="highlight"><pre>
             <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;OpenDSS Failed to Start&quot;</span><span class="p">)</span>
 
     <span class="k">def</span> <span class="nf">_allocate_memory</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span><span class="o">.</span><span class="n">DSSPut_Command</span><span class="o">.</span><span class="n">restype</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span>
+
         <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span><span class="o">.</span><span class="n">ActiveClassS</span><span class="o">.</span><span class="n">restype</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span><span class="o">.</span><span class="n">BUSF</span><span class="o">.</span><span class="n">restype</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_double</span>
@@ -5496,9 +5500,9 @@ <h1>Source code for py_dss_interface.DSS</h1><div class="highlight"><pre>
 <span class="c1"># Text Interface</span>
 <div class="viewcode-block" id="DSSDLL.text"><a class="viewcode-back" href="../../py_dss_interface.html#py_dss_interface.DSS.DSSDLL.text">[docs]</a>    <span class="k">def</span> <span class="nf">text</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">argument</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;Can be used to send commands to the text interface of OpenDSS (DSS.Text).&quot;&quot;&quot;</span>
-        <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span><span class="o">.</span><span class="n">DSSPut_Command</span><span class="p">(</span><span class="n">argument</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="s1">&#39;ascii&#39;</span><span class="p">)))</span></div>
-        <span class="c1">#result = ctypes.c_char_p(self.dssObj.DSSPut_Command(comando.encode(&#39;ascii&#39;)))</span>
-        <span class="c1">#return result.value</span>
+        <span class="c1"># ctypes.c_char_p(self.dssObj.DSSPut_Command(argument.encode(&#39;ascii&#39;)))</span>
+        <span class="n">result</span> <span class="o">=</span> <span class="n">ctypes</span><span class="o">.</span><span class="n">c_char_p</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">dssObj</span><span class="o">.</span><span class="n">DSSPut_Command</span><span class="p">(</span><span class="n">argument</span><span class="o">.</span><span class="n">encode</span><span class="p">(</span><span class="s1">&#39;ascii&#39;</span><span class="p">)))</span>
+        <span class="k">return</span> <span class="n">result</span><span class="o">.</span><span class="n">value</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="s2">&quot;ascii&quot;</span><span class="p">)</span></div>
 
 <span class="c1"># Topology Interface</span>
 
@@ -6064,7 +6068,7 @@ <h1>Source code for py_dss_interface.DSS</h1><div class="highlight"><pre>
 
         &copy; Copyright 2020, Paulo Radatz
       <span class="lastupdated">
-        Last updated on Oct 22, 2020.
+        Last updated on Jan 21, 2021.
       </span>
 
     </p>

docs/my_doc/_static/documentation_options.js

@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.0.7',
+    VERSION: '0.0.9',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

docs/my_doc/authors.html

@@ -7,7 +7,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Authors &mdash; py_dss_interface 0.0.7 documentation</title>
+  <title>Authors &mdash; py_dss_interface 0.0.9 documentation</title>
 
 
 
@@ -61,7 +61,7 @@
 
 
               <div class="version">
-                0.0.7
+                0.0.9
               </div>
 
 
@@ -189,7 +189,7 @@ <h1>Authors<a class="headerlink" href="#authors" title="Permalink to this headli
 
         &copy; Copyright 2020, Paulo Radatz
       <span class="lastupdated">
-        Last updated on Oct 22, 2020.
+        Last updated on Jan 21, 2021.
       </span>
 
     </p>