head	1.17;
access;
symbols
	charm6_1:1.17
	charm_6_0_1:1.17
	charm6_0_1:1.17
	charm6_0:1.15
	ChaNGa_1-0:1.15
	charm5_9:1.15;
locks; strict;
comment	@# @;


1.17
date	2008.08.14.18.48.42;	author olawlor;	state Exp;
branches;
next	1.16;
commitid	ExKsW0FboapeRMet;

1.16
date	2008.08.13.23.24.19;	author olawlor;	state Exp;
branches;
next	1.15;
commitid	E1iWwcBuYPcFoGet;

1.15
date	2004.07.22.22.20.43;	author olawlor;	state Exp;
branches;
next	1.14;

1.14
date	2004.03.19.17.04.45;	author olawlor;	state Exp;
branches;
next	1.13;

1.13
date	2003.09.06.23.35.02;	author vmehta1;	state Exp;
branches;
next	1.12;

1.12
date	2003.09.06.20.50.17;	author vmehta1;	state Exp;
branches;
next	1.11;

1.11
date	2003.09.06.19.54.14;	author vmehta1;	state Exp;
branches;
next	1.10;

1.10
date	2002.11.15.08.46.32;	author vmehta1;	state Exp;
branches;
next	1.9;

1.9
date	2002.11.10.02.52.29;	author vmehta1;	state Exp;
branches;
next	1.8;

1.8
date	2002.10.29.16.46.51;	author olawlor;	state Exp;
branches;
next	1.7;

1.7
date	2002.10.28.23.45.40;	author vmehta1;	state Exp;
branches;
next	1.6;

1.6
date	2002.10.28.23.41.01;	author cheelee;	state Exp;
branches;
next	1.5;

1.5
date	2002.10.12.14.53.51;	author olawlor;	state Exp;
branches;
next	1.4;

1.4
date	2002.10.11.15.27.17;	author jbooth;	state Exp;
branches;
next	1.3;

1.3
date	2002.09.04.23.40.27;	author olawlor;	state Exp;
branches;
next	1.2;

1.2
date	2002.07.18.23.40.45;	author olawlor;	state Exp;
branches;
next	1.1;

1.1
date	2002.06.14.20.42.26;	author olawlor;	state Exp;
branches;
next	;


desc
@@


1.17
log
@Fix breakage on net-linux-smp, and other platforms where
conv-mach-opt.sh includes other files from tmp.
@
text
@CDIR=../../../..
CHARMC=$(CDIR)/bin/charmc $(OPTS)
FLAGS=-DEXTERIOR_BLACK_PIXEL_ELIMINATION

HEADERS=liveViz.h liveViz.decl.h liveVizPoll.decl.h liveViz0.h colorScale.h ImageData.h
HEADDEP=$(HEADERS) liveViz.def.h ImageData.h
OBJS=liveViz0.o liveViz.o liveVizPoll.o \
	colorScale.o ImageData.o compat_float2rgb.o
DEST=$(CDIR)/lib/libmoduleliveViz.a
DEP=$(CDIR)/lib/libmoduleliveViz.dep

all: $(DEST)

$(DEST): $(OBJS) $(COMPAT) headers
	$(CHARMC) $(OBJS) $(COMPAT) -o $@@
	(cd $(CDIR)/tmp; . ./conv-mach-opt.sh && echo "$$CMK_LIBJPEG") > $(DEP)

headers: $(HEADERS)
	cp $(HEADERS) $(CDIR)/include/
	touch headers

liveViz0.o: liveViz0.C $(HEADDEP)
	$(CHARMC) -c $(FLAGS) liveViz0.C

compat_float2rgb.o: compat_float2rgb.C $(HEADDEP)
	$(CHARMC) -c $(FLAGS) compat_float2rgb.C
liveViz.o: liveViz.C $(HEADDEP)
	$(CHARMC) -c $(FLAGS) liveViz.C

liveVizPoll.o: liveVizPoll.C $(HEADDEP)
	$(CHARMC) -c $(FLAGS) liveVizPoll.C

networkVar.o: networkVar.C $(HEADDEP)
	$(CHARMC) -c $(FLAGS) networkVar.C

