plot

mdykman · Oct 15, 2013 · 38d4c48 · 38d4c48
1 parent aa6fbdb
commit 38d4c48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/assets/addons/graphics/plot/jzplot.ijs b/assets/addons/graphics/plot/jzplot.ijs
@@ -3,19 +3,16 @@ require 'graphics/afm graphics/color/colortab graphics/bmp'
 
 3 : 0''
 if. 0 ~: 4!:0 <'JHSOUTPUT' do. JHSOUTPUT=: 'canvas' end.
-if. 0 ~: 4!:0 <'CONSOLEOUTPUT' do. CONSOLEOUTPUT=: (UNAME-:'Android'){::'pdf';'android' end.
+if. 0 ~: 4!:0 <'CONSOLEOUTPUT' do. CONSOLEOUTPUT=: 'pdf' end.
 if. 0 ~: 4!:0 <'IFTESTPLOTJHS' do. IFTESTPLOTJHS_z_=: 0 end.
 if. IFTESTPLOTJHS +. IFJHS do.
 elseif. IFQT do.
   require 'graphics/gl2'
   coinsert 'jgl2'
 elseif. IFJCDROID do.
-  if. 0 < #1!:0 jpath '~addons/gui/android/android.ijs' do.
+  require 'graphics/gl2 droidwd gui/android'
-    require 'graphics/gl2 droidwd gui/android'
+  coinsert 'jgl2 jni jaresu'
-    coinsert 'jgl2 jni jaresu'
+  CONSOLEOUTPUT=: 'android'
-  else.
-    if. CONSOLEOUTPUT-:'android' do. CONSOLEOUTPUT=: 'pdf' end.
-  end.
 elseif. do.
   if. (UNAME -: 'Linux') *: (0 -: 2!:5 'DISPLAY') do.
     if. 0 < #1!:0 jpath '~addons/graphics/gl2/gl2.ijs' do.

diff --git a/assets/addons/graphics/plot/manifest.ijs b/assets/addons/graphics/plot/manifest.ijs
@@ -6,7 +6,7 @@ DESCRIPTION=: 0 : 0
 2D Plot
 )
 
-VERSION=: '1.0.134'
+VERSION=: '1.0.135'
 
 DEPENDS=: 0 : 0
 graphics/afm