mathgl 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 731510d909819e3d4c79ccb77ec242531feae656
-  data.tar.gz: 7bd7350c2351b457b960dac546ab8cf456f2f330
+  metadata.gz: 7da21f8407a4fec9815c7b4a243dbcd235b0d790
+  data.tar.gz: 58ebeb769a243d649e8c31b09010a6af82342a12
 SHA512:
-  metadata.gz: 72a5b2d53d6a7c43a8d97bb236092890d17fd62cd4d802988967d803cf99320d1de1bc95e338490b8af11b5572bdf8f7e35c5ad28b8fff5267ef9bac4937d2f1
-  data.tar.gz: 4d0735fc064802b7ee9be08a937ca5b10bb0787eefdef0a91568ded98da79ba3519f864bef58d08e44e3bc326f66dc0cb059d74668afca3c2ea6a8314e1b666d
+  metadata.gz: b3d1ee2ac5d134d7aff6a2a1fc35814f0d84e7f243bcd81b3e711eb93347904f3ebd5d8779a400006d3e0852516ec8e1b4bdcb977e3287a13b39bae7519ffc2c
+  data.tar.gz: cc0f8ce9f74c90f9bb690990e3e597f54c4f67064f317cce114d239924c23c399f15468556c758a4bdf34b9407e533b2a0683c3724a4d77d3ca6ab2ef420a8f3

data/.gitignore

@@ -25,15 +25,17 @@ tmp
 .#*
 */.#*
 */*/.#*
+#*
+*/#*
+*/*/#*
 rhosts
 spec/*/*.dat
 spec/*/*.csv
 
-**/Makefile
-**/*.o
-**/*.so
 mkmf.log
