Changeset 10135

Timestamp:

11/14/13 14:17:03 (11 years ago)

Author:

mkommend

Message:

#2082: Corrected marshalling and configuration of the Scilab .NET wrapper.

Location:

branches/HeuristicLab.ExternalEvaluation Scientific/DotNetScilab

Files:

• cs_example/cs_example.csproj (modified) (1 diff)
• dotnetsci/DotNet-Component-Scilab.config (modified) (1 diff)
• dotnetsci/Scilab.cs (modified) (2 diffs)
• dotnetsci/Scilab_cs_wrapper.cs (modified) (1 diff)

branches/HeuristicLab.ExternalEvaluation Scientific/DotNetScilab/cs_example/cs_example.csproj

@@ -100 +100 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/HeuristicLab.ExternalEvaluation Scientific/DotNetScilab/dotnetsci/DotNet-Component-Scilab.config

@@ -1 +1 @@
 <?xml version="1.0"?>
 <configuration>
-  <dllmap dll="call_scilab.dll" target="libcscilab.so/>
+  <dllmap dll="call_scilab.dll" target="libcscilab.so"/>
   <dllmap dll="api_scilab.dll" target="libcscilab.so"/>
   <dllmap dll="graphics.dll" target="libscigraphics.so"/>

branches/HeuristicLab.ExternalEvaluation Scientific/DotNetScilab/dotnetsci/Scilab.cs

@@ -54 +54 @@
 
       // start Scilab engine configurated without java
-      Scilab_cs_wrapper.StartScilab(null, null, null);
+      string SCI = System.Environment.GetEnvironmentVariable("SCI");
+      Scilab_cs_wrapper.StartScilab(SCI, null, null);
     }
     //=============================================================================
@@ -67 +68 @@
 
       // start Scilab engine
-      Scilab_cs_wrapper.StartScilab(null, null, null);
+      string SCI = System.Environment.GetEnvironmentVariable("SCI");
+      Scilab_cs_wrapper.StartScilab(SCI, null, null);
     }
     //=============================================================================

branches/HeuristicLab.ExternalEvaluation Scientific/DotNetScilab/dotnetsci/Scilab_cs_wrapper.cs

@@ -22 +22 @@
 
     //=============================================================================
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
     public unsafe struct api_Err {
       public int iErr;