tioga 1.4 → 1.5

data/split/Tioga/lib/Transparency.rb

@@ -32,7 +32,7 @@ class Transparency < Doc < FigureMaker
 #
 # Example: on left, fill_opacity = 1.0; on right fill_opacity = 0.6
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Squares.jpg
+# link:images/Squares.png
    def fill_opacity
    end
    
@@ -72,7 +72,7 @@ class Transparency < Doc < FigureMaker
 #
 # Example: on left, fill_transparency = 0.0; on right fill_transparency = 0.4
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Squares.jpg
+# link:images/Squares.png
    def fill_transparency
    end
    

data/split/Tioga/lib/Using_Paths.rb

@@ -94,7 +94,7 @@ class Using_Paths < Doc < FigureMaker
 # If the squares are drawn in opposite directions, only the area between them is inside,
 # according to the nonzero winding number rule.  See also #eofill.
 #
-# http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Fill_Rules.jpg
+# link:images/Fill_Rules.png
     def fill
     end
 

data/split/Tioga/lib/X_and_Y_Axes.rb

@@ -269,8 +269,10 @@ class X_and_Y_Axes < Doc < FigureMaker
 #               xaxis_digits_max
 #               xaxis_digits_max = an_integer_value
 #
-# If non-zero and tioga is creating numeric labels for the x axis, then numeric label 
-# will be switched to exponential format if it requires more than this number of digits.
+# If non-zero (and xaxis_use_fixed_pt is not true), then x axis numeric labels
+# will be switched to exponential format if they require more than this number of digits.
+# If yaxis_digits_max is set to zero, then a system-choosen default value is used instead.
+# See also xaxis_use_fixed_pt.
    def xaxis_digits_max
    end
 
@@ -278,11 +280,11 @@ class X_and_Y_Axes < Doc < FigureMaker
 #               xaxis_use_fixed_pt
 #               xaxis_use_fixed_pt = true_or_false
 #
-# If this flag is +true+, and tioga is creating numeric labels for the x axis,
-# and the xaxis_log_values flag is also +true+,
-# then the labels will be shown using fixed point notation rather than exponential.
-# For example, a label at x location 3.0 will display as "1000" rather than as "10^3",
-# and a label at x == -2.0 will display as "0.01" rather than as "10^-2".
+# If this flag is +true+, then numeric labels for the x axis
+# will always use fixed point notation rather than exponential.
+# If +false+, then the value of xaxis_digits_max will be used to decide between
+# fixed point or exponential notation.
+# See also xaxis_digits_max.
    def xaxis_use_fixed_pt
    end
 
@@ -515,8 +517,10 @@ class X_and_Y_Axes < Doc < FigureMaker
 #               yaxis_digits_max
 #               yaxis_digits_max = an_integer_value
 #
-# If non-zero and tioga is creating numeric labels for the y axis, then numeric label 
-# will be switched to exponential format if it requires more than this number of digits.
+# If non-zero (and yaxis_use_fixed_pt is not true), then y axis numeric labels
+# will be switched to exponential format if they require more than this number of digits.
+# If yaxis_digits_max is set to zero, then a system-choosen default value is used instead.
+# See also yaxis_use_fixed_pt.
    def yaxis_digits_max
    end
 
@@ -524,11 +528,11 @@ class X_and_Y_Axes < Doc < FigureMaker
 #               yaxis_use_fixed_pt
 #               yaxis_use_fixed_pt = true_or_false
 #
-# If this flag is +true+, and tioga is creating numeric labels for the y axis,
-# and the yaxis_log_values flag is also +true+,
-# then the labels will be shown using fixed point notation rather than exponential.
-# For example, a label at y location 3.0 will display as "1000" rather than as "10^3",
-# and a label at y == -2.0 will display as "0.01" rather than as "10^-2".
+# If this flag is +true+, then numeric labels for the y axis
+# will always use fixed point notation rather than exponential.
+# If +false+, then the value of yaxis_digits_max will be used to decide between
+# fixed point or exponential notation.
+# See also yaxis_digits_max.
    def yaxis_use_fixed_pt
    end
 
@@ -583,7 +587,7 @@ Examples
         end
     end
 
-http://theory.kitp.ucsb.edu/~paxton/tioga_jpegs/Special_Y.jpg
+link:images/Special_Y.png
 
 =end
    def yaxis_tick_labels

data/split/Tioga/lib/irb_tioga.rb

