Allan CORNET [Fri, 31 Jul 2009 11:12:52 +0000 (13:12 +0200)]
18 files changed:
 scilab/modules/scicos/Makefile.am patch | blob | history scilab/modules/scicos/macros/scicos_utils/create_palette.sci patch | blob | history scilab/modules/scicos/macros/scicos_utils/initial_scicos_tables.sci patch | blob | history scilab/modules/scicos/palettes/Branching.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Branching.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/DemoBlocks.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/DemoBlocks.cosf with 98% similarity] patch | blob | history scilab/modules/scicos/palettes/Events.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Events.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Integer.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Integer.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Linear.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Linear.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Lookup_Tables.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Lookup_Tables.cosf with 98% similarity] patch | blob | history scilab/modules/scicos/palettes/Matrix.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Matrix.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Modelica.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Modelica.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Non_linear.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Non_linear.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/OldBlocks.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/OldBlocks.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Others.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Others.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Sinks.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Sinks.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Sources.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Sources.cosf with 99% similarity] patch | blob | history scilab/modules/scicos/palettes/Threshold.cosf [moved from scilab/modules/scicos/macros/scicos_scicos/Threshold.cosf with 98% similarity] patch | blob | history scilab/modules/scicos/scicos.iss patch | blob | history

@@ -170,20 +170,18 @@ includes/scicos_math.h

#### scicos : cosf files ####
-nobase_libsciscicos_la_cosf_DATA = macros/scicos_scicos/Branching.cosf \
-macros/scicos_scicos/DemoBlocks.cosf \
-macros/scicos_scicos/Events.cosf \
-macros/scicos_scicos/Integer.cosf \
-macros/scicos_scicos/Linear.cosf \
-macros/scicos_scicos/Matrix.cosf \
-macros/scicos_scicos/Non_linear.cosf \
-macros/scicos_scicos/OldBlocks.cosf \
-macros/scicos_scicos/Others.cosf \
-macros/scicos_scicos/Sinks.cosf \
-macros/scicos_scicos/Sources.cosf \
-macros/scicos_scicos/Threshold.cosf
-#macros/scicos_scicos/Electrical.cosf \
-#macros/scicos_scicos/ThermoHydraulics.cosf
+nobase_libsciscicos_la_cosf_DATA = palettes/Branching.cosf \
+palettes/DemoBlocks.cosf \
+palettes/Events.cosf \
+palettes/Integer.cosf \
+palettes/Linear.cosf \
+palettes/Matrix.cosf \
+palettes/Non_linear.cosf \
+palettes/OldBlocks.cosf \
+palettes/Others.cosf \
+palettes/Sinks.cosf \
+palettes/Sources.cosf \
+palettes/Threshold.cosf

#### scicos : MACROS ####
MACROSDIRSEXT= macros/scicos_auto \
index 612fbf8..7b6ed20 100644 (file)
@@ -62,7 +62,7 @@ function [routines,IntFunc]=create_palette(Path)
%scicos_gif,%scicos_contrib,%scicos_libs] = initial_scicos_tables()
clear %scicos_menu  %scicos_short %scicos_help %scicos_display_mode modelica_libs
-    path = "SCI/modules/scicos/macros/scicos_scicos/" ; //** ... for the moment, the palettes stay here (for compatibility).
+    path = "SCI/modules/scicos/palettes/" ;

routines=[];IntFunc=[];
for txt=scicos_pal(:,1)'
index 9fb1933..6e8b0ac 100644 (file)
@@ -60,7 +60,7 @@ function [scicos_pal, %scicos_menu, %scicos_short, %scicos_help, ...
'Modelica'   ;'Lookup_Tables' ;'Threshold' ;'Others'   ;
'DemoBlocks' ;'OldBlocks'];

-  scicos_pal = [pal_names  'SCI/modules/scicos/macros/scicos_scicos/'+pal_names+'.cosf']
+  scicos_pal = [pal_names  'SCI/modules/scicos/palettes/'+pal_names+'.cosf']

%scicos_gif = SCI+"/modules/scicos/help/scicos_doc/man/gif_icons/";

@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Branching","SCI/macros/scicos/"],..
+            Title=["Branching","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Branching","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Branching","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["DemoBlocks","SCI/macros/scicos/"],..
+            Title=["DemoBlocks","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["DemoBlocks","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["DemoBlocks","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Events","SCI/macros/scicos/"],..
+            Title=["Events","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Events","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Events","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Integer","SCI/macros/scicos/"],..
+            Title=["Integer","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Integer","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Integer","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Linear","SCI/macros/scicos/"],..
+            Title=["Linear","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Linear","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Linear","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Lookup_Tables","SCI/macros/scicos/"],..
+            Title=["Lookup_Tables","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Lookup_Tables","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Lookup_Tables","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Matrix","SCI/macros/scicos/"],..
+            Title=["Matrix","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Matrix","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Matrix","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Modelica","SCI/macros/scicos/"],..
+            Title=["Modelica","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Modelica","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Modelica","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -89,7 +89,7 @@ scs_m.objs(1)=scicos_block(..
mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Electrical","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Electrical","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -780,7 +780,7 @@ scs_m.objs(1)=scicos_block(..
mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["ThermoHydraulics","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["ThermoHydraulics","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Non_linear","SCI/macros/scicos/"],..
+            Title=["Non_linear","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Non_linear","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Non_linear","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["OldBlocks","SCI/macros/scicos/"],..
+            Title=["OldBlocks","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["OldBlocks","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["OldBlocks","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Others","SCI/macros/scicos/"],..
+            Title=["Others","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Others","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Others","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Sinks","SCI/macros/scicos/"],..
+            Title=["Sinks","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Sinks","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Sinks","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Sources","SCI/macros/scicos/"],..
+            Title=["Sources","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Sources","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Sources","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..
list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),..
@@ -2,7 +2,7 @@ scs_m=scicos_diagram(..
version="scicos4.3",..
props=scicos_params(..
wpar=[600,450,0,0,600,450],..
-            Title=["Threshold","SCI/macros/scicos/"],..
+            Title=["Threshold","SCI/modules/scicos/palettes/"],..
tol=[0.000001,0.000001,1.000D-10,100001,0,0],..
tf=100000,..
context=[],..
@@ -49,7 +49,7 @@ scs_m.objs(1)=scicos_block(..
rpar=mlist(["diagram","props","objs","version","contrib"],..
tlist(..
["params","wpar","title","tol","tf","context","void1","options","void2","void3",..
-                       "doc"],[600,450,0,0,600,450],["Threshold","SCI/macros/scicos/"],..
+                       "doc"],[600,450,0,0,600,450],["Threshold","SCI/modules/scicos/palettes/"],..
[0.000001,0.000001,1.000D-10,100001,0,0],100000,[],[],..