-
-ext/mathgl/*/*.cxx
-ext/mathgl/*/Makefile
+ext/mathgl/*.o
+ext/mathgl/qt.cxx
+ext/mathgl/fltk.cxx
+ext/mathgl/glut.cxx
+ext/mathgl/mathgl.so
 ext/mathgl/Makefile

data/README.md

@@ -1,21 +1,21 @@
-# Mathgl
+# Ruby/MathGL
 
-Ruby/MathGL : MathGL wrapper for Ruby made using SWIG
-
-MathGL - library for scientific data visualization
+Ruby wrapper of MathGL - library for scientific data visualization
 http://mathgl.sourceforge.net/
 
 (This package is under construction.)
 
 ## Installation
 
-Install from source:
+1. Install MathGL2 library: http://mathgl.sourceforge.net/
+
+2. Install Ruby/MathGL from source:
 
     ruby setup.rb config --prefix=$HOME/local -- --with-mathgl-dir=/usr/local
     ruby setup.rb setup
     ruby setup.rb install
 
-Or install it yourself as:
+Or install with gem:
 
     $ gem install mathgl -- --with-mathgl-dir=/usr/local
 

data/ext/mathgl/depend

@@ -1,2 +1,12 @@
 mathgl.cxx: mathgl.i rubymgl.i
 	swig -ruby -autorename -c++ $(INCFLAGS) -o $@ $<
+fltk.cxx: tmpl/mkwin.rb tmpl/win.erb.cxx
+	ruby tmpl/mkwin.rb fltk > $@
+glut.cxx: tmpl/mkwin.rb tmpl/win.erb.cxx
+	ruby tmpl/mkwin.rb glut > $@
+qt.cxx: tmpl/mkwin.rb tmpl/win.erb.cxx
+	ruby tmpl/mkwin.rb qt > $@
+
+.PHONY : cleancxx
+cleancxx: clean
+	rm -f qt.cxx fltk.cxx glut.cxx

data/ext/mathgl/extconf.rb

@@ -9,9 +9,22 @@ dir_config("mathgl")
 exit unless have_header("mgl2/type.h")
 exit unless have_header("mgl2/data.h")
 exit unless have_header("mgl2/mgl.h")
-#exit unless have_header("mgl2/qt.h")
 exit unless have_library("mgl")
-#exit unless have_library("mgl-qt")
 $objs = ["mathgl.o"]
+if have_header("mgl2/qt.h") && have_library("mgl-qt")
+  $objs << "qt.o"
+  $defs << "-DHAVE_QT"
+end
+if have_header("mgl2/fltk.h") && have_library("mgl-fltk")
+  $objs << "fltk.o"
+  $defs << "-DHAVE_FLTK"
+end
+if have_header("mgl2/glut.h") && have_library("mgl-glut")
+  $objs << "glut.o"
+  $defs << "-DHAVE_GLUT"
+end
+if File.exist?("mathgl.cxx")
+  FileUtils.touch("mathgl.cxx")
+end
 $CPPFLAGS.split.each{|x| $INCFLAGS+=" "+x if /^-I\S+$/=~x}
 create_makefile("mathgl")

data/ext/mathgl/mathgl.cxx

@@ -1911,6 +1911,26 @@ struct timeval rb_time_timeval(VALUE);
 #endif
 
 
+extern "C" {
+void Init_MathGL();
+void Init_mathgl_qt();
+void Init_mathgl_fltk();
+void Init_mathgl_glut();
+void Init_mathgl() {
+    Init_MathGL();
+#ifdef HAVE_QT
+    Init_mathgl_qt();
+#endif
+#ifdef HAVE_FLTK
+    Init_mathgl_fltk();
+#endif
+#ifdef HAVE_GLUT
+    Init_mathgl_glut();
+#endif
+}
+}
+
+
 static mglPoint GetMglPoint(VALUE arg)
 {
     if (TYPE(arg)==T_ARRAY) {
@@ -2264,12 +2284,6 @@ SWIGINTERN void mglGraph_SetFunc__SWIG_1(mglGraph *self,char const *EqX,int EqY=
 SWIGINTERN void mglGraph_SetFunc__SWIG_5(mglGraph *self,char const *EqX,char const *EqY,int EqZ=0,int EqA=0){ self->SetFunc(EqX, EqY, 0, 0); }
 SWIGINTERN void mglGraph_SetFunc__SWIG_8(mglGraph *self,char const *EqX,char const *EqY,char const *EqZ=NULL,int EqA=0){ self->SetFunc(EqX, EqY, EqZ, 0); }
 
-extern "C" {
-void Init_MathGL();
-void Init_mathgl(){ Init_MathGL(); }
-}
-
-
 /*
   Document-method: MathGL.Pi
 

data/ext/mathgl/mathgl.i

@@ -112,12 +112,3 @@ import_array();
 	void __setitem__( int i, float y)	{	self->SetVal(y,i);	};
 	void __paren_asgn( int i, float y)	{	self->SetVal(y,i);	};
 };
-
-#ifdef SWIGRUBY
-%{
-extern "C" {
-void Init_MathGL();
-void Init_mathgl(){ Init_MathGL(); }
-}
-%}
-#endif

data/ext/mathgl/rubymgl.i

@@ -1,6 +1,28 @@
 %include "typemaps.i"
 %include "wchar.i"
 
+%{
+extern "C" {
+void Init_MathGL();
+void Init_mathgl_qt();
+void Init_mathgl_fltk();
+void Init_mathgl_glut();
+
+void Init_mathgl() {
+    Init_MathGL();
+#ifdef HAVE_QT
+    Init_mathgl_qt();
+#endif
+#ifdef HAVE_FLTK
+    Init_mathgl_fltk();
+#endif
+#ifdef HAVE_GLUT
+    Init_mathgl_glut();
+#endif
+}
+}
+%}
+
 //-- mglPoint --
 %{
 static mglPoint GetMglPoint(VALUE arg)

data/ext/mathgl/tmpl/win.erb.cxx

@@ -0,0 +1,135 @@
+#include "ruby.h"
+
+#include "mgl2/type.h"
+#include "mgl2/data.h"
+#include "mgl2/mgl.h"
+#include "mgl2/<%=low%>.h"
+
+#define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
+
+static ID id_call;
+static ID id_draw;
+static ID id_handler;
+static ID id_instance_eval;
+static VALUE mMglGraph;
+
+class mglRubyDraw : public mglDraw
+{
+    VALUE ruby_block;
+    int arity;
+public:
+    mglRubyDraw(VALUE block) : mglDraw()
+    {
+        ruby_block = block;
+        if (RTEST(block)) {
+            arity = rb_proc_arity(block);
+            if (arity<0 || arity>1) {
+                rb_raise(rb_eArgError,"wrong # of block argument (%d for 0..1)",
+                         arity);
+            }
+        } else {
+            arity = 0;
+        }
+    }
+    int Draw(mglGraph *gr)
+    {
+        VALUE graph;
+        if (RTEST(ruby_block)) {
+            graph = Data_Wrap_Struct(mMglGraph, 0, 0, gr);
+            if (arity==1) {
+                rb_funcall(ruby_block, id_call, 1, graph);
+            } else {
+                rb_funcall_with_block(graph, id_instance_eval, 0, 0, ruby_block);
+            }
+        }
+        return 0;
+    }
+    void Reload()   {}  ///< Function for reloading data
+    void Click()    {}  ///< Callback function on mouse click
+    ~mglRubyDraw()  {}
+};
+
+static void
+mgl<%=low%>_free(mgl<%=up%> *arg1)
+{
+    delete arg1;
+}
+
+static VALUE
+mgl<%=low%>_s_allocate(VALUE klass)
+{
+  return Data_Wrap_Struct(klass, 0, mgl<%=low%>_free, 0);
+}
+
+static VALUE mgl<%=low%>_initialize(int nargs, VALUE *args, VALUE self)
+{
+    mgl<%=up%> *result = 0;
+    mglRubyDraw *mgl_draw = 0;
+    const char *title = 0;
+    VALUE block=Qnil;
+    VALUE v;
+
+    switch (nargs) {
+    case 0:
+        break;
+    case 1:
+        if (rb_obj_is_kind_of(args[0],rb_cString)) {
+            title = StringValueCStr(args[0]);
+        } else {
+            rb_raise(rb_eArgError, "argument is not a String");
+        }
+    default:
+        rb_raise(rb_eArgError, "wrong # of arguments(%d for 0..1)",nargs);
+    }
+
+    if (rb_block_given_p()) {
+        block = rb_block_proc();
+    }
+    mgl_draw = (mglRubyDraw *)new mglRubyDraw(block);
+    v = Data_Wrap_Struct(rb_cData, 0, -1, mgl_draw);
+    rb_ivar_set(v, id_handler, block);
+    rb_ivar_set(self, id_draw, v);
+
+    if (title==0) {
+        result = (mgl<%=up%> *)new mgl<%=up%>(mgl_draw);
+    } else {
+        result = (mgl<%=up%> *)new mgl<%=up%>(mgl_draw, title);
+    }
+    DATA_PTR(self) = result;
+    return self;
+}
+
+<% if has_run %>
+static VALUE mgl<%=low%>_run(VALUE self)
+{
+    mgl<%=up%> *arg;
+    int result;
+    arg = reinterpret_cast< mgl<%=up%> * >(DATA_PTR(self));
+    result = (int)(arg)->Run();
+    return INT2NUM(result);
+}
+<% end %>
+
+extern "C" {
+void
+Init_mathgl_<%=low%>()
+{
+    VALUE mMathGL;
+    VALUE cMgl<%=up%>;
+
+    mMathGL = rb_const_get(rb_cObject, rb_intern("MathGL"));
+    mMglGraph = rb_const_get(mMathGL, rb_intern("MglGraph"));
+
+    cMgl<%=up%> = rb_define_class_under(mMathGL, "Mgl<%=up%>", rb_cObject);
+    rb_define_alloc_func(cMgl<%=up%>, mgl<%=low%>_s_allocate);
+    rb_define_method(cMgl<%=up%>, "initialize", VALUEFUNC(mgl<%=low%>_initialize), -1);
+<% if has_run %>
+    rb_define_method(cMgl<%=up%>, "run", VALUEFUNC(mgl<%=low%>_run), 0);
+<% end %>
+
+    id_call = rb_intern("call");
+    id_draw = rb_intern("draw");
+    id_handler = rb_intern("handler");
+    id_instance_eval = rb_intern("instance_eval");
+}
+}

data/lib/mathgl/version.rb

@@ -1,3 +1,3 @@
 module Mathgl
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/mathgl.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Ruby wrapper for MathGL - library for scientific data visualization}
   spec.homepage      = "https://github.com/masa16/ruby-mathgl"
   spec.license       = "LGPL"
-  spec.extensions    = `git ls-files ext`.split($/).grep(/extconf/)
+  spec.extensions    = ["ext/mathgl/extconf.rb"]
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -21,4 +21,15 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+
+  spec.rdoc_options = %w[
+--exclude lib/mathgl.so
+--exclude doc/
+--exclude ext/
+--exclude sample/
+--exclude setup.rb
+--exclude mathgl.gemspec
+--exclude Gemfile
+--exclude Rakefile
+]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathgl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,9 +44,6 @@ email:
 executables: []
 extensions:
 - ext/mathgl/extconf.rb
-- ext/mathgl/fltk/extconf.rb
-- ext/mathgl/glut/extconf.rb
-- ext/mathgl/qt/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -56,14 +53,8 @@ files:
 - Rakefile
 - ext/mathgl/depend
 - ext/mathgl/extconf.rb
-- ext/mathgl/fltk/depend
-- ext/mathgl/fltk/extconf.rb
-- ext/mathgl/glut/depend
-- ext/mathgl/glut/extconf.rb
 - ext/mathgl/mathgl.cxx
 - ext/mathgl/mathgl.i
-- ext/mathgl/qt/depend
-- ext/mathgl/qt/extconf.rb
 - ext/mathgl/rubymgl.i
 - ext/mathgl/tmpl/mkwin.rb
 - ext/mathgl/tmpl/win.erb.cxx
@@ -78,7 +69,23 @@ licenses:
 - LGPL
 metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --exclude
+- lib/mathgl.so
+- --exclude
+- doc/
+- --exclude
+- ext/
+- --exclude
+- sample/
+- --exclude
+- setup.rb
+- --exclude
+- mathgl.gemspec
+- --exclude
+- Gemfile
+- --exclude
+- Rakefile
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/ext/mathgl/fltk/depend

@@ -1,2 +0,0 @@
-fltk.cxx: ../tmpl/mkwin.rb ../tmpl/win.erb.cxx
-	ruby ../tmpl/mkwin.rb fltk > $@

data/ext/mathgl/fltk/extconf.rb

@@ -1,20 +0,0 @@
-require "mkmf"
-
-# configure options:
-#  --with-mathgl-dir=path
-#  --with-mathgl-include=path
-#  --with-mathgl-lib=path
-
-dir_config("mathgl")
-
-#with_cppflags "-g -O0 -Wall"
-
-exit unless have_header("mgl2/type.h")
-exit unless have_header("mgl2/data.h")
-exit unless have_header("mgl2/mgl.h")
-exit unless have_header("mgl2/fltk.h")
-exit unless have_library("mgl")
-exit unless have_library("mgl-fltk")
-$objs = ["fltk.o"]
-$CPPFLAGS.split.each{|x| $INCFLAGS+=" "+x if /^-I\S+$/=~x}
-create_makefile("fltk")

data/ext/mathgl/glut/depend

@@ -1,2 +0,0 @@
-glut.cxx: ../tmpl/mkwin.rb ../tmpl/win.erb.cxx
-	ruby ../tmpl/mkwin.rb glut > $@

data/ext/mathgl/glut/extconf.rb

@@ -1,20 +0,0 @@
-require "mkmf"
-
-# configure options:
-#  --with-mathgl-dir=path
-#  --with-mathgl-include=path
-#  --with-mathgl-lib=path
-
-dir_config("mathgl")
-
-#with_cppflags "-g -O0 -Wall"
-
-exit unless have_header("mgl2/type.h")
-exit unless have_header("mgl2/data.h")
-exit unless have_header("mgl2/mgl.h")
-exit unless have_header("mgl2/glut.h")
-exit unless have_library("mgl")
-exit unless have_library("mgl-glut")
-$objs = ["glut.o"]
-$CPPFLAGS.split.each{|x| $INCFLAGS+=" "+x if /^-I\S+$/=~x}
-create_makefile("glut")

data/ext/mathgl/qt/depend

@@ -1,2 +0,0 @@
-qt.cxx: ../tmpl/mkwin.rb ../tmpl/win.erb.cxx
-	ruby ../tmpl/mkwin.rb qt > $@

data/ext/mathgl/qt/extconf.rb

@@ -1,20 +0,0 @@
-require "mkmf"
-
-# configure options:
-#  --with-mathgl-dir=path
-#  --with-mathgl-include=path
-#  --with-mathgl-lib=path
-
-dir_config("mathgl")
-
-#with_cppflags "-g -O0 -Wall"
-
-exit unless have_header("mgl2/type.h")
-exit unless have_header("mgl2/data.h")
-exit unless have_header("mgl2/mgl.h")
-exit unless have_header("mgl2/qt.h")
-exit unless have_library("mgl")
-exit unless have_library("mgl-qt")
-$objs = ["qt.o"]
-$CPPFLAGS.split.each{|x| $INCFLAGS+=" "+x if /^-I\S+$/=~x}
-create_makefile("qt")