@@ -5,9 +5,17 @@ module IRB_Tioga
   
 $tioga_figure_filename = nil
 $tioga_figure_num = nil
+  
+  
+def check_have_loaded
+  return true unless ($tioga_figure_filename == nil) || ($tioga_figure_filename.length == 0)
+  puts "Must open a file first."
+  return false
+end
 
 def o(filename=nil)
   filename = $tioga_figure_filename if filename == nil
+  return if filename == nil || filename.length == 0 # this happens if just give shell command irb_tioga with no filename
   filename = $tioga_ui.fix_filename(filename)
   result = $tioga_ui.setdir_and_load(filename)
   return false if result == nil
@@ -22,22 +30,26 @@ def do_figs(fignums,view)
   end
   if fignums == nil
     $tioga_ui.make_all_pdfs(view)
-  elsif fignums.kind_of?Integer
-    fignums += FigureMaker.default.num_figures if fignums < 0
-    $tioga_ui.do_fignums([fignums],view)
+    set_figure_num(0)
   else
+    if fignums.kind_of?Integer
+      fignums += FigureMaker.default.num_figures if fignums < 0
+      fignums = [fignums]
+    end
     $tioga_ui.do_fignums(fignums,view)
+    set_figure_num(fignums[-1])
   end
-  set_figure_num(fignums[-1]) unless fignums == nil
   return true
 end
 
 def s(fignums=nil)
+  return unless check_have_loaded
   do_figs(fignums,true)
   return true
 end
 
 def m(fignums=nil)
+  return unless check_have_loaded
   do_figs(fignums,false)
   return true
 end
@@ -48,6 +60,7 @@ def set_figure_num(num)
 end
 
 def p(fignums=nil)
+  return unless check_have_loaded
   if fignums.kind_of?String
     fignums = $tioga_ui.parse_figs(fignums)
   end
@@ -64,6 +77,7 @@ def p(fignums=nil)
 end
 
 def r
+  return unless check_have_loaded
   if $tioga_figure_num != nil
     figname = FigureMaker.default.figure_names[$tioga_figure_num] 
   else
@@ -79,6 +93,16 @@ def r
 end
 
 
+def cmds
+  l
+end
+
+
+def list_cmds
+  l
+end
+
+
 def l
   $tioga_ui.list_figures
   return true
@@ -87,13 +111,14 @@ end
 def h
     puts ''
     puts "   Command               description"
-    puts "   o 'filename'          open tioga file (with extension .rb)."
-    puts "   l                     output a list of the defined figures by number and name."
-    puts "   m <figs>              make PDFs without showing them in the viewer."
-    puts "   s <figs>              make and show PDFs, each in a separate viewer window."
-    puts "   p <figs>              make PDFs and show the portfolio as a multi-page document."
-    puts "   r                     reloads the current tioga file and reshows the current figure."
-    puts "   h                     helpfully print this list of commands."
+    puts "   o 'filename'          opens the named tioga file (with extension .rb)."
+    puts "   o                     opens the current tioga file (i.e., reload)."
+    puts "   l                     lists the defined figures by number and name."
+    puts "   m <figs>              makes PDFs without showing them in the viewer."
+    puts "   s <figs>              makes and shows PDFs, each in a separate viewer window."
+    puts "   p <figs>              makes PDFs and shows the portfolio as a multi-page document."
+    puts "   r                     reloads the current file and reshows the current figure."
+    puts "   h                     helpfully prints this list of commands."
     puts "\n   Since the filename extension is known, you can skip typing it if you like."
     puts "\n   If <figs> is omitted, then tioga does all the figures defined in the file"
     puts "        ordered by their definition index numbers."

data/split/Tioga/lib/maker.rb

