summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjofret2008-06-06 15:41:12 +0000
committerjofret2008-06-06 15:41:12 +0000
commit41512442614eb22d701e15007dbb25965b9c824a (patch)
tree49a2a3c28d2abd57af8d2cdaddedb6c9881cef3c
parent3a19a1a1520a3f1c776564f0614755c70bdef9d7 (diff)
downloadscilab2c-41512442614eb22d701e15007dbb25965b9c824a.tar.gz
scilab2c-41512442614eb22d701e15007dbb25965b9c824a.tar.bz2
scilab2c-41512442614eb22d701e15007dbb25965b9c824a.zip
- Add relative Path
- FIX Useless close (?)
-rw-r--r--src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci11
-rw-r--r--src/Scilab2C/Scilab2C/full_reset.sce12
-rw-r--r--src/Scilab2C/Scilab2C/runscicode.sci2
3 files changed, 18 insertions, 7 deletions
diff --git a/src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci b/src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci
index 974cbb3b..06f9ef1d 100644
--- a/src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci
+++ b/src/Scilab2C/Scilab2C/LaunchRunSCI2C.sci
@@ -5,21 +5,26 @@
// --- CLEAN WORKSPACE ---
exec full_reset.sce;
-mode(-1);
+//mode(-1);
// --- GENERAL SETTINGS (USER PARAMETERS) ---
RunsDirectory = pwd(); // Path of the SCI2CRuns directory
//
// FIXME : Must be a relative path or user input but neither absolute path.
+// FIXED : Need to be tested.
//
-SCI2CDirectory = 'D:\NutricatoGAPSVN\PROGETTI_APERTI\POLIBA\hArtes\WP2_SCI2C\Software\Version_alpha\Scilab2C'; // Path of the Scilab2C directory
+//SCI2CDirectory = 'D:\NutricatoGAPSVN\PROGETTI_APERTI\POLIBA\hArtes\WP2_SCI2C\Software\Version_alpha\Scilab2C'; // Path of the Scilab2C directory
+SCI2CDirectory = '.';
// --- SPECIFIC SETTINGS (USER PARAMETERS) ---
//
// FIXME : Must be a relative path or user input but neither absolute path.
+// FIXED : Need to be tested.
//
-SCI2CInputPrmFileName = 'D:\NutricatoGAPSVN\PROGETTI_APERTI\POLIBA\hArtes\WP2_SCI2C\Software\Version_alpha\SCI2CTests\test999_WorkingDir\SCI2CInputParameters.sce'; // Path + file name of the input parameters.
+//SCI2CInputPrmFileName =
+//'D:\NutricatoGAPSVN\PROGETTI_APERTI\POLIBA\hArtes\WP2_SCI2C\Software\Version_alpha\SCI2CTests\test999_WorkingDir\SCI2CInputParameters.sce'; // Path + file name of the input parameters.
+SCI2CInputPrmFileName = '../SCI2CTests/test999_WorkingDir/SCI2CInputParameters.sce';
// --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
cd(SCI2CDirectory)
diff --git a/src/Scilab2C/Scilab2C/full_reset.sce b/src/Scilab2C/Scilab2C/full_reset.sce
index 0c8a935e..43173293 100644
--- a/src/Scilab2C/Scilab2C/full_reset.sce
+++ b/src/Scilab2C/Scilab2C/full_reset.sce
@@ -9,8 +9,14 @@ disp('Starting full reset...')
clc;
clear
//mclose('all');
+
+//
+// LOL !!!!
+// Well... I'm pretty sure this is totally useless.
+//
// Assuming that max 50 figures are currently open
-for counter =1:50
- close
-end
+//for counter =1:50
+// close
+//end
+
lines(0)
diff --git a/src/Scilab2C/Scilab2C/runscicode.sci b/src/Scilab2C/Scilab2C/runscicode.sci
index d91a705e..7247ddb4 100644
--- a/src/Scilab2C/Scilab2C/runscicode.sci
+++ b/src/Scilab2C/Scilab2C/runscicode.sci
@@ -57,7 +57,7 @@ disp('--- Executing your SCILAB code. ---');
disp('-----------------------------------');
[tmppath,tmpfile,tmpext] = fileparts(UserScilabMainFile);
cd(tmppath);
-execstr(tmpfile+tmpext);
+exec(tmpfile+tmpext);
cd(RunSci2CMainDir);
disp('------------------------------------------');
disp('--- End Execution of your SCILAB code. ---');