summaryrefslogtreecommitdiffstats
path: root/scilab/modules/atoms
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules/atoms')
-rw-r--r--scilab/modules/atoms/Makefile.in2
-rw-r--r--scilab/modules/atoms/macros/atomsInstall.sci7
-rw-r--r--scilab/modules/atoms/macros/atomsRemove.sci7
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONread.sci8
-rw-r--r--scilab/modules/atoms/macros/atoms_internals/atomsUpdateProgressBar.sci4
5 files changed, 25 insertions, 3 deletions
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index a4b52be..9b3dcf5 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -353,9 +353,11 @@ NMEDIT = @NMEDIT@
353OBJDUMP = @OBJDUMP@ 353OBJDUMP = @OBJDUMP@
354OBJEXT = @OBJEXT@ 354OBJEXT = @OBJEXT@
355OCAMLC = @OCAMLC@ 355OCAMLC = @OCAMLC@
356OCAMLCFLAGS = @OCAMLCFLAGS@
356OCAMLDEP = @OCAMLDEP@ 357OCAMLDEP = @OCAMLDEP@
357OCAMLLEX = @OCAMLLEX@ 358OCAMLLEX = @OCAMLLEX@
358OCAMLOPT = @OCAMLOPT@ 359OCAMLOPT = @OCAMLOPT@
360OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
359OCAMLYACC = @OCAMLYACC@ 361OCAMLYACC = @OCAMLYACC@
360OPENMPI_CC = @OPENMPI_CC@ 362OPENMPI_CC = @OPENMPI_CC@
361OPENMPI_CFLAGS = @OPENMPI_CFLAGS@ 363OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
diff --git a/scilab/modules/atoms/macros/atomsInstall.sci b/scilab/modules/atoms/macros/atomsInstall.sci
index f6d16bf..853e278 100644
--- a/scilab/modules/atoms/macros/atomsInstall.sci
+++ b/scilab/modules/atoms/macros/atomsInstall.sci
@@ -528,6 +528,13 @@ function result = atomsInstall(packages,section)
528 528
529 end 529 end
530 530
531 // Update the tooloxes menu
532 // =========================================================================
533 if getscilabmode()=="STD" then
534 toolboxes(SCI+"/contrib")
535 setmenu(gettext("&Toolboxes"))
536 end
537
531 // Go to the initial location 538 // Go to the initial location
532 // ========================================================================= 539 // =========================================================================
533 chdir(ATOMSINITIALPATH); 540 chdir(ATOMSINITIALPATH);
diff --git a/scilab/modules/atoms/macros/atomsRemove.sci b/scilab/modules/atoms/macros/atomsRemove.sci
index 59faf9d..b801610 100644
--- a/scilab/modules/atoms/macros/atomsRemove.sci
+++ b/scilab/modules/atoms/macros/atomsRemove.sci
@@ -358,6 +358,13 @@ function result = atomsRemove(packages,section,del)
358 atomsDisp(msprintf(" success")+LF); 358 atomsDisp(msprintf(" success")+LF);
359 end 359 end
360 360
361 // Update the tooloxes menu
362 // =========================================================================
363 if getscilabmode()=="STD" then
364 toolboxes(SCI+"/contrib")
365 setmenu(gettext("&Toolboxes"))
366 end
367
361 // Go to the initial location 368 // Go to the initial location
362 chdir(ATOMSINITIALPATH); 369 chdir(ATOMSINITIALPATH);
363 370
diff --git a/scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONread.sci b/scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONread.sci
index 08ee4a5..c03a185 100644
--- a/scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONread.sci
+++ b/scilab/modules/atoms/macros/atoms_internals/atomsDESCRIPTIONread.sci
@@ -116,7 +116,13 @@ function description_out = atomsDESCRIPTIONread(file_in,additional)
116 file_in)); 116 file_in));
117 end 117 end
118 118
119 winId = atomsOpenProgressBar(_("Updating Atoms modules database..."), %t) 119 if size(lines_in,1)>1000 then
120 winId = atomsOpenProgressBar(_("Updating Atoms modules database..."), %t)
121 else
122 // No progression bar required when the DESCRIPTION file is so short that
123 // its processing will be very fast:
124 winId = []
125 end
120 for i=1:(size(lines_in,"*")+1) 126 for i=1:(size(lines_in,"*")+1)
121 127
122 atomsUpdateProgressBar(winId, i / size(lines_in,"*")); 128 atomsUpdateProgressBar(winId, i / size(lines_in,"*"));
diff --git a/scilab/modules/atoms/macros/atoms_internals/atomsUpdateProgressBar.sci b/scilab/modules/atoms/macros/atoms_internals/atomsUpdateProgressBar.sci
index d6a08dc..33bd81b 100644
--- a/scilab/modules/atoms/macros/atoms_internals/atomsUpdateProgressBar.sci
+++ b/scilab/modules/atoms/macros/atoms_internals/atomsUpdateProgressBar.sci
@@ -14,7 +14,7 @@
14// 14//
15 15
16function atomsUpdateProgressBar(winId, value) 16function atomsUpdateProgressBar(winId, value)
17 if (getscilabmode() <> "NWNI" & winId.type == "Waitbar") 17 if (getscilabmode() <> "NWNI" & winId <> [] & winId.type == "Waitbar")
18 waitbar(value, winId); 18 waitbar(value, winId);
19 end 19 end
20endfunction \ No newline at end of file 20endfunction