@@ -0,0 +1,201 @@
+=begin
+   Copyright (C) 2005  Bill Paxton
+
+   This file is part of Tioga.
+
+   Tioga is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Library Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   Tioga is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with Tioga; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+=end
+
+require 'Tioga/tioga.rb'
+require 'scanf'
+
+include Tioga
+
+require 'readline'
+include Readline
+# for some reason, the pipes don't work unless I use the Readline package
+
+def report_error(er, msg)
+    fm = FigureMaker.default
+    puts msg
+    puts ""
+    puts "    " + "#{er.message}"
+    line_count = 0
+    er.backtrace.each do |line|
+        if line_count < fm.num_error_lines
+            puts "    " + line
+        end
+        line_count = line_count + 1
+    end
+    puts "ERROR"  # GUI uses this
+end
+
+def loadfile(fname, cmd)
+    fm = FigureMaker.default
+    have_loaded = false
+    fm.reset_state
+    begin
+        puts "load #{fname}"
+        load(fname) # this should define the TiogaFigures class
+        refresh_fname = fm.auto_refresh_filename
+        if refresh_fname != nil
+            refresh_fname = "#{fm.run_dir}/#{refresh_fname}" if fm.run_dir != nil && refresh_fname[0..0] != '/'
+            puts "####03OK #{refresh_fname}" # GUI uses this
+        end
+        have_loaded = true
+        if cmd == "load_and_list"
+            num_fig = fm.num_figures
+            if num_fig == 0
+                puts "ERROR: Failed to define any figures.  Remember to invoke 'new' for the class containing the figure definitions"
+            end
+            response = "####01OK " + num_fig.to_s
+            num_fig.times { |i| response = response + ' ' + fm.figure_name(i) }
+            puts response # GUI uses this
+        end
+    rescue Exception => er
+        report_error(er, "ERROR: load failed for #{fname}\n####01")
+    end
+    return have_loaded
+end
+
+def command_loop
+    fm = FigureMaker.default
+    fname = nil
+    pname = nil
+    have_loaded = false
+    
+    loop do
+        cmd_line = readline("\n")
+        #cmd_line = gets
+        break if cmd_line.nil?
+        cmd = cmd_line.scanf("%s")
+        cmd = cmd.to_s
+        puts "\n\n"
+        if cmd == "exit"
+            puts "exiting"
+            puts "###\n"  # this marks end of command -- DON'T change it since the GUI depends on it!
+            exit
+        elsif (cmd == "need_to_reload_data")
+            fm.need_to_reload_data = true
+        elsif (cmd == "eval_function")
+            skip = "eval_function".length
+            string = cmd_line[skip+1..-1]
+            begin
+                result = fm.eval_function(string)
+                puts result.to_s
+            rescue
+            end
+            puts "####00" # GUI uses this
+        elsif (cmd == "load" || cmd == "load_and_list")
+            cmd, fname = cmd_line.scanf("%s %s")
+            if fname == nil
+                puts "must give file name as argument for load command"
+            else
+                have_loaded = loadfile(fname, cmd)
+            end
+        elsif (cmd == "make_portfolio")
+            if !have_loaded
+                puts "must load a file before make a portfolio"
+            else
+                cmd, fname = cmd_line.scanf("%s %s")
+                if fname == nil
+                    puts "must give file name as argument for make_portfolio command"
+                else
+                    fm.require_all
+                    fm.make_portfolio_pdf(fname)
+                    puts "####00" # GUI uses this
+                end
+            end
+        elsif (cmd == "make" || cmd == "need_to_reload_data_and_make")
+            if cmd == "need_to_reload_data_and_make"
+                fm.need_to_reload_data = true
+            end
+            if !have_loaded
+                puts "must load a file before make a figure"
+            else
+                cmd, num = cmd_line.scanf("%s %s")
+                if num == nil || (num.to_i == 0 && num != "0")
+                    puts "must provide integer figure index as arg make"
+                else
+                    result = fm.make_pdf(num.to_i)
+                    if result == false
+                        puts "####02FAILED" # GUI uses this
+                    else
+                        puts "####02OK #{result}"
+                    end
+                    puts "#{result}"
+                end
+            end
+        elsif cmd == "make_all"
+            if !have_loaded
+                puts "must load a file before make_all"
+            else
+                puts "make_all"
+                fm.num_figures.times {|i| fm.make_preview_pdf(i) }
+            end
+            puts "####00" # GUI uses this
+        elsif cmd == "name"
+            if !have_loaded
+                puts "must load a file before ask for figure names"
+            else
+                cmd, num = cmd_line.scanf("%s %s")
+                if (num == nil)
+                    puts "must give index of figure as argument for name command"
+                else
+                    eval_str = "fm.figure_name(#{num})"
+                    begin
+                        puts eval(eval_str)
+                    rescue Exception
+                        puts "invalid figure number #{num}"
+                    end
+                end
+            end
+        elsif cmd == "names"
+            if !have_loaded
+                puts "must load a file before ask for figure names"
+            else
+                puts fm.figure_names
+            end
+        elsif cmd == "list"
+            if !have_loaded
+                puts "must load a file before ask to list figure names"
+            else
+                fm.figure_names.each_with_index { |name,i| STDOUT.printf("%3i %s\n",i,name) }
+            end
+        elsif cmd == "num_figures"
+            if !have_loaded
+                puts "must load a file before ask how many figures"
+            else
+                eval_str = "fm.num_figures"
+                begin
+                    puts eval(eval_str).to_s
+                rescue Exception
+                end
+            end
+        elsif cmd == "set_which_pdflatex"
+            cmd, fname = cmd_line.scanf("%s %s")
+            if fname == nil
+                puts "must give pdflatex name as argument for set_which_pdflatex command"
+            else
+                FigureMaker.pdflatex = fname
+                puts "use #{fname}"
+            end
+        else
+            puts "invalid command <#{cmd}> in command line <#{cmd_line}>"
+        end
+    end
+end
+
+command_loop

