10 years agoComment fixed
Sylvestre Ledru [Thu, 4 Mar 2010 15:15:26 +0000]
Comment fixed

10 years agoMerge branch 'master' of git.scilab.org:scilab
Sylvestre Ledru [Fri, 26 Feb 2010 12:52:39 +0000]
Merge branch 'master' of git.scilab.org:scilab

10 years agoWhen the variable disableLoadJNIScilab is set, disable the load of the JNI lib in...
Sylvestre Ledru [Fri, 26 Feb 2010 12:51:38 +0000]
When the variable disableLoadJNIScilab is set, disable the load of the JNI lib in Java. This is usefull in two cases:
provide a standalone version of some Scilab component (text editor)
run java unitary tests with TestNG

10 years agoWhen running TestNG, set the env variable disableLoadJNIScilab to disable the load...
Sylvestre Ledru [Fri, 26 Feb 2010 12:49:42 +0000]
When running TestNG, set the env variable disableLoadJNIScilab to disable the load of JNI lib

10 years agoMerge commit 'origin/5.2'
Clément DAVID [Fri, 26 Feb 2010 10:38:05 +0000]
Merge commit 'origin/5.2'

10 years agoXcos: rewrite part of 379572eee9718e9c9ffa845f809927e41943669d
Clément DAVID [Fri, 26 Feb 2010 10:37:46 +0000]
Xcos: rewrite part of 379572eee9718e9c9ffa845f809927e41943669d

10 years agoXcos: always activate ShowParentAction
Clément DAVID [Fri, 26 Feb 2010 10:12:36 +0000]
Xcos: always activate ShowParentAction

10 years agoMerge branch 'master' of git.scilab.org:scilab
Allan CORNET [Fri, 26 Feb 2010 10:08:14 +0000]
Merge branch 'master' of git.scilab.org:scilab

10 years agobug 6682
Allan CORNET [Fri, 26 Feb 2010 10:07:57 +0000]
bug 6682

10 years agoMerge commit 'origin/5.2'
Clément DAVID [Fri, 26 Feb 2010 09:32:08 +0000]
Merge commit 'origin/5.2'

Conflicts:
scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosConstants.java

10 years agoXcos: update the style when changing interfunction
Clément DAVID [Fri, 26 Feb 2010 09:29:12 +0000]
Xcos: update the style when changing interfunction

10 years agoXcos: use StyleMap for changing style (no more String magic)
Clément DAVID [Fri, 26 Feb 2010 09:28:06 +0000]
Xcos: use StyleMap for changing style (no more String magic)

10 years agoXcos: comments
Clément DAVID [Fri, 26 Feb 2010 09:26:43 +0000]
Xcos: comments

10 years agoScilabGraph: handle empty value
Clément DAVID [Fri, 26 Feb 2010 09:24:24 +0000]
ScilabGraph: handle empty value

10 years ago xcosConfigureModelica resumes variables needed by compile_init_modelica
Jerome PICARD [Fri, 26 Feb 2010 09:11:55 +0000]
 xcosConfigureModelica resumes variables needed by compile_init_modelica

10 years agoresume variables needed by compile_init_modelica
Jerome PICARD [Fri, 26 Feb 2010 09:07:36 +0000]
resume variables needed by compile_init_modelica

10 years agoMerge branch 'master' of git@git.scilab.org:scilab
Jerome PICARD [Fri, 26 Feb 2010 09:04:41 +0000]
Merge branch 'master' of git@git.scilab.org:scilab

10 years agoxml2modelica returns ok
Jerome PICARD [Fri, 26 Feb 2010 09:03:36 +0000]
xml2modelica returns ok

10 years agoMerge branch 'master' of git@git.scilab.org:scilab
Clément DAVID [Fri, 26 Feb 2010 08:44:11 +0000]
Merge branch 'master' of git@git.scilab.org:scilab

10 years agoXcos: use the same condition as in 5.2 branch (regression)
Clément DAVID [Fri, 26 Feb 2010 08:44:04 +0000]
Xcos: use the same condition as in 5.2 branch (regression)

