summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in4
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java8
3 files changed, 11 insertions, 3 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 9647c96..9d887f9 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -34,8 +34,8 @@ shell \
34completion \ 34completion \
35console \ 35console \
36graphic_export \ 36graphic_export \
37gui \
38jvm \ 37jvm \
38gui \
39graphics \ 39graphics \
40optimization \ 40optimization \
41symbolic \ 41symbolic \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 78c547e..a65610b 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -154,7 +154,7 @@ CTAGS = ctags
154DIST_SUBDIRS = core output_stream action_binding arnoldi \ 154DIST_SUBDIRS = core output_stream action_binding arnoldi \
155 elementary_functions string api_scilab dynamic_link fileio \ 155 elementary_functions string api_scilab dynamic_link fileio \
156 history_manager spreadsheet tclsci localization renderer shell \ 156 history_manager spreadsheet tclsci localization renderer shell \
157 completion console graphic_export gui jvm graphics \ 157 completion console graphic_export jvm gui graphics \
158 optimization symbolic randlib statistics special_functions \ 158 optimization symbolic randlib statistics special_functions \
159 interpolation linear_algebra integer data_structures mexlib \ 159 interpolation linear_algebra integer data_structures mexlib \
160 differential_equations cacsd polynomials boolean double pvm io \ 160 differential_equations cacsd polynomials boolean double pvm io \
@@ -436,7 +436,7 @@ top_srcdir = @top_srcdir@
436SUBDIRS = core output_stream action_binding arnoldi \ 436SUBDIRS = core output_stream action_binding arnoldi \
437 elementary_functions string api_scilab dynamic_link fileio \ 437 elementary_functions string api_scilab dynamic_link fileio \
438 history_manager spreadsheet tclsci localization renderer shell \ 438 history_manager spreadsheet tclsci localization renderer shell \
439 completion console graphic_export gui jvm graphics \ 439 completion console graphic_export jvm gui graphics \
440 optimization symbolic randlib statistics special_functions \ 440 optimization symbolic randlib statistics special_functions \
441 interpolation linear_algebra integer data_structures mexlib \ 441 interpolation linear_algebra integer data_structures mexlib \
442 differential_equations cacsd polynomials boolean double pvm io \ 442 differential_equations cacsd polynomials boolean double pvm io \
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
index b01edf6..7cec277 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
@@ -113,6 +113,7 @@ import org.scilab.modules.gui.waitbar.WaitBar;
113import org.scilab.modules.gui.widget.Widget; 113import org.scilab.modules.gui.widget.Widget;
114import org.scilab.modules.gui.window.ScilabWindow; 114import org.scilab.modules.gui.window.ScilabWindow;
115import org.scilab.modules.gui.window.Window; 115import org.scilab.modules.gui.window.Window;
116import org.scilab.modules.jvm.LoadClassPath;
116import org.scilab.modules.localization.Messages; 117import org.scilab.modules.localization.Messages;
117import org.scilab.modules.renderer.FigureMapper; 118import org.scilab.modules.renderer.FigureMapper;
118import org.scilab.modules.renderer.figureDrawing.DrawableFigureGL; 119import org.scilab.modules.renderer.figureDrawing.DrawableFigureGL;
@@ -165,6 +166,9 @@ public class CallScilabBridge {
165 166
166 private static final String CONSOLE = "Console"; 167 private static final String CONSOLE = "Console";
167 168
169 /** The id used on classpath.xml to load vectorial export JARs */
170 private static final String CLASSPATH_PDF_PS_EPS_EXPORT_NAME = "pdf_ps_eps_graphic_export";
171
168 /** 172 /**
169 * Constructor 173 * Constructor
170 */ 174 */
@@ -2361,6 +2365,10 @@ public class CallScilabBridge {
2361 String fileExtension = ".ps"; 2365 String fileExtension = ".ps";
2362 2366
2363 try { 2367 try {
2368 /* Under !Windows, make sure that the library for ps export
2369 * are already loaded */
2370 LoadClassPath.loadOnUse(CLASSPATH_PDF_PS_EPS_EXPORT_NAME);
2371
2364 /** Export image to PostScript */ 2372 /** Export image to PostScript */
2365 if (((PrintRequestAttribute) scilabPageFormat.get(OrientationRequested.class)) == OrientationRequested.PORTRAIT) { 2373 if (((PrintRequestAttribute) scilabPageFormat.get(OrientationRequested.class)) == OrientationRequested.PORTRAIT) {
2366 FileExporter.fileExport(figureID, 2374 FileExporter.fileExport(figureID,