data/split/Tioga/lib/tioga_ui_cmds.rb

@@ -169,8 +169,12 @@ class TiogaUI
     
     return filename unless $change_working_directory
     
-    # if necessary, add the current directory to the front of the filename
-    filename = Dir.getwd + '/' + filename if filename[0..0] != '/'
+    if (filename.length > 2) && (filename[0..1] == '~/')
+      filename = ENV['HOME'] + filename[1..-1]
+    elsif filename[0..0] != '/'
+      # if necessary, add the current directory to the front of the filename
+      filename = Dir.getwd + '/' + filename
+    end
     
     parts = filename.split('/')
     if parts[-1].length < 2 || parts[-1][-2..-1] != "rb"

data/split/Tioga/namespace.h

@@ -34,14 +34,18 @@
 */
 
 #ifdef __APPLE__
-# define PRIVATE __private_extern__
+# define INTERN __private_extern__
 # define PUBLIC 
 #elif __GNUC__ >= 4 /* we have the visibility attribute */
-# define PRIVATE __attribute__ ((visibility ("hidden"))) 
+# define INTERN __attribute__ ((visibility ("hidden"))) 
 # define PUBLIC __attribute__ ((visibility ("default"))) 
 #else /* not really good */
-# define PRIVATE 
+# define INTERN
 # define PUBLIC 
 #endif /* __APPLE__  and __GNU_C_ >= 4*/
 
+/* In any case, PRIVATE is static */
+
+#define PRIVATE static
+
 #endif

data/split/Tioga/pdfcoords.c

@@ -139,14 +139,32 @@ void c_set_bounds(FM *p, double left, double right, double top, double bottom)
    } else if (right < left) {
       p->xaxis_reversed = true;
       p->bounds_xmin = right; p->bounds_xmax = left;
-   } else rb_raise(rb_eArgError, "Sorry: left and right bounds cannot be the same (%g)", left);
+   } else { // left == right
+      p->xaxis_reversed = false;
+      if (left > 0.0) {
+        p->bounds_xmin = left * (1.0 - 1e-6); p->bounds_xmax = left * (1.0 + 1e-6);
+      } else if (left < 0.0) {
+        p->bounds_xmin = left * (1.0 + 1e-6); p->bounds_xmax = left * (1.0 - 1e-6);
+      } else {
+        p->bounds_xmin = -1e-6; p->bounds_xmax = 1e-6;
+      }
+   }
    if (bottom < top) {
       p->yaxis_reversed = false;
       p->bounds_ymin = bottom; p->bounds_ymax = top;
    } else if (top < bottom) {
       p->yaxis_reversed = true;
       p->bounds_ymin = top; p->bounds_ymax = bottom;
-   } else rb_raise(rb_eArgError, "Sorry: top and bottom bounds cannot be the same (%g)", top);
+   } else { // top == bottom
+      p->yaxis_reversed = false;
+      if (bottom > 0.0) {
+        p->bounds_ymin = bottom * (1.0 - 1e-6); p->bounds_ymax = bottom * (1.0 + 1e-6);
+      } else if (bottom < 0.0) {
+        p->bounds_ymin = bottom * (1.0 + 1e-6); p->bounds_ymax = bottom * (1.0 - 1e-6);
+      } else {
+        p->bounds_xmin = -1e-6; p->bounds_xmax = 1e-6;
+      }
+   }
    p->bounds_width = p->bounds_xmax - p->bounds_xmin;
    p->bounds_height = p->bounds_ymax - p->bounds_ymin;
    Recalc_Font_Hts(p);