10 years agoMerge branch 'master' of git.scilab.org:scilab
Allan CORNET [Fri, 26 Feb 2010 08:11:21 +0000]
Merge branch 'master' of git.scilab.org:scilab

10 years agomerge with 5.2 + unconnected mux merge
Allan CORNET [Fri, 26 Feb 2010 08:11:14 +0000]
merge with 5.2 + unconnected mux merge

10 years agoautoreconf
Sylvestre Ledru [Fri, 26 Feb 2010 08:11:12 +0000]
autoreconf

10 years agomerged.
Sylvestre Ledru [Fri, 26 Feb 2010 08:09:43 +0000]
merged.
g Changed but not updated:

10 years agoForce the Mac OS X compilation to x86_64 target
Sylvestre Ledru [Fri, 26 Feb 2010 08:06:14 +0000]
Force the Mac OS X compilation to x86_64 target

10 years agoMerge branch 'master' of git.scilab.org:scilab
Sylvestre Ledru [Fri, 26 Feb 2010 08:04:20 +0000]
Merge branch 'master' of git.scilab.org:scilab

10 years agoNo longer build libscirenderer-disable.la (useless) + removed dead code (gw_renderer...
Sylvestre Ledru [Fri, 26 Feb 2010 08:01:36 +0000]
No longer build libscirenderer-disable.la (useless) + removed dead code (gw_renderer) which was causing the error 'ld: codegen problem, can't use rel32 to external symbol' under Mac OS X

10 years agoMerge branch 'master' of git.scilab.org:scilab
Sylvestre Ledru [Fri, 26 Feb 2010 06:47:07 +0000]
Merge branch 'master' of git.scilab.org:scilab

Conflicts:
scilab/configure

10 years agomerge(?)
Sylvestre Ledru [Fri, 26 Feb 2010 06:45:58 +0000]
merge(?)

10 years agoMerge branch 'master' of git@git.scilab.org:scilab
Clément DAVID [Thu, 25 Feb 2010 16:48:47 +0000]
Merge branch 'master' of git@git.scilab.org:scilab

10 years agoXcos: correct Xcos demo diagram
Clément DAVID [Thu, 25 Feb 2010 16:48:35 +0000]
Xcos: correct Xcos demo diagram

10 years agoautoreconf
Sylvestre Ledru [Thu, 25 Feb 2010 16:21:47 +0000]
autoreconf

10 years agoFeedback on jlatexmath fop
Sylvestre Ledru [Thu, 25 Feb 2010 16:21:33 +0000]
Feedback on jlatexmath fop

10 years agoMerge branch '5.2' of git@git.scilab.org:scilab into 5.2
Clément DAVID [Thu, 25 Feb 2010 16:13:06 +0000]
Merge branch '5.2' of git@git.scilab.org:scilab into 5.2

10 years agoScilabGraph: import the base cell for any block
Clément DAVID [Thu, 25 Feb 2010 16:12:58 +0000]
ScilabGraph: import the base cell for any block

10 years agoUnconnected Mux test for Warning procedure
Bruno JOFRET [Thu, 25 Feb 2010 15:47:25 +0000]
Unconnected Mux test for Warning procedure

10 years agoMerge branch '5.2' of git@git.scilab.org:scilab into 5.2
Bruno JOFRET [Thu, 25 Feb 2010 15:40:21 +0000]
Merge branch '5.2' of git@git.scilab.org:scilab into 5.2

10 years agoRemove path check for errors to show up
Bruno JOFRET [Thu, 25 Feb 2010 15:40:05 +0000]
Remove path check for errors to show up

10 years agoMerge branch '5.2' of git@git.scilab.org:scilab into 5.2
Allan SIMON [Thu, 25 Feb 2010 12:15:18 +0000]
Merge branch '5.2' of git@git.scilab.org:scilab into 5.2

10 years agocheckstyle only
Allan SIMON [Thu, 25 Feb 2010 12:15:07 +0000]
checkstyle only

10 years agoCheck size before concatenation to avoid error.
Bruno JOFRET [Thu, 25 Feb 2010 08:53:14 +0000]
Check size before concatenation to avoid error.

10 years agoadded nonreg test for bug 6671 and updated the CHANGES
Allan SIMON [Thu, 25 Feb 2010 08:42:11 +0000]
added nonreg test for bug 6671 and updated the CHANGES

10 years agoMerge commit 'origin/5.2'
Clément DAVID [Thu, 25 Feb 2010 08:36:10 +0000]
Merge commit 'origin/5.2'

Conflicts:
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/XcosCodec.java

10 years agoXcos: typo fix for pattern expression
Clément DAVID [Thu, 25 Feb 2010 08:24:10 +0000]
Xcos: typo fix for pattern expression

10 years agoXcos: handle non word character as value (useful for color values)
Clément DAVID [Thu, 25 Feb 2010 08:22:28 +0000]
Xcos: handle non word character as value (useful for color values)

10 years agoMerge branch 'master' of git.scilab.org:scilab
Sylvestre Ledru [Thu, 25 Feb 2010 07:39:36 +0000]
Merge branch 'master' of git.scilab.org:scilab

10 years agoMerge branch '5.2' of git@git.scilab.org:scilab into 5.2
Clément DAVID [Wed, 24 Feb 2010 15:28:29 +0000]
Merge branch '5.2' of git@git.scilab.org:scilab into 5.2

10 years agoXcos: checkstyle and comment
Clément DAVID [Wed, 24 Feb 2010 15:28:23 +0000]
Xcos: checkstyle and comment

10 years agoignore open state of a superblockdiagram when saving
Allan SIMON [Wed, 24 Feb 2010 14:47:29 +0000]
ignore open state of a superblockdiagram when saving

10 years agobug 6672
Allan CORNET [Wed, 24 Feb 2010 14:21:46 +0000]
bug 6672

10 years agonow the style of superblockdiagram is saved, should fixed bug #6671
Allan SIMON [Wed, 24 Feb 2010 13:44:27 +0000]
now the style of superblockdiagram is saved, should fixed bug #6671

10 years agogit ignore
Allan CORNET [Wed, 24 Feb 2010 12:28:39 +0000]
git ignore

10 years agobug 6661
Allan CORNET [Wed, 24 Feb 2010 12:26:56 +0000]
bug 6661

10 years agoMerge branch 'master' of git.scilab.org:scilab
Allan CORNET [Wed, 24 Feb 2010 12:17:11 +0000]
Merge branch 'master' of git.scilab.org:scilab

10 years agono more need here moved in buildnewblock
Allan CORNET [Wed, 24 Feb 2010 12:15:58 +0000]
no more need here moved in buildnewblock

10 years agoXcos: udpate diagrams views
Clément DAVID [Wed, 24 Feb 2010 08:58:49 +0000]
Xcos: udpate diagrams views

10 years agoXcos tests: be conformant with http://wiki.scilab.org/Java_Unitary_tests
Clément DAVID [Wed, 24 Feb 2010 08:57:10 +0000]
Xcos tests: be conformant with wiki.scilab.org/Java_Unitary_tests

10 years agogit ignore
Allan CORNET [Tue, 23 Feb 2010 19:44:23 +0000]
git ignore

10 years agoXcos: Enable the paste action when possible
Clément DAVID [Tue, 23 Feb 2010 17:36:43 +0000]
Xcos: Enable the paste action when possible

10 years agoMerge commit 'origin/5.2'
Clément DAVID [Tue, 23 Feb 2010 17:25:02 +0000]
Merge commit 'origin/5.2'

10 years agoXcos: use library code generation for Signal
Clément DAVID [Tue, 23 Feb 2010 17:22:49 +0000]
Xcos: use library code generation for Signal

10 years agoMerge commit 'origin/5.2'
Clément DAVID [Tue, 23 Feb 2010 17:05:58 +0000]
Merge commit 'origin/5.2'

10 years agoScilabGraph: update Signal::notify() gateway and giws files
Clément DAVID [Tue, 23 Feb 2010 17:05:33 +0000]
ScilabGraph: update Signal::notify() gateway and giws files

10 years agoMerge commit 'origin/5.2'
Clément DAVID [Tue, 23 Feb 2010 16:13:10 +0000]
Merge commit 'origin/5.2'

Conflicts:
scilab/modules/xcos/src/java/org/scilab/modules/graph/io/ScilabGraphCodec.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ContextUpdate.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/XcosCodec.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/BlockPalette.java

10 years agoScilabGraph: import GraphCodec from Xcos
Clément DAVID [Tue, 23 Feb 2010 16:02:32 +0000]
ScilabGraph: import GraphCodec from Xcos

10 years agoScilabGraph: extract Scilab codecs from Xcos
Clément DAVID [Tue, 23 Feb 2010 15:54:39 +0000]
ScilabGraph: extract Scilab codecs from Xcos

10 years agoScilabGraph: extract abstract ScilabObjectCodec class from XcosObjectCodec
Clément DAVID [Tue, 23 Feb 2010 15:51:40 +0000]
ScilabGraph: extract abstract ScilabObjectCodec class from XcosObjectCodec

10 years agoScilabGraph: import classes from Xcos utils
Clément DAVID [Tue, 23 Feb 2010 15:43:11 +0000]
ScilabGraph: import classes from Xcos utils

10 years agoXcos: demos update
Clément DAVID [Tue, 23 Feb 2010 15:33:06 +0000]
Xcos: demos update

10 years agoScilabGraph: add the TMPDIR constant and use it for all the temp files.
Clément DAVID [Tue, 23 Feb 2010 14:59:37 +0000]
ScilabGraph: add the TMPDIR constant and use it for all the temp files.

10 years agoXcos: unlock the diagram
Clément DAVID [Tue, 23 Feb 2010 14:47:18 +0000]
Xcos: unlock the diagram

10 years agoMerge branch 'master' of git@git.scilab.org:scilab
Bruno JOFRET [Tue, 23 Feb 2010 14:43:01 +0000]
Merge branch 'master' of git@git.scilab.org:scilab

Conflicts:
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java

10 years agotypo
Bruno JOFRET [Tue, 23 Feb 2010 14:36:20 +0000]
typo

10 years agoModelica Configuration callback
Bruno JOFRET [Tue, 23 Feb 2010 14:31:41 +0000]
Modelica Configuration callback

10 years agoAdding Modelica configuration within Xcos Menus
Bruno JOFRET [Tue, 23 Feb 2010 14:30:42 +0000]
Adding Modelica configuration within Xcos Menus

10 years agoCorrect typo
Bruno JOFRET [Tue, 23 Feb 2010 14:29:50 +0000]
Correct typo

10 years agoMerge commit 'origin/5.2'
Clément DAVID [Tue, 23 Feb 2010 14:25:03 +0000]
Merge commit 'origin/5.2'

Conflicts:
scilab/configure
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/SuperblockMaskCustomizeAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/positionning/GroundBlock.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/positionning/VoltageSensorBlock.java

10 years agoXcos: adding a default template for Orientation as it's not supported on jgraphx...
Clément DAVID [Tue, 23 Feb 2010 13:47:47 +0000]
Xcos: adding a default template for Orientation as it's not supported on jgraphx-1.2.0.8 [jgraphsupport.co.uk/bugzilla/show_bug.cgi?id=22]

10 years agoXcos: Extract orientation in order to be serializable [http://www.jgraphsupport.co...
Clément DAVID [Tue, 23 Feb 2010 13:28:03 +0000]
Xcos: Extract orientation in order to be serializable [jgraphsupport.co.uk/bugzilla/show_bug.cgi?id=21]

10 years agoXcos: adding TextBlock, SplitBlock or link edge take scaling in account
Clément DAVID [Tue, 23 Feb 2010 13:22:51 +0000]
Xcos: adding TextBlock, SplitBlock or link edge take scaling in account

10 years agosame ilib_for_link windows & linux
Allan CORNET [Tue, 23 Feb 2010 10:53:33 +0000]
same ilib_for_link windows & linux

10 years agolink_olibs already defined see link_olibs.sci
Allan CORNET [Tue, 23 Feb 2010 10:35:45 +0000]
link_olibs already defined see link_olibs.sci

10 years agoXcos: cleanup \n\t as written on [http://java.sun.com/j2se/1.4.2/docs/guide/lang...
Clément DAVID [Tue, 23 Feb 2010 09:54:11 +0000]
Xcos: cleanup \n\t as written on [java.sun.com/j2se/1.4.2/docs/guide/lang/assert.html#preconditions] assertion must not be used on parameters.\n\t typo\n\t Remove unused logic

10 years agoXcos: the customizeBlockAction can only use the context variables
Clément DAVID [Tue, 23 Feb 2010 09:49:40 +0000]
Xcos: the customizeBlockAction can only use the context variables

10 years agoremove pause
Allan CORNET [Tue, 23 Feb 2010 09:35:43 +0000]
remove pause

10 years agouses getdynlibext
Allan CORNET [Tue, 23 Feb 2010 09:34:45 +0000]
uses getdynlibext

10 years agoFixes bug #6557
Manuel Juliachs [Tue, 23 Feb 2010 09:19:09 +0000]
Fixes bug #6557

10 years agonot used
Allan CORNET [Tue, 23 Feb 2010 08:09:58 +0000]
not used

10 years agoedit CHANGES_5.2.X
Pierre LANDO [Mon, 22 Feb 2010 16:04:01 +0000]
edit CHANGES_5.2.X

10 years agoMerge branch '5.2' of git@git.scilab.org:scilab into 5.2
Pierre LANDO [Mon, 22 Feb 2010 15:58:35 +0000]
Merge branch '5.2' of git@git.scilab.org:scilab into 5.2

10 years agobug 6641 fixed - 'hist3d' did not handle correctly optionals arguments.
Pierre LANDO [Mon, 22 Feb 2010 15:58:17 +0000]
bug 6641 fixed - 'hist3d' did not handle correctly optionals arguments.

10 years agoXcos: fix for 6657
Clément DAVID [Mon, 22 Feb 2010 15:58:01 +0000]
Xcos: fix for 6657

10 years agoXcos: fix 6576
Clément DAVID [Mon, 22 Feb 2010 14:36:48 +0000]
Xcos: fix 6576

10 years agoMerge branch '5.2' of git@git.scilab.org:scilab into 5.2
Clément DAVID [Mon, 22 Feb 2010 14:20:38 +0000]
Merge branch '5.2' of git@git.scilab.org:scilab into 5.2

10 years agoXcos: adding icons and use them on algnement menus
Clément DAVID [Mon, 22 Feb 2010 14:20:34 +0000]
Xcos: adding icons and use them on algnement menus

10 years agoCheckstyle
Manuel Juliachs [Mon, 22 Feb 2010 14:18:10 +0000]
Checkstyle

10 years agoMerge branch '5.2' of git.scilab.org:scilab into 5.2
Michaël Baudin [Mon, 22 Feb 2010 14:09:53 +0000]
Merge branch '5.2' of git.scilab.org:scilab into 5.2

10 years agoFixed bug #6632
Michaël Baudin [Mon, 22 Feb 2010 14:09:40 +0000]
Fixed bug #6632

10 years agooptim: vectorized contour plot
Michaël Baudin [Mon, 22 Feb 2010 14:06:16 +0000]
optim: vectorized contour plot

10 years agoMerge branch '5.2' of git@git.scilab.org:scilab into 5.2
Clément DAVID [Mon, 22 Feb 2010 13:50:24 +0000]
Merge branch '5.2' of git@git.scilab.org:scilab into 5.2