3 files changed, 208 insertions, 155 deletions

diff --git a/scilab/modules/scicos/macros/scicos_scicos/ExportAll_.sci b/scilab/modules/scicos/macros/scicos_scicos/ExportAll_.sci
index d76e5ad..076381f 100644
--- a/scilab/modules/scicos/macros/scicos_scicos/ExportAll_.sci
+++ b/scilab/modules/scicos/macros/scicos_scicos/ExportAll_.sci
@@ -21,138 +21,137 @@
 
 function ExportAll_()
 
-Cmenu = []
+  Cmenu = []
 
-%exp_dir = tk_getdirectory()
+  // Select output directory
+  %exp_dir = tk_getdirectory()
 
-if %exp_dir<>[] then 
-  systexport(scs_m,%exp_dir),
-  if MSDOS then
-        fname=%exp_dir+'\'+'navigator'
-  else
-        fname=%exp_dir+'/'+'navigator'
-  end
+  if ~isempty(%exp_dir) then
 
-if 0 then
-  driv=driver();
-  driver('Pos');
-  set_posfig_dim(400,600)
-  xinit(fname);
-else
-  win_nag=max(winsid())+1
-  scf(win_nag)
-end
-
-  gh_axes=gca();
-  
-  
-  gh_navig = gcf()
-  
-  y0 = 0    ;
-  x0 = 0    ;
-  path = [] ;
-  larg = 0  ;
-  [xx, yy, lp] = build_scs_tree(scs_m); 
-
-  
-  n_node = size(lp) ; 
-  mnx = min(xx)-0.1 ;
-  mxx = max(xx)+0.1 ;
-  
-  if n_node<=20 then
-    dx  = (mxx-mnx)
-    mnx = mnx-dx/5
-    x0  = [mnx,mnx+dx/5]
-  else
-    dx  = (mxx-mnx) ;
-    mnx = mnx-dx/2  ;
-    x0  = [mnx,mnx+dx/4,mnx+dx/2] ;
-  end
-  
-  //** axes settings 
-  gh_navig_axes = gh_navig.children ; //** axes handle
-  gh_navig_axes.tight_limits = "on"  ; //** set the limit "gh_axes.data_bounds" in "hard mode" 
-  
-  arect =[ 0.125 0.125 0.125 0.125 ]; //** margins (default normalized values)
-  gh_navig_axes.margins = arect ;           //**
-  
-  wrect = [-1/6 -1/6 8/6 8/6] ;
-  gh_navig_axes.axes_bounds = wrect ; //** default : axes_bounds = [0,0 , 1,1] = [xmin ymin with height] 
-  
-  //** map the diagram size on the window size
-  //**    (1,1)  (1,2)        (2,1)    (2,2)
-  bnds = [mnx,  min(yy)-0.2 ; mxx,  max(yy)+0.2];   
-  gh_navig_axes.data_bounds = bnds  ; //** default : data_bounds = [0,0 ; 1,1] = [xmin ymin ; xmax ymax ]
-  
-  // draw tree
-  xsegs(xx,yy,1) ; //** draw unconnected segments  
-    
-  xx = [xx(1,1);xx(2,:)'] ;
-  yy = [yy(1,1);yy(2,:)'] ;
-  
-  plot2d(xx,yy,-9,'000')  ; 
-  
-  xtitle('Navigator window') ; 
-  
-  for k=1 : size(xx,1)
-    xstring( xx(k), yy(k), string(k) ) ;
-  end
-  
-  r  = xstringl(x0(1),y0,'X') ;
-  h  = r(4)                   ;
-  y0 = bnds(2,2)-h              ;
-  kx = 1                      ;
-  
-  xrect(x0(kx), bnds(2,2), x0(kx+1)-x0(kx), bnds(2,2)-bnds(1,2));
-  
-  for k=1:size(xx,1)
-    
-    if k==1 then path=[]; else path=lp(k-1);end
-    Path=list();
+    systexport(scs_m, %exp_dir)
     
-    for pk=path
-      Path=lstcat(Path,'objs',pk,'model','rpar');
+    fname = fullfile(%exp_dir, 'navigator')
+
+    // SC5:  win_nag = scf()
+    if 0 then
+      driv = driver()
+      driver('Pos')
+      set_posfig_dim(400, 600)
+      xinit(fname)
+    else
+      win_nag = max(winsid()) + 1
+      scf(win_nag)
     end
     
-    Path = lstcat(Path,'props','title',1);
-  
-    xstring(x0(kx),y0,string(k)+': '+scs_m(Path)) ;
-    
-    y0=y0-h;
-    
-    if k==20 then 
-      y0 = bnds(2,2)-h;
-      kx = kx+1
-      xrect(x0(kx),bnds(2,2),x0(kx+1)-x0(kx),bnds(2,2)-bnds(1,2))
+    win_nag = scf()
+
+    gh_axes  = gca()
+    gh_navig = gcf()
+
+    y0 = 0
+    x0 = 0
+    path = []
+    larg = 0
+    [xx, yy, lp] = build_scs_tree(scs_m)
+
+    n_node = size(lp)
+    mnx = min(xx)-0.1
+    mxx = max(xx)+0.1
+
+    if n_node <= 20 then
+      dx  = (mxx - mnx)
+      mnx = mnx - dx/5
+      x0  = [mnx, mnx + dx/5]
+    else
+      dx  = (mxx - mnx)
+      mnx = mnx - dx/2
+      x0  = [mnx, mnx + dx/4, mnx + dx/2]
     end
-  
-  end
-  drawnow()
 
+    //** axes settings
+    gh_navig_axes = gh_navig.children   //** axes handle
+    gh_navig_axes.tight_limits = "on"   //** set the limit "gh_axes.data_bounds" in "hard mode"
 
-if 0 then
-  xend();
-  set_posfig_dim(0,0)
-  driver(driv);
-  fname=pathconvert(fname,%f,%t,'w')
-else 
-  if MSDOS then
-    fname=pathconvert(fname,%f,%t,'w')
-  end
-  xs2ps(win_nag,fname)
-  xdel(win_nag)
-end
-
-  opt=' ';//' -landscape '
-  if MSDOS then
-      comm=pathconvert(SCI+'\bin\BEpsf',%f,%f,'w')
-      rep=unix_g(comm+' '+opt+'""'+fname+'""')
-  else
-      rep=unix_g(SCI+'/bin/BEpsf '+opt+fname)
-  end
-    
-  if rep<>[] then 
-      message(['Problem generating ps file.';'perhaps directory not writable'] )
+    arect = [ 0.125 0.125 0.125 0.125 ] //** margins (default normalized values)
+    gh_navig_axes.margins = arect
+
+    wrect = [ -1/6 -1/6 8/6 8/6 ]
+    gh_navig_axes.axes_bounds = wrect   //** default : axes_bounds = [0 0 1 1] = [xmin ymin with height]
+
+    //** map the diagram size on the window size
+    //**    (1,1) (1,2)         (2,1) (2,2)
+    bnds = [mnx,  min(yy)-0.2 ; mxx,  max(yy)+0.2]
+    gh_navig_axes.data_bounds = bnds    //** default : data_bounds = [0 0 ; 1 1] = [xmin ymin ; xmax ymax]
+
+    // draw tree
+    xsegs(xx, yy, 1) //** draw unconnected segments
+
+    xx = [xx(1,1) ; xx(2,:)']
+    yy = [yy(1,1) ; yy(2,:)']
+
+    plot2d(xx, yy, -9, '000')
+
+    xtitle('Navigator window')
+
+    for k = 1:size(xx,1)
+      xstring(xx(k), yy(k), string(k))
+    end
+
+    r  = xstringl(x0(1), y0, 'X')
+    h  = r(4)
+    y0 = bnds(2,2) - h
+    kx = 1
+
+    xrect(x0(kx), bnds(2,2), x0(kx+1) - x0(kx), bnds(2,2) - bnds(1,2))
+
+    for k = 1:size(xx,1)
+
+      if k == 1 then
+        path = []
+      else
+        path = lp(k-1)
+      end
+      
+      Path = list()
+
+      for pk = path
+        Path = lstcat(Path,'objs',pk,'model','rpar')
+      end
+
+      Path = lstcat(Path,'props','title',1)
+
+      xstring(x0(kx), y0, string(k) + ': ' + scs_m(Path))
+
+      y0 = y0 - h
+
+      if k == 20 then
+        y0 = bnds(2,2) - h
+        kx = kx + 1
+        xrect(x0(kx), bnds(2,2), x0(kx+1) - x0(kx), bnds(2,2) - bnds(1,2))
+      end
+
+    end
+
+    drawnow()
+
+    if 0 then
+      xend()
+      set_posfig_dim(0,0)
+      driver(driv)
+      fname = pathconvert(fname, %f, %t, 'w')
+    else
+      if MSDOS then
+        fname = pathconvert(fname, %f, %t, 'w')
+      end
+      // Capture in landscape mode
+      try
+        xs2eps(win_nag.figure_id, fname, 'landscape')
+      catch
+        disp(lasterror())
+      end
+      delete(win_nag)
+    end
   end
-end
+
 endfunction
+
diff --git a/scilab/modules/scicos/macros/scicos_scicos/do_export.sci b/scilab/modules/scicos/macros/scicos_scicos/do_export.sci
index 4001380..ed0c65e 100644
--- a/scilab/modules/scicos/macros/scicos_scicos/do_export.sci
+++ b/scilab/modules/scicos/macros/scicos_scicos/do_export.sci
@@ -19,57 +19,94 @@
 // See the file ../license.txt
 //
 
-function [wa,ha] = do_export(scs_m, fname, titleflag) 
+function [wa,ha] = do_export(scs_m, fname, titleflag)
 //** default call inside Export_.sci
-//** 
+//**
 //**  do_export(scs_m) ;
-//** 
-//**  rhs :=  1  
+//**
+//**  rhs :=  1
 // titleflag:0 or 1 (place or not place title in eps file)
 // used only with fname
- 
+
+
+
   [lhs, rhs] = argn(0) ; //** verify the presence of tha arguments
-  
-  if rhs<3 then //** if no "titleflag" is specified 
+
+  if rhs<3 then //** if no "titleflag" is specified
     titleflag = 0
   end
-  
-  rect = dig_bound(scs_m); 
+
+  rect = dig_bound(scs_m);
   if rect==[] then
-    return //** empty diagram 
+    return //** empty diagram
   end
-  
   wa = (rect(3)-rect(1))
   ha = (rect(4)-rect(2))
-  
+
   if ~exists('%scicos_lr_margin') then %scicos_lr_margin=.1;end
   if ~exists('%scicos_ud_margin') then %scicos_ud_margin=.1;end
-  
+
   rect(1)=rect(1)-wa*%scicos_lr_margin
   rect(3)=rect(3)+wa*%scicos_lr_margin
   rect(2)=rect(2)-ha*%scicos_ud_margin
   rect(4)=rect(4)+ha*%scicos_ud_margin
-  
+
   wa = (rect(3)-rect(1)) ; //** geometrical correction
-  ha = (rect(4)-rect(2)) ; 
-  
-    //**Graphics window -> 2 
+  ha = (rect(4)-rect(2)) ;
+
+
+
+
+
+
+  num = 1 ; //** the default is Postscript file output
+
+  //**------------------------------------------------------------------
+  if rhs==1 then //** the default "scs_m only" case
+
+    num = choose(['Postscript file';..
+                  'Graphics window'],'How do you want to export?')
+
+    //** Postscript file -> 1
+    //** Graphics window -> 2
+    //** [Cancel]        -> 0
+
+    if num==1 then  fname= savefile('*');end
+  end
+
+  if num==0 then
+    return ; //** EXIT point
+  elseif num==1 then //** Postscript file
+
+    if ~MSDOS then // remove blanks
+      fname = stripblanks(fname)
+      ff    = str2code(fname); ff(find(ff==40|ff==53))=36; fname=code2str(ff)
+      if fname==emptystr() then return;end
+    end
+    driv=driver();
+    driver('Pos');
+    set_posfig_dim(wa*%zoom/1.8, ha*%zoom/1.8)
+    xinit(fname);
+    gh_axes=gca();
+    gh_winc =gcf();
+  else //**Graphics window -> 2
     gh_winc = scf( max(winsid()) + 1 ) ; //** create a brand new window and get the handle
-    drawlater()    
-    winc = gh_winc.figure_id ; 
+    drawlater()
+    winc = gh_winc.figure_id ;
     gh_axes = gh_winc.children ; //** axes handle
+  end
 
   //** Geometrical correction
   gh_axes.axes_bounds = [0 0 1 1] ; // use whole graphic window
   gh_axes.tight_limits = "on"  ; //** set the limit "gh_axes.data_bounds" in "hard mode"
   mrect = [rect(1) rect(2) ; rect(3) rect(4)] ; //** vector to matrix conversion
-  gh_axes.data_bounds = mrect ; //** default : data_bounds = [xmin ymin ; xmax ymax ]    
+  gh_axes.data_bounds = mrect ; //** default : data_bounds = [xmin ymin ; xmax ymax ]
   gh_axes.margins = [0,0,0,0] ; //** no margins
-  gh_winc.axes_size= [wa ha] //figure_size = [wa ha] ; 
-  
+  gh_winc.axes_size= [wa ha] //figure_size = [wa ha] ;
+
   //  set options
-  options = scs_m.props.options 
-  
+  options = scs_m.props.options
+
   // **----------- set colormap -----------------------------------------
   // RN: this is not satisfactory. It uses the exact algorithm that in
   // set_cmap to make sure the same numbering is used. A common
@@ -84,12 +121,12 @@ function [wa,ha] = do_export(scs_m, fname, titleflag)
   end
   ierr = execstr('set(gh_winc,'"color_map'",d)','errcatch')
   if ierr<>0 then
-    warning("Cannot allocate colormap.")
+    warning("%s: Cannot allocate colormap", "do_export")
   end
 
   //**----------- Background handling -----------------------------------------
   if ~exists('%scicos_with_background') then %scicos_with_background = 1;end
-  if ~%scicos_with_background then 
+  if ~%scicos_with_background then
     gh_axes.background=-2;
     gh_winc.background=-2;
   else
@@ -102,21 +139,38 @@ function [wa,ha] = do_export(scs_m, fname, titleflag)
   end
   //**------------------------------------------------------------------------
 
+  //** --------------------- Output ------------------------------------------
+
+  if num == 1 then //** Postscript file
+
+    %draw_title()
+    drawobjs(scs_m,gcf())
+    drawnow()
+
+                // Capture to EPS and delete figure
+    xs2eps(gh_winc.figure_id, fname, 'landscape')
+    delete(gh_winc)
+
+    //** reset  the postscript export coordinates transformation
+    set_posfig_dim(0,0) ;
+
+  else
     //** Graphics Window
     %draw_title()
-    scf(gh_winc); //** put the focus in the graphics window 
+    scf(gh_winc); //** put the focus in the graphics window
     drawobjs(scs_m, gcf())
     drawnow();
 
+  end
+
+
 endfunction
 
 function %draw_title()
-  //** Put the title in the ouput window/file 
+  //** Put the title in the ouput window/file
   if ~(rhs==3 & titleflag==0) then
     width  = (rect(3)-rect(1))/3;
     height = (rect(4)-rect(2))/6;
     xstringb(rect(1)+width,rect(4)-height*(1+%scicos_ud_margin),scs_m.props.title(1),width,height,'fill')
   end
 endfunction
-
-
diff --git a/scilab/modules/scicos/macros/scicos_scicos/systexport.sci b/scilab/modules/scicos/macros/scicos_scicos/systexport.sci
index 3ce65ed..552bd99 100644
--- a/scilab/modules/scicos/macros/scicos_scicos/systexport.sci
+++ b/scilab/modules/scicos/macros/scicos_scicos/systexport.sci
@@ -31,7 +31,7 @@ function systexport(scs_m,exp_dir)
     if typeof(o)=='Block' then
       model=o.model
       if model.sim=='super' then
-        systexport(model.rpar,exp_dir) 
+        systexport(model.rpar,exp_dir) 
       end
     end
   end