colorScale.o: colorScale.C $(HEADDEP)
	$(CHARMC) -c $(FLAGS) colorScale.C

ImageData.o : ImageData.C $(HEADDEP)
	$(CHARMC) -c $(FLAGS) ImageData.C

liveViz.decl.h liveViz.def.h: liveViz.ci
	$(CHARMC) liveViz.ci

liveVizPoll.decl.h liveVizPoll.def.h: liveVizPoll.ci
	$(CHARMC) liveVizPoll.ci

clean:
	rm -rf *.a *.def.h *.decl.h *.o SunWS_cache $(DEST) headers
@


1.16
log
@Added JPEG-compressed image transport to liveViz.

This means:
	- Look for libjpeg header and library via configure (CMK_USE_LIBJPEG)
	- Make #ifdef CMK_USE_LIBJPEG calls to libjpeg in liveViz0
	  (but only if the client requests it)
	- Link liveViz applications with -ljpeg via a module .dep file.

Both Filippo and I have written clients for this, and it seems to work
well over slow network links.
@
text
@d16 1
a16 1
	. $(CDIR)/tmp/conv-mach-opt.sh && echo "$$CMK_LIBJPEG" > $(DEP)
@


1.15
log
@Add support for floating-point pixel images, as requested
by the Cosmo folks.  Also took opportunity to lightly refactor
and heavily comment ImageData.[Ch].
@
text
@d10 1
d16 1
@


1.14
log
@Minor reworking of LiveViz:
  1.) Allow arbitrary extra data to be sent from client.
      This data is sent along in the liveVizRequestMsg, and
      can be extracted into a user data type via liveVizRequestUnpack.
      In particular, the 3d data is now treated as generic
      "extra client data", not as something built into liveViz.
  2.) Cleaned up liveVizPoll implementation.  In particular,
        a.) AtSync won't be needed if we just don't set usesAtSync.
        b.) liveVizPollRequestMsg is now the same as liveVizRequestMsg.
@
text
@d7 2
a8 1
OBJS=liveViz0.o liveViz.o liveVizPoll.o colorScale.o ImageData.o
d23 2
@


1.13
log
@fixed bug in strategy that omits black pixel at line boundaries and made this strategy default strategy to be compiled
@
text
@d6 2
a7 3
HEADDEP=$(HEADERS) liveViz.def.h networkVar.h \
	ImageData.h
OBJS=liveViz0.o liveViz.o liveVizPoll.o networkVar.o colorScale.o ImageData.o
@


1.12
log
@temporarily switching strategy to break image into lines from "black pixel elimination at line ends" to "no black pixel elimination". This will be reverted once bug is fixed in 1st strategy.
@
text
@d3 1
a3 1
FLAGS=-DNO_BLACK_PIXEL_ELIMINATION
@


1.11
log
@new implementation for liveViz image combine
@
text
@d3 1
a3 1
FLAGS=-DEXTERIOR_BLACK_PIXEL_ELIMINATION
@


1.10
log
@did some performace optimization
@
text
@d3 1
d5 1
a5 1
HEADERS=liveViz.h liveViz.decl.h liveVizPoll.decl.h liveViz0.h colorScale.h xSortedImageList.h imagelist.h imagenode.h image.h defines.h
d7 2
a8 2
	image.h imagelist.h imagenode.h xSortedImageList.h
OBJS=liveViz0.o liveViz.o liveVizPoll.o networkVar.o colorScale.o image.o imagenode.o imagelist.o xSortedImageList.o
d21 1
a21 1
	$(CHARMC) -c liveViz0.C
d24 1
a24 1
	$(CHARMC) -c liveViz.C
d27 1
a27 1
	$(CHARMC) -c liveVizPoll.C
d30 1
a30 1
	$(CHARMC) -c networkVar.C
d33 1
a33 1
	$(CHARMC) -c colorScale.C
d35 2
a36 11
image.o : image.C $(HEADDEP)
	$(CHARMC) -c image.C

imagenode.o : imagenode.C $(HEADDEP)
	$(CHARMC) -c imagenode.C

imagelist.o : imagelist.C $(HEADDEP)
	$(CHARMC) -c imagelist.C

