diff options
22 files changed, 341 insertions, 0 deletions
diff --git a/science/Makefile b/science/Makefile index 0c155f86aca2..fd60fbeafed5 100644 --- a/science/Makefile +++ b/science/Makefile @@ -5,6 +5,7 @@ SUBDIR += chemtool SUBDIR += clhep SUBDIR += euler + SUBDIR += flounder SUBDIR += gdis SUBDIR += glens SUBDIR += libsvm diff --git a/science/flounder/Makefile b/science/flounder/Makefile new file mode 100644 index 000000000000..5993ce3e9ed1 --- /dev/null +++ b/science/flounder/Makefile @@ -0,0 +1,45 @@ +# ex:ts=8 +# Ports collection Makefile for: flounder +# Date created: Oct 14, 2002 +# Whom: ijliao +# +# $FreeBSD$ +# + +PORTNAME= flounder +PORTVERSION= 0.32a +CATEGORIES= science +MASTER_SITES= http://www.enel.ucalgary.ca/~vigmond/flounder/ +DISTNAME= ${PORTNAME} +EXTRACT_SUFX= .tgz + +MAINTAINER= ports@FreeBSD.org + +LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \ + ungif:${PORTSDIR}/graphics/libungif \ + png:${PORTSDIR}/graphics/png + +USE_MESA= yes +USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lstdc++" +USE_GMAKE= yes + +.if !defined(WITHOUT_AVIFILE) +LIB_DEPENDS+= aviplay:${PORTSDIR}/graphics/avifile +CONFIGURE_ARGS+= --enable-avifile +.endif + +.if !defined(WITHOUT_PLOT) +BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot +RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot +CONFIGURE_ARGS+= --enable-gnuplot +.endif + +.if !defined(WITHOUT_GRACE) +BUILD_DEPENDS+= xmgrace:${PORTSDIR}/math/grace +RUN_DEPENDS+= xmgrace:${PORTSDIR}/math/grace +CONFIGURE_ARGS+= --enable-grace +.endif + +.include <bsd.port.mk> diff --git a/science/flounder/distinfo b/science/flounder/distinfo new file mode 100644 index 000000000000..1be5dc2f2115 --- /dev/null +++ b/science/flounder/distinfo @@ -0,0 +1 @@ +MD5 (flounder.tgz) = 0c07ff0a044c7611eb6723c38c660ee6 diff --git a/science/flounder/files/patch-Colourscale.cc b/science/flounder/files/patch-Colourscale.cc new file mode 100644 index 000000000000..d5e7223e823e --- /dev/null +++ b/science/flounder/files/patch-Colourscale.cc @@ -0,0 +1,13 @@ +--- src/Colourscale.cc.orig Tue Oct 15 00:12:17 2002 ++++ src/Colourscale.cc Tue Oct 15 00:15:30 2002 +@@ -18,7 +18,9 @@ + */ + #include "Colourscale.h" + +-Colourscale :: Colourscale( int ts=64, CScale_t tcs=CS_BL_RAINBOW ) ++using namespace std; ++ ++Colourscale :: Colourscale( int ts, CScale_t tcs ) + { + n = 0; + mindat = 0; diff --git a/science/flounder/files/patch-Fl_Gnuplot.cc b/science/flounder/files/patch-Fl_Gnuplot.cc new file mode 100644 index 000000000000..96a1e754336e --- /dev/null +++ b/science/flounder/files/patch-Fl_Gnuplot.cc @@ -0,0 +1,26 @@ +--- src/Fl_Gnuplot.cc.orig Tue Oct 15 03:59:41 2002 ++++ src/Fl_Gnuplot.cc Tue Oct 15 04:02:05 2002 +@@ -44,6 +44,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <iostream> + + #include "FL/fl_draw.H" + #include "FL/fl_ask.H" +@@ -53,12 +54,14 @@ + + #define N_ENTRIES 8192 + ++using namespace std; ++ + // enter a GNUP{LOT command to be executed + void gnuplotcom_cb( Fl_Widget *w, void *p ) + { + Fl_Gnuplot* graph=(Fl_Gnuplot*)w; + +- char *s=fl_input("Enter Gnuplot commands seperated by ;",graph->command() ); ++ char *s=(char*)fl_input("Enter Gnuplot commands seperated by ;",graph->command() ); + if( s != NULL ) graph->command(s); + graph->window()->redraw(); + } diff --git a/science/flounder/files/patch-Fl_Gnuplot.h b/science/flounder/files/patch-Fl_Gnuplot.h new file mode 100644 index 000000000000..27c98a587888 --- /dev/null +++ b/science/flounder/files/patch-Fl_Gnuplot.h @@ -0,0 +1,11 @@ +--- src/Fl_Gnuplot.h.orig Tue Oct 15 04:00:20 2002 ++++ src/Fl_Gnuplot.h Tue Oct 15 04:00:37 2002 +@@ -47,6 +47,8 @@ + #include "FL/Fl_Widget.H" + #include "FL/Fl_Box.H" + ++using namespace std; ++ + class Fl_Gnuplot : public Fl_Box { + private: + Fl_Gnuplot(); diff --git a/science/flounder/files/patch-GlAreaUI.cc b/science/flounder/files/patch-GlAreaUI.cc new file mode 100644 index 000000000000..def5dcfb3c82 --- /dev/null +++ b/science/flounder/files/patch-GlAreaUI.cc @@ -0,0 +1,41 @@ +--- src/GlAreaUI.cc.orig Thu Mar 28 04:28:54 2002 ++++ src/GlAreaUI.cc Tue Oct 15 03:56:58 2002 +@@ -19,6 +19,7 @@ + #include "../config.h" + #include "flguppy.h" + #include <algorithm> ++#include <iostream> + #ifdef HAVE_VALUES_H + #include <values.h> + #endif +@@ -30,9 +31,11 @@ + #include <avifile/videoencoder.h> + #include <avifile/avifile.h> + #include <avifile/aviplay.h> +-#include <avifile/aviutil.h> ++#include <avifile/fourcc.h> + #endif + ++using namespace std; ++ + Fl_Font fontset[] = { + FL_HELVETICA, FL_HELVETICA_BOLD, + FL_HELVETICA_ITALIC, FL_HELVETICA_BOLD_ITALIC, +@@ -164,7 +167,7 @@ + } + + //update the settings to reflect the current model window +-void GlAreaUI :: setcurrent( GLView *a, bool force=false ) ++void GlAreaUI :: setcurrent( GLView *a, bool force ) + { + if( a == curr_glwin && force==false ) return; + +@@ -435,7 +438,7 @@ + inline int square( int a ){return a*a; } + + // make gif images +-void GlAreaUI :: movie( bool single=false ) ++void GlAreaUI :: movie( bool single ) + { + char *fn; + if( single == true ) diff --git a/science/flounder/files/patch-Glarea.cc b/science/flounder/files/patch-Glarea.cc new file mode 100644 index 000000000000..4e4673c20a24 --- /dev/null +++ b/science/flounder/files/patch-Glarea.cc @@ -0,0 +1,29 @@ +--- src/Glarea.cc.orig Tue Oct 15 01:18:55 2002 ++++ src/Glarea.cc Tue Oct 15 01:22:10 2002 +@@ -1064,7 +1064,7 @@ + + + // Constructor for Glarea class +-Glarea::Glarea (int X, int Y, int W, int H, const char *L=0): ++Glarea::Glarea (int X, int Y, int W, int H, const char *L): + Fl_Gl_Window(X, Y, W, H, L) + { + maxdim = 0; +@@ -1695,7 +1695,7 @@ + } + + // update the tableau user interface widget +-void Glarea :: tableau( TableauUI *tb, bool update=false ) ++void Glarea :: tableau( TableauUI *tb, bool update ) + { + if( tb->window->visible() == false ) return; + +@@ -1917,7 +1917,7 @@ + // set update to return the values into the vars, otherwise + // set the variables from the supplied parameters + void Glarea :: contours( bool& con, bool& dat, int& nc, double& st, double& inc, +- bool update=false ) ++ bool update ) + { + if( update == false ) { + showcontour = con; diff --git a/science/flounder/files/patch-Glarea.h b/science/flounder/files/patch-Glarea.h new file mode 100644 index 000000000000..425cb28a0e21 --- /dev/null +++ b/science/flounder/files/patch-Glarea.h @@ -0,0 +1,11 @@ +--- src/Glarea.h.orig Tue Oct 15 01:13:37 2002 ++++ src/Glarea.h Tue Oct 15 01:15:44 2002 +@@ -43,6 +43,8 @@ + #include "RenderEPS.h" + #include "IGBheader.h" + ++using namespace std; ++ + typedef enum dispdim{DISP_XY, DISP_YZ, DISP_ZX, + DISP_YX, DISP_ZY, DISP_XZ} DispDim; + typedef enum bbvalue{ BBXM, BBXP, BBYM, BBYP, BBZM, BBZP } BBvalue; diff --git a/science/flounder/files/patch-IGBheader.cc b/science/flounder/files/patch-IGBheader.cc new file mode 100644 index 000000000000..102c34e373b9 --- /dev/null +++ b/science/flounder/files/patch-IGBheader.cc @@ -0,0 +1,13 @@ +--- src/IGBheader.cc.orig Tue Oct 15 02:15:19 2002 ++++ src/IGBheader.cc Tue Oct 15 02:15:44 2002 +@@ -17,7 +17,10 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #include<stdlib.h> ++#include <iostream> + #include "IGBheader.h" ++ ++using namespace std; + + /* -------------- Bits de statut pour Header_Read et Header_Write ------ */ + diff --git a/science/flounder/files/patch-Myslider.cc b/science/flounder/files/patch-Myslider.cc new file mode 100644 index 000000000000..6fbaaf3b594c --- /dev/null +++ b/science/flounder/files/patch-Myslider.cc @@ -0,0 +1,11 @@ +--- src/Myslider.cc.orig Tue Oct 15 02:08:12 2002 ++++ src/Myslider.cc Tue Oct 15 02:08:22 2002 +@@ -21,7 +21,7 @@ + + const int w_valout = 40; + +-Myslider :: Myslider( int X, int Y, int W, int H, char *L=0): ++Myslider :: Myslider( int X, int Y, int W, int H, char *L): + Fl_Group(X,Y,W,H,L), + valout(X,Y,w_valout,H), + slider( X+w_valout, Y, W-w_valout, H ) diff --git a/science/flounder/files/patch-PlotWin.cc b/science/flounder/files/patch-PlotWin.cc new file mode 100644 index 000000000000..7ed11d9a2ffe --- /dev/null +++ b/science/flounder/files/patch-PlotWin.cc @@ -0,0 +1,11 @@ +--- src/PlotWin.cc.orig Tue Oct 15 02:09:34 2002 ++++ src/PlotWin.cc Tue Oct 15 02:10:22 2002 +@@ -21,7 +21,7 @@ + #include <FL/Fl_Widget.H> + + // set the data to plot +-void PlotWin :: set_data( int n, double *d, int t=-1, double *xd=NULL ) ++void PlotWin :: set_data( int n, double *d, int t, double *xd ) + { + if( n != datasize ) { + delete[] xv; diff --git a/science/flounder/files/patch-RenderEPS.cc b/science/flounder/files/patch-RenderEPS.cc new file mode 100644 index 000000000000..3ec7aca4dff6 --- /dev/null +++ b/science/flounder/files/patch-RenderEPS.cc @@ -0,0 +1,11 @@ +--- src/RenderEPS.cc.orig Tue Oct 15 02:11:32 2002 ++++ src/RenderEPS.cc Tue Oct 15 02:11:44 2002 +@@ -48,7 +48,7 @@ + + + // constructor +-RenderEPS :: RenderEPS( char *fn, int sz=FB_BUFSIZE ) ++RenderEPS :: RenderEPS( char *fn, int sz ) + { + bufsize = sz; + feedbackBuffer = (GLfloat *)malloc( bufsize*sizeof(GLfloat) ); diff --git a/science/flounder/files/patch-RenderEPS.h b/science/flounder/files/patch-RenderEPS.h new file mode 100644 index 000000000000..b81b62a0866f --- /dev/null +++ b/science/flounder/files/patch-RenderEPS.h @@ -0,0 +1,11 @@ +--- src/RenderEPS.h.orig Tue Oct 15 00:35:11 2002 ++++ src/RenderEPS.h Tue Oct 15 00:35:26 2002 +@@ -23,6 +23,8 @@ + #include <GL/gl.h> + #include <string> + ++using namespace std; ++ + #define FB_BUFSIZE 1000000 + + class RenderEPS { diff --git a/science/flounder/files/patch-SubsampUI.cc b/science/flounder/files/patch-SubsampUI.cc new file mode 100644 index 000000000000..3a293f5f6b52 --- /dev/null +++ b/science/flounder/files/patch-SubsampUI.cc @@ -0,0 +1,11 @@ +--- src/SubsampUI.cc.orig Tue Oct 15 02:14:13 2002 ++++ src/SubsampUI.cc Tue Oct 15 02:14:19 2002 +@@ -28,7 +28,7 @@ + ((Strideslide *)p)->update(); + } + +-Strideslide :: Strideslide( int X, int Y, int W, int H, char *L=0): ++Strideslide :: Strideslide( int X, int Y, int W, int H, char *L): + Fl_Group(X,Y,W,H,L), + slider( X, Y, W-w_valout-w_sep-w_samplabel, H ), + valout(X+W-w_valout-w_samplabel,Y,w_valout, H ), diff --git a/science/flounder/files/patch-flguppy.cc b/science/flounder/files/patch-flguppy.cc new file mode 100644 index 000000000000..4d1c59bc3f49 --- /dev/null +++ b/science/flounder/files/patch-flguppy.cc @@ -0,0 +1,20 @@ +--- src/flguppy.cc.orig Tue Oct 15 01:04:33 2002 ++++ src/flguppy.cc Tue Oct 15 01:05:24 2002 +@@ -20,6 +20,8 @@ + + #include "flguppy.h" + ++using namespace std; ++ + inline void TableauUI::cb_window_i(Fl_Window*, void*) { + closebutton->do_callback(); + } +@@ -322,7 +324,7 @@ + } + class GlAreaUI; + +-GLView::GLView(GlAreaUI *g, char *fn, void *d=NULL) { ++GLView::GLView(GlAreaUI *g, char *fn, void *d) { + Fl_Double_Window* w; + { Fl_Double_Window* o = window = new Fl_Double_Window(365, 355); + w = o; diff --git a/science/flounder/files/patch-flguppy.h b/science/flounder/files/patch-flguppy.h new file mode 100644 index 000000000000..969c63be1ebe --- /dev/null +++ b/science/flounder/files/patch-flguppy.h @@ -0,0 +1,11 @@ +--- src/flguppy.h.orig Tue Oct 15 01:03:47 2002 ++++ src/flguppy.h Tue Oct 15 01:03:57 2002 +@@ -31,6 +31,8 @@ + #include <FL/Fl_Button.H> + #include <FL/Fl_Value_Output.H> + ++using namespace std; ++ + class TableauUI { + public: + void *widg; diff --git a/science/flounder/files/patch-igbhead.cc b/science/flounder/files/patch-igbhead.cc new file mode 100644 index 000000000000..1d0683b35425 --- /dev/null +++ b/science/flounder/files/patch-igbhead.cc @@ -0,0 +1,12 @@ +--- utils/igbhead.cc.orig Tue Oct 15 02:20:12 2002 ++++ utils/igbhead.cc Tue Oct 15 02:20:30 2002 +@@ -11,6 +11,9 @@ + #include<string> + #include "IGBheader.h" + #include "cmdline.h" ++#include <iostream> ++ ++using namespace std; + + void output_header( IGBheader* ); + diff --git a/science/flounder/files/patch-isosurf.cc b/science/flounder/files/patch-isosurf.cc new file mode 100644 index 000000000000..d8fd530aa53a --- /dev/null +++ b/science/flounder/files/patch-isosurf.cc @@ -0,0 +1,28 @@ +--- src/isosurf.cc.orig Tue Oct 15 02:05:22 2002 ++++ src/isosurf.cc Tue Oct 15 02:07:26 2002 +@@ -138,7 +138,7 @@ + * N.B. the array is subscripted as data[z][y][x] + */ + void +-Isosurf::alloc_3d_data_array(int nx, int ny, int nz, float *dp = NULL) ++Isosurf::alloc_3d_data_array(int nx, int ny, int nz, float *dp) + { + register int i, j; + +@@ -550,7 +550,7 @@ + int dfprintf(int fd, int i); + /**************************************************************/ + +-int perr(char *s, int a1=0, int a2=0, int a3=0, int a4=0, int a5=0, int a6=0) ++int perr(char *s, int a1, int a2, int a3, int a4, int a5, int a6) + { + fprintf(stderr, "%s: ", Progname); + fprintf(stderr, s, a1, a2, a3, a4, a5, a6); +@@ -2241,7 +2241,6 @@ + * the University of Illinois at Urbana-Champaign. + */ + +-#include <malloc.h> + + /********************************************************/ + float * diff --git a/science/flounder/pkg-comment b/science/flounder/pkg-comment new file mode 100644 index 000000000000..304678a34eea --- /dev/null +++ b/science/flounder/pkg-comment @@ -0,0 +1 @@ +A quick way to visualize regularly spaced 4D data diff --git a/science/flounder/pkg-descr b/science/flounder/pkg-descr new file mode 100644 index 000000000000..a027e1b36047 --- /dev/null +++ b/science/flounder/pkg-descr @@ -0,0 +1,21 @@ +Flounder is a quick way to visualize regularly spaced 4D data, i.e., a data +set that is a function of x, y, z, and time. + +Features + - Animation + - 4D (x,y,z,t) display + - Display multiple data files linked by time + - 2D slices along prinicpal axes + - Adjustable colour scales and quantization levels + - Contour plots + - Isosurfaces + - 3D surface rendering + - 3D solid rendering + - Save images as gif, png or eps + - Save movies as animated gif or avi + - Display time series at a spatial location with zoom + - Vertical and horizontal profiles + - Tableau plots + - Adjustable colours and font + +WWW: http://www.enel.ucalgary.ca/~vigmond/flounder/ diff --git a/science/flounder/pkg-plist b/science/flounder/pkg-plist new file mode 100644 index 000000000000..50843b692ba3 --- /dev/null +++ b/science/flounder/pkg-plist @@ -0,0 +1,2 @@ +bin/flounder +bin/igbhead |