summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos
diff options
context:
space:
mode:
authorJerome PICARD <jerome.picard@scilab.org>2010-03-23 17:00:56 +0100
committerJerome PICARD <jerome.picard@scilab.org>2010-03-23 17:00:56 +0100
commitf5af28d566297df4dcb9d3df96a25680f12c11c2 (patch)
treedf5599686aa7be52e47aac9ae0ad12971a9d32f6 /scilab/modules/scicos
parent5885f37486b7ec1351f4f37399a5436f46fb6978 (diff)
downloadscilab-f5af28d566297df4dcb9d3df96a25680f12c11c2.zip
scilab-f5af28d566297df4dcb9d3df96a25680f12c11c2.tar.gz
mv MIHM.tcl in directory tcl
Diffstat (limited to 'scilab/modules/scicos')
-rw-r--r--scilab/modules/scicos/scicos.iss1
-rw-r--r--scilab/modules/scicos/tcl/MIHM.tcl (renamed from scilab/modules/scicos/macros/scicos_scicos/MIHM.tcl)3
2 files changed, 2 insertions, 2 deletions
diff --git a/scilab/modules/scicos/scicos.iss b/scilab/modules/scicos/scicos.iss
index 7f78786..20ec8db 100644
--- a/scilab/modules/scicos/scicos.iss
+++ b/scilab/modules/scicos/scicos.iss
@@ -61,7 +61,6 @@ Source: modules\{#SCICOS}\macros\*.bin; DestDir: {app}\modules\{#SCICOS}\macros;
61Source: modules\{#SCICOS}\macros\*.sci; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS} 61Source: modules\{#SCICOS}\macros\*.sci; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
62Source: modules\{#SCICOS}\macros\*.sce; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS} 62Source: modules\{#SCICOS}\macros\*.sce; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
63Source: modules\{#SCICOS}\macros\*.cosf; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS} 63Source: modules\{#SCICOS}\macros\*.cosf; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
64Source: modules\{#SCICOS}\macros\*.tcl; DestDir: {app}\modules\{#SCICOS}\macros; Flags: recursesubdirs; Components: {#COMPN_XCOS}
65; 64;
66;Source: modules\{#SCICOS}\demos\*.*; DestDir: {app}\modules\{#SCICOS}\demos; Flags: recursesubdirs; Components: {#COMPN_XCOS} 65;Source: modules\{#SCICOS}\demos\*.*; DestDir: {app}\modules\{#SCICOS}\demos; Flags: recursesubdirs; Components: {#COMPN_XCOS}
67; 66;
diff --git a/scilab/modules/scicos/macros/scicos_scicos/MIHM.tcl b/scilab/modules/scicos/tcl/MIHM.tcl
index 4ae0ea1..de96d60 100644
--- a/scilab/modules/scicos/macros/scicos_scicos/MIHM.tcl
+++ b/scilab/modules/scicos/tcl/MIHM.tcl
@@ -437,6 +437,7 @@ proc Compile { WindowsID } {
437 return 437 return
438 } 438 }
439 439
440 #ScilabEval "global bllst; global connectmat; global clkconnect; global cor; global corinv; pause; fw='$Model_name'; paremb='$ParEmbedded'; jaco='$JacobianEnable';compile_init_modelica(fw,paremb,jaco); "
440 ScilabEval "fw='$Model_name'; paremb='$ParEmbedded'; jaco='$JacobianEnable';compile_init_modelica(fw,paremb,jaco); " 441 ScilabEval "fw='$Model_name'; paremb='$ParEmbedded'; jaco='$JacobianEnable';compile_init_modelica(fw,paremb,jaco); "
441 #compile_init_modelica( ) calls Compile_finished ok/nok 442 #compile_init_modelica( ) calls Compile_finished ok/nok
442} 443}
@@ -461,7 +462,7 @@ proc Compile_finished { res WindowsID } {
461 #----------------- openning/reading the new incidence file ------------- 462 #----------------- openning/reading the new incidence file -------------
462 set need_compile false 463 set need_compile false
463 set Smethod [ $w.buttons.combo get ] 464 set Smethod [ $w.buttons.combo get ]
464 ScilabEval "method='$Smethod';Nunknowns='$nimpvar';Compute_cic(method,Nunknowns); " 465 ScilabEval "method='$Smethod';Nunknowns='$nimpvar';ok=Compute_cic(method,Nunknowns); "
465 } else { 466 } else {
466 Compute_finished nok $WindowsID 467 Compute_finished nok $WindowsID
467 } 468 }