xSortedImageList.o : xSortedImageList.C $(HEADDEP)
	$(CHARMC) -c xSortedImageList.C
@


1.9
log
@Added API allowing chares to deposit a list of images and removed redundant bytes from image Header that were contributed.
@
text
@d4 1
a4 1
HEADERS=liveViz.h liveViz.decl.h liveVizPoll.decl.h liveViz0.h colorScale.h xSortedImageList.h imagelist.h imagenode.h image.h point.h defines.h
d6 2
a7 2
	point.h image.h imagelist.h imagenode.h xSortedImageList.h
OBJS=liveViz0.o liveViz.o liveVizPoll.o networkVar.o colorScale.o point.o image.o imagenode.o imagelist.o xSortedImageList.o
a32 3

point.o : point.C $(HEADDEP)
	$(CHARMC) -c point.C
@


1.8
log
@Bug fixes:
 - Don't depend on charmc being in path
 - Don't hardcode "-g"
 - Leave private headers in this directory
@
text
@d4 1
a4 1
HEADERS=liveViz.h liveViz.decl.h liveVizPoll.decl.h liveViz0.h colorScale.h 
@


1.7
log
@Changes to imageCombine implementation for liveViz.
@
text
@d4 3
a6 2
HEADERS=liveViz.h liveViz.decl.h liveVizPoll.decl.h liveViz0.h colorScale.h point.h image.h imagelist.h imagenode.h xSortedImageList.h
HEADDEP=$(HEADERS) liveViz.def.h networkVar.h
d35 1
a35 1
	charmc -c -g point.C
d38 1
a38 1
	charmc -c -g image.C
d41 1
a41 1
	charmc -c -g imagenode.C
d44 1
a44 1
	charmc -c -g imagelist.C
d47 2
a48 2
	charmc -c -g xSortedImageList.C
	
@


1.6
log
@Trying to find cvs bug.
@
text
@d2 1
a2 1
CHARMC=$(CDIR)/bin/charmc  $(OPTS)
d4 1
a4 1
HEADERS=liveViz.h liveViz.decl.h liveVizPoll.decl.h liveViz0.h colorScale.h
d6 1
a6 1
OBJS=liveViz0.o liveViz.o liveVizPoll.o networkVar.o colorScale.o
d33 15
@


1.5
log
@Minor source reorganization--moved internals into liveViz_impl.h,
and created a separate liveVizPoll.ci file.
@
text
@d2 1
a2 1
CHARMC=$(CDIR)/bin/charmc $(OPTS)
@


1.4
log
@This checkin has the modifications to turn orion's liveViz into a split
personality liveViz with both his original methods of running liveViz,
and the poll mode.

The code is messy and needs cleanup, but it is there and funcitonal. The
sample server (pollserver) has been developed and tested and checked in
as well.

This update does not contain anything more than the most basic polling mode,
none of the more advanced (so-called liveViz2, liveViz3) layers have been
implemented.
@
text
@d4 1
a4 1
HEADERS=liveViz.h liveViz.decl.h liveViz0.h colorScale.h
d35 3
@


1.3
log
@Moved image.h to charm/src/util/ckimage.h, and renamed its classes
for broad use.
@
text
@d4 1
a4 1
HEADERS=liveViz.h liveViz.decl.h liveViz0.h
d6 1
a6 1
OBJS=liveViz0.o liveViz.o networkVar.o
d24 3
d29 3
@


1.2
log
@Replaced old local vector3d with new ckvector3d.h versions.
@
text
@d5 1
a5 1
HEADDEP=$(HEADERS) liveViz.def.h networkVar.h image.h
@


1.1
log
@Initial development of library version of liveViz routines.

This code started life as the astro viewer, written in the
summer of 2001 to impress Tom Quinn et al. by Orion Lawlor and
Sanjay Kale.

In the spring of 2002, Sanjay Kale, Gunavardhan Kakulapati,
Ramkumar Vadali, and finally Orion Lawlor were variously
responsible for the code.
@
text
@d4 1
a4 1
HEADERS=liveViz.h liveViz.decl.h liveViz0.h vector3d.h
@

