[Gridflow-cvs] [svn] commit: r3385 - in /trunk/base: flow_objects.rb grid.c grid.h

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Tue Apr 1 13:16:41 EDT 2008


Author: matju
Date: Tue Apr  1 13:16:40 2008
New Revision: 3385

Log:
remove inlet_nt, inlet_dim, inlet_set_factor and inlet_set_chunk

Modified:
    trunk/base/flow_objects.rb
    trunk/base/grid.c
    trunk/base/grid.h

Modified: trunk/base/flow_objects.rb
==============================================================================
--- trunk/base/flow_objects.rb (original)
+++ trunk/base/flow_objects.rb Tue Apr  1 13:16:40 2008
@@ -522,9 +522,8 @@
 end
 
 if FObject.respond_to?(:gui_enable)
-class Display < GridObject; include Gooey
+class Display < FObject; include Gooey
 	attr_accessor :text
-	install_rgrid 0
 	def initialize()
 		super
 		@sel = nil; @args = [] # contents of last received message

Modified: trunk/base/grid.c
==============================================================================
--- trunk/base/grid.c (original)
+++ trunk/base/grid.c Tue Apr  1 13:16:40 2008
@@ -458,41 +458,6 @@
 	}
 }
 
-\def Ruby inlet_nt (int inln) {
-	if (inln<0 || inln>=(int)in.size()) RAISE("bad inlet number");
-	P<GridInlet> inl = in[inln];
-	if (!inl) RAISE("no such inlet #%d",inln);
-	if (!inl->dim) return Qnil;
-	return ID2SYM(rb_intern(number_type_table[inl->nt].name));
-}
-
-\def Array inlet_dim (int inln) {
-	if (inln<0 || inln>=(int)in.size()) RAISE("bad inlet number");
-	P<GridInlet> inl = in[inln];
-	if (!inl) RAISE("no such inlet #%d",inln);
-	if (!inl->dim) return Qnil;
-	int n=inl->dim->count();
-	Ruby a = rb_ary_new2(n);
-	for(int i=0; i<n; i++) rb_ary_push(a,INT2NUM(inl->dim->v[i]));
-	return a;
-}
-
-\def void inlet_set_factor (int inln, long factor) {
-	if (inln<0 || inln>=(int)in.size()) RAISE("bad inlet number");
-	P<GridInlet> inl = in[inln];
-	if (!inl) RAISE("no such inlet #%d",inln);
-	if (!inl->dim) RAISE("inlet #%d not active",inln);
-//	inl->set_factor(factor);
-}
-
-\def void inlet_set_chunk (int inln, long whichdim) {
-	if (inln<0 || inln>=(int)in.size()) RAISE("bad inlet number");
-	P<GridInlet> inl = in[inln];
-	if (!inl) RAISE("no such inlet #%d",inln);
-	if (!inl->dim) RAISE("inlet #%d not active",inln);
-	inl->set_chunk(whichdim);
-}
-
 // install_rgrid(Integer inlet, Boolean multi_type? = true)
 static Ruby GridObject_s_install_rgrid(int argc, Ruby *argv, Ruby rself) {
 	if (argc<1 || argc>2) RAISE("er...");

Modified: trunk/base/grid.h
==============================================================================
--- trunk/base/grid.h (original)
+++ trunk/base/grid.h Tue Apr  1 13:16:40 2008
@@ -868,10 +868,6 @@
 		return false;
 	}
 	\decl Ruby method_missing(...);
-	\decl Array inlet_dim(int inln);
-	\decl Ruby inlet_nt(int inln);
-	\decl void inlet_set_factor(int inln, long factor);
-	\decl void inlet_set_chunk(int inln, long chunk);
 };
 \end class GridObject
 



More information about the Gridflow-cvs mailing list