# # ChangeLog for branches # # Generated by Trac 1.0.13 # Apr 23, 2024 11:48:09 PM Thu, 17 Jul 2014 01:45:59 GMT gah [4517] * branches/1.3/packages/vizservers/nanoscale/renderservers.tcl.in (modified) bad renderserver.tcl.in (can't use -output with old vtkvis) Wed, 16 Jul 2014 23:41:16 GMT gah [4516] * branches/1.3/gui/configure (modified) * branches/1.3/gui/configure.in (modified) update version number in configure.in Wed, 16 Jul 2014 23:40:32 GMT gah [4515] * branches/1.3/gui/src/Makefile.in (modified) * branches/1.3/gui/src/RapptureGUI_Init.c (modified) * branches/1.3/gui/src/RpDicomToVtk.cc (added) * branches/1.3/gui/src/RpDxToVtk.c (modified) * branches/1.3/gui/src/RpListbox.c (added) * branches/1.3/gui/src/RpSqueezer.c (added) add new utilities (squeezer, tweener), update RpDxToVtk.c, ... Wed, 16 Jul 2014 23:38:50 GMT gah [4514] * branches/1.3/lang/tcl/scripts/Makefile.in (modified) * branches/1.3/lang/tcl/scripts/exec.tcl (modified) * branches/1.3/lang/tcl/scripts/resources.tcl (added) * branches/1.3/lang/tcl/scripts/task.tcl (added) * branches/1.3/lang/tcl/scripts/xauth.tcl (added) tool execution split out from gui, oauth modules added. Wed, 16 Jul 2014 23:30:06 GMT gah [4513] * branches/1.3/gui/apps/Makefile.in (modified) * branches/1.3/gui/apps/launcher.tcl (modified) * branches/1.3/gui/apps/mapviewer-test (added) * branches/1.3/gui/apps/rappture-csh.env.in (modified) * branches/1.3/gui/apps/rappture.env.in (modified) * branches/1.3/gui/apps/rappture.in (modified) * branches/1.3/gui/apps/rappture.use.in (modified) remove vtkdir path (not needed for VTK 6+) Wed, 16 Jul 2014 23:24:32 GMT gah [4512] * branches/1.3/gui/scripts/Makefile.in (modified) * branches/1.3/gui/scripts/analyzer.tcl (modified) * branches/1.3/gui/scripts/bugreport.tcl (modified) * branches/1.3/gui/scripts/controls.tcl (modified) * branches/1.3/gui/scripts/coverflow.tcl (added) * branches/1.3/gui/scripts/field.tcl (modified) * branches/1.3/gui/scripts/filechoiceentry.tcl (added) * branches/1.3/gui/scripts/filelistentry.tcl (added) * branches/1.3/gui/scripts/map.tcl (added) * branches/1.3/gui/scripts/mapviewer.tcl (added) * branches/1.3/gui/scripts/mesh.tcl (modified) * branches/1.3/gui/scripts/resultviewer.tcl (modified) * branches/1.3/gui/scripts/tuples.tcl (modified) * branches/1.3/gui/scripts/tweener.tcl (added) * branches/1.3/gui/scripts/visviewer.tcl (modified) * branches/1.3/gui/scripts/vtkimageviewer.tcl (added) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) * branches/1.3/gui/scripts/vtkmeshviewer.tcl (modified) test and fixes for meshviewer, add rappture (non-viewer) bug fixes ... Wed, 16 Jul 2014 21:16:35 GMT gah [4511] * branches/1.3/gui/scripts/xyprint.tcl (modified) don't let bugs in print .rp_settings file error out Wed, 16 Jul 2014 21:11:08 GMT ldelgass [4510] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/CmdProc.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/CmdProc.h (modified) * branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp (modified) merge r4059 from trunk Wed, 16 Jul 2014 20:56:14 GMT gah [4508] * branches/1.3/packages/vizservers/nanoscale/renderservers.tcl.in (modified) don't use filedes 3 until vtkvis is updated Wed, 16 Jul 2014 20:54:18 GMT gah [4507] * branches/1.3/gui/scripts/vtkmeshviewer.tcl (modified) * branches/1.3/packages/vizservers/nanoscale/Makefile.in (modified) * branches/1.3/packages/vizservers/nanoscale/config.h.in (modified) * branches/1.3/packages/vizservers/nanoscale/renderservers.tcl.in (modified) * branches/1.3/packages/vizservers/nanoscale/server.c (modified) * branches/1.3/packages/vizservers/nanoscale/server2.c (deleted) update nanoscale from trunk, update meshviewer (needs tests in bat) Wed, 16 Jul 2014 19:21:36 GMT gah [4504] * branches/1.3/gui/scripts/Makefile.in (modified) * branches/1.3/gui/scripts/cloud.tcl (modified) * branches/1.3/gui/scripts/field.tcl (modified) * branches/1.3/gui/scripts/fieldresult.tcl (modified) * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) * branches/1.3/gui/scripts/transferfunctioneditor.tcl (added) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) merge transferfunctioneditor into nanovis, fix cloud with units Tue, 15 Jul 2014 01:36:23 GMT ldelgass [4501] * branches/1.3 (modified) * branches/1.3/Makefile.in (modified) * branches/1.3/configure (modified) * branches/1.3/configure.in (modified) * branches/1.3/lang/tcl/src/Makefile.in (modified) * branches/1.3/packages/vizservers/nanoscale/Makefile.in (modified) * branches/1.3/packages/vizservers/pymolproxy/Makefile.in (modified) * branches/1.3/packages/vizservers/vtkvis/Makefile.in (modified) * branches/1.3/src/core/Makefile.in (modified) merge r4364 from trunk Mon, 14 Jul 2014 17:06:37 GMT ldelgass [4500] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) use Field::blob to get dx data Mon, 14 Jul 2014 16:29:40 GMT ldelgass [4498] * branches/1.3 (modified) * branches/1.3/packages/vizservers/nanovis/Command.cpp (modified) * branches/1.3/packages/vizservers/pymolproxy/pymolproxy2.c (modified) * branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp (modified) merge r4367-4369 from trunk Mon, 14 Jul 2014 16:02:42 GMT ldelgass [4497] * branches/1.3 (modified) * branches/1.3/gui/scripts/unirect2d.tcl (modified) merge r4495 from trunk Mon, 14 Jul 2014 15:46:07 GMT ldelgass [4496] * branches/1.3 (modified) * branches/1.3/gui/scripts/visviewer.tcl (modified) merge r4492 from trunk Mon, 14 Jul 2014 05:12:30 GMT ldelgass [4494] * branches/1.3 (modified) * branches/1.3/gui/scripts/drawing.tcl (modified) * branches/1.3/gui/scripts/field.tcl (modified) * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) * branches/1.3/gui/scripts/unirect3d.tcl (modified) merge flow fixes from trunk Sun, 13 Jul 2014 22:23:47 GMT ldelgass [4491] * branches/1.3/gui/scripts/field.tcl (modified) Don't convert to VTK for flowvisviewer Sun, 13 Jul 2014 22:18:24 GMT ldelgass [4490] * branches/1.3 (modified) * branches/1.3/gui/scripts/field.tcl (modified) merge r4489 from trunk Sat, 12 Jul 2014 05:41:04 GMT ldelgass [4487] * branches/1.3 (modified) * branches/1.3/gui/scripts/vtksurfaceviewer.tcl (modified) merge r4381 from trunk Fri, 11 Jul 2014 17:04:36 GMT ldelgass [4486] * branches/1.3 (modified) * branches/1.3/gui/scripts/sequenceresult.tcl (modified) merge r4170 from trunk Fri, 11 Jul 2014 16:27:17 GMT ldelgass [4485] * branches/1.3/packages/vizservers/nanoscale/renderservers.tcl.in (modified) Remove entry for old (unthreaded) pymolproxy, don't log stdout/stderr ... Fri, 11 Jul 2014 15:49:33 GMT ldelgass [4484] * branches/1.3/packages/vizservers/nanoscale/renderservers.tcl.in (modified) Don't log stdout/stderr for nanovis/vtkvis Thu, 10 Jul 2014 20:16:33 GMT ldelgass [4483] * branches/1.3 (modified) update mergeinfo: r4356 Thu, 10 Jul 2014 15:52:59 GMT ldelgass [4482] * branches/1.3 (modified) * branches/1.3/gui/scripts/Makefile.in (modified) * branches/1.3/gui/scripts/contourresult.tcl (deleted) Merge r4178 from trunk (remove obsolete viewer) Thu, 10 Jul 2014 13:08:15 GMT ldelgass [4481] * branches/1.3 (modified) * branches/1.3/gui/scripts/Makefile.in (modified) * branches/1.3/gui/scripts/field2dresult.tcl (deleted) * branches/1.3/gui/scripts/field3dresult.tcl (deleted) * branches/1.3/gui/scripts/fieldresult.tcl (copied) * branches/1.3/gui/scripts/resultviewer.tcl (modified) * branches/1.3/gui/scripts/sequenceresult.tcl (modified) * branches/1.3/gui/scripts/vtkglyphviewer.tcl (modified) * branches/1.3/gui/scripts/vtksurfaceviewer.tcl (copied) Merge r4169,r4344 from trunk: merge field 2D/3D result, add VTK ... Thu, 10 Jul 2014 04:33:51 GMT ldelgass [4480] * branches/1.3 (modified) merge r4461 from trunk Thu, 10 Jul 2014 04:31:46 GMT ldelgass [4479] * branches/1.3 (modified) * branches/1.3/gui/scripts/visviewer.tcl (modified) merge r4448 from trunk Thu, 10 Jul 2014 04:19:28 GMT ldelgass [4478] * branches/1.3 (modified) * branches/1.3/gui/scripts/vtkviewer.tcl (modified) merge r4465 from trunk Thu, 10 Jul 2014 04:17:22 GMT ldelgass [4477] * branches/1.3 (modified) update mergeinfo Thu, 10 Jul 2014 04:15:52 GMT ldelgass [4476] * branches/1.3 (modified) update mergeinfo Thu, 10 Jul 2014 04:10:33 GMT ldelgass [4475] * branches/1.3 (modified) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) merge from trunk Thu, 10 Jul 2014 03:33:55 GMT ldelgass [4474] * branches/1.3 (modified) * branches/1.3/gui/scripts/Makefile.in (modified) * branches/1.3/gui/scripts/cloud.tcl (modified) * branches/1.3/gui/scripts/field.tcl (modified) * branches/1.3/gui/scripts/mesh.tcl (modified) * branches/1.3/gui/scripts/resultviewer.tcl (modified) * branches/1.3/gui/scripts/unirect2d.tcl (modified) * branches/1.3/gui/scripts/unirect3d.tcl (modified) * branches/1.3/gui/scripts/vtkmeshviewer.tcl (added) * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) Merge mesh/field fixes from trunk, add mesh viewer Thu, 10 Jul 2014 01:47:42 GMT ldelgass [4473] * branches/1.3 (modified) * branches/1.3/gui/scripts/field.tcl (modified) merge r4394 from trunk Thu, 10 Jul 2014 01:46:04 GMT ldelgass [4472] * branches/1.3 (modified) * branches/1.3/gui/scripts/mesh.tcl (modified) merge r4393 from trunk Thu, 10 Jul 2014 01:38:40 GMT ldelgass [4471] * branches/1.3 (modified) * branches/1.3/gui/scripts/field.tcl (modified) * branches/1.3/gui/scripts/mesh.tcl (modified) merge r4390 from trunk Wed, 09 Jul 2014 20:25:47 GMT ldelgass [4470] * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) remove debugging print Wed, 09 Jul 2014 20:17:35 GMT ldelgass [4469] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) Remove debugging prints Tue, 08 Jul 2014 17:11:13 GMT ldelgass [4467] * branches/1.3/packages/vizservers/Makefile.in (modified) * branches/1.3/packages/vizservers/configure (modified) * branches/1.3/packages/vizservers/configure.in (modified) * branches/1.3/packages/vizservers/nanovis/Makefile.in (modified) * branches/1.3/packages/vizservers/nanovis/cf (added) * branches/1.3/packages/vizservers/nanovis/cf/install-sh (added) * branches/1.3/packages/vizservers/nanovis/cf/mkinstalldirs (added) * branches/1.3/packages/vizservers/nanovis/configure (added) * branches/1.3/packages/vizservers/nanovis/configure.in (added) Separate configure for nanovis Thu, 03 Jul 2014 22:37:04 GMT ldelgass [4464] * branches/1.3/gui/scripts/vtkviewer.tcl (modified) Merge vtkviewer from trunk Thu, 03 Jul 2014 18:11:01 GMT ldelgass [4463] * branches/1.3/examples/app-fermi/perl/fermi.pl (modified) * branches/1.3/examples/app-fermi/python/fermi.py (modified) merge from trunk Thu, 03 Jul 2014 17:17:55 GMT ldelgass [4460] * branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl (modified) merge streamlines viewer from trunk Thu, 03 Jul 2014 16:56:50 GMT ldelgass [4459] * branches/1.3/gui/scripts/field.tcl (modified) merge mostly cosmetic changes from trunk Thu, 03 Jul 2014 16:11:15 GMT ldelgass [4458] * branches/1.3/gui/scripts/drawing.tcl (modified) Merge from trunk (drawing(3d)) Thu, 03 Jul 2014 05:31:19 GMT ldelgass [4457] * branches/1.3/gui/scripts/bugreport.tcl (modified) merge minor change from trunk Tue, 01 Jul 2014 19:53:37 GMT ldelgass [4455] * branches/1.3/gui/scripts/visviewer.tcl (modified) * branches/1.3/gui/scripts/vtkglyphviewer.tcl (modified) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) * branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl (modified) * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) Merge fix from r4454 from trunk Fri, 27 Jun 2014 11:01:29 GMT ldelgass [4450] * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) doesn't use default colormap entry (yet) Fri, 27 Jun 2014 10:56:49 GMT ldelgass [4449] * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) * branches/1.3/gui/scripts/vtkglyphviewer.tcl (modified) * branches/1.3/gui/scripts/vtkheightmapviewer.tcl (modified) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) * branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl (modified) * branches/1.3/gui/scripts/vtkviewer.tcl (modified) * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) Use GetColormapList method Fri, 27 Jun 2014 10:37:13 GMT ldelgass [4447] * branches/1.3/gui/scripts/visviewer.tcl (modified) whitespace Fri, 27 Jun 2014 10:25:53 GMT ldelgass [4446] * branches/1.3/gui/scripts/visviewer.tcl (modified) Add method to get list of colormaps Fri, 27 Jun 2014 07:24:30 GMT ldelgass [4443] * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) cleanups Thu, 26 Jun 2014 02:57:21 GMT ldelgass [4439] * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) * branches/1.3/gui/scripts/molvisviewer.tcl (modified) * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) * branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl (modified) * branches/1.3/gui/scripts/vtkviewer.tcl (modified) * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) Merge typo fix from trunk Thu, 26 Jun 2014 02:11:11 GMT ldelgass [4438] * branches/1.3/gui/scripts/vtkheightmapviewer.tcl (modified) Sync with trunk Thu, 26 Jun 2014 01:24:48 GMT ldelgass [4436] * branches/1.3/gui/scripts/vtkheightmapviewer.tcl (modified) Fix isolines setting Thu, 26 Jun 2014 01:20:32 GMT ldelgass [4435] * branches/1.3/gui/scripts/vtkheightmapviewer.tcl (modified) Fix axis grid settings names Wed, 25 Jun 2014 23:05:38 GMT gah [4433] * branches/1.3/packages/vizservers/nanoscale/renderservers.tcl.in (modified) added vmdshow server description Wed, 25 Jun 2014 21:44:46 GMT ldelgass [4432] * branches/1.3/gui/scripts/vtkheightmapviewer.tcl (modified) Fix heightmap viewer to match trunk and other viewers: ... Wed, 25 Jun 2014 21:28:42 GMT ldelgass [4431] * branches/1.3/gui/scripts/vtkglyphviewer.tcl (modified) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) Merge trunk fixes Wed, 25 Jun 2014 20:25:10 GMT ldelgass [4429] * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) Rename isosurfaceoutline setting to outline Wed, 25 Jun 2014 18:29:50 GMT gah [4428] * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) test for change in limits in isosurfaces Wed, 25 Jun 2014 17:32:46 GMT gah [4426] * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) first attempt to fix contour levels Mon, 23 Jun 2014 07:46:31 GMT ldelgass [4413] * branches/1.3 (modified) * branches/1.3/gui/apps/nanovis-test (modified) * branches/1.3/gui/apps/vtkglyphs-test (modified) * branches/1.3/gui/apps/vtkheightmap-test (modified) * branches/1.3/gui/apps/vtkisosurface-test (modified) * branches/1.3/gui/apps/vtkstreamlines-test (modified) * branches/1.3/gui/apps/vtkviewer-test (modified) * branches/1.3/gui/apps/vtkvolume-test (modified) Merge test app fixes from trunk Sun, 22 Jun 2014 00:58:05 GMT ldelgass [4412] * branches/1.3/gui/scripts/drawing.tcl (modified) * branches/1.3/gui/src/RpPdbToVtk.c (modified) Merge from trunk Sun, 22 Jun 2014 00:31:54 GMT ldelgass [4411] * branches/1.3/gui/scripts/animicon.tcl (modified) merge from trunk Sat, 21 Jun 2014 23:33:51 GMT ldelgass [4410] * branches/1.3/examples/zoo/drawing/tool.xml (modified) merge change from r4176 Sat, 21 Jun 2014 02:32:00 GMT ldelgass [4409] * branches/1.3 (modified) * branches/1.3/gui/scripts/drawingentry.tcl (modified) Merge fix for fill,outline options in drawing polygon comp from trunk Sat, 21 Jun 2014 02:29:52 GMT ldelgass [4408] * branches/1.3/gui/scripts/analyzer.tcl (modified) merge comment fix Sat, 21 Jun 2014 02:28:12 GMT ldelgass [4406] * branches/1.3/gui/scripts/drawingentry.tcl (modified) merge typo fix Sat, 21 Jun 2014 01:44:17 GMT ldelgass [4405] * branches/1.3/gui/scripts/textentry.tcl (modified) whitespace Thu, 19 Jun 2014 17:16:58 GMT gah [4399] * branches/1.3/builder/scripts/main.tcl (modified) * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) * branches/1.3/gui/scripts/vtkheightmapviewer.tcl (modified) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) fix builder path, update isosurfaceviewer Wed, 18 Jun 2014 19:05:03 GMT ldelgass [4397] * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) Fixes: don't toggle isosurface visible button when toggling outline. ... Tue, 17 Jun 2014 22:28:28 GMT gah [4392] * branches/1.3/gui/scripts/mesh.tcl (modified) fix for numpoints unstructured grid Tue, 17 Jun 2014 22:13:44 GMT gah [4391] * branches/1.3/gui/scripts/visviewer.tcl (modified) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) fix for extra outlines, cutplanes Mon, 16 Jun 2014 17:42:46 GMT gah [4387] * branches/1.3/gui/scripts/field.tcl (modified) add check for number of field points Tue, 20 May 2014 02:43:39 GMT mmc [4357] * branches/1.3/lang/tcl/scripts/objects/curve/curve.rp (modified) Backport of fix from trunk: Fix for the problem with curve objects in ... Tue, 29 Apr 2014 16:28:09 GMT gah [4351] * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) bug fix: -isosurfacevisible sets all surfaces to visible Tue, 22 Apr 2014 20:37:28 GMT gah [4348] * branches/r9 (copied) Tue, 22 Apr 2014 20:37:13 GMT gah [4347] * branches/newbuildscripts (deleted) Wed, 16 Apr 2014 16:20:31 GMT ldelgass [4341] * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) Fix isoline color setting Wed, 16 Apr 2014 16:17:09 GMT ldelgass [4340] * branches/1.3/gui/scripts/vtkglyphviewer.tcl (modified) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) Fix: glyph viewer shouldn't have cutplane button (not isosurface viewer) Wed, 16 Apr 2014 16:12:59 GMT ldelgass [4339] * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) Fix background setting in isosurface viewer Thu, 10 Apr 2014 00:58:55 GMT ldelgass [4335] * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) Disable debug prints Fri, 28 Mar 2014 18:01:07 GMT gah [4289] * branches/1.3/gui/scripts/textentry.tcl (modified) fix: binary file wrong because layout changes when widgets are destroyed Mon, 24 Mar 2014 06:34:53 GMT ldelgass [4260] * branches/1.3/gui/scripts/visviewer.tcl (modified) Remove duplicate entry Fri, 21 Mar 2014 20:20:24 GMT gah [4258] * branches/1.3/gui/scripts/visviewer.tcl (modified) add vmdmds server slot to visviewer Thu, 20 Mar 2014 19:48:32 GMT ldelgass [4254] * branches/1.3/gui/scripts/resultviewer.tcl (modified) Fix for nanohub automatic ticket #266395 Thu, 20 Mar 2014 19:01:10 GMT ldelgass [4253] * branches/1.3/gui/scripts/visviewer.tcl (modified) Add default render server ports for geovis,vmdmds Tue, 11 Mar 2014 18:38:22 GMT ldelgass [4239] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/Makefile.in (modified) * branches/1.3/packages/vizservers/vtkvis/RenderServer.h (modified) * branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/protocol.txt (modified) merge r4040 from trunk. Brings vtkvis up to date with installed version Tue, 11 Mar 2014 18:36:03 GMT ldelgass [4238] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/GraphicsObject.h (modified) * branches/1.3/packages/vizservers/vtkvis/HeightMap.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Makefile.in (modified) * branches/1.3/packages/vizservers/vtkvis/protocol.txt (modified) merge r4037 from trunk Tue, 11 Mar 2014 18:32:58 GMT ldelgass [4237] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/LIC.cpp (modified) merge r3999 from trunk Tue, 11 Mar 2014 18:31:16 GMT ldelgass [4236] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/Image.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Image.h (modified) * branches/1.3/packages/vizservers/vtkvis/Makefile.in (modified) * branches/1.3/packages/vizservers/vtkvis/PPMWriter.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/RenderServer.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Renderer.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Renderer.h (modified) * branches/1.3/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/TGAWriter.cpp (modified) merge r3991:3995 from trunk Tue, 11 Mar 2014 18:26:32 GMT ldelgass [4235] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/GraphicsObject.h (modified) merge r3977 from trunk Tue, 11 Mar 2014 18:24:01 GMT ldelgass [4234] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/ColorMap.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/ColorMap.h (modified) * branches/1.3/packages/vizservers/vtkvis/Image.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Image.h (modified) * branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Volume.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/protocol.txt (modified) merge r3978:3983 from trunk Tue, 11 Mar 2014 18:20:16 GMT ldelgass [4233] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/ColorMap.cpp (modified) merge r3976 from trunk Tue, 11 Mar 2014 18:19:29 GMT ldelgass [4232] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/Makefile.in (modified) merge r3973 from trunk Tue, 11 Mar 2014 18:15:06 GMT ldelgass [4231] * branches/1.3 (modified) * branches/1.3/packages/vizservers/vtkvis/DataSet.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Image.h (modified) * branches/1.3/packages/vizservers/vtkvis/Renderer.h (modified) * branches/1.3/packages/vizservers/vtkvis/RendererCmd.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Volume.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/Volume.h (modified) * branches/1.3/packages/vizservers/vtkvis/protocol.txt (modified) merge r3961:3962 Tue, 11 Mar 2014 17:25:52 GMT ldelgass [4230] * branches/1.3 (modified) update mergeinfo: r4213 merged Tue, 11 Mar 2014 17:24:45 GMT ldelgass [4229] * branches/1.3 (modified) update mergeinfo: r4214 merged Tue, 11 Mar 2014 17:09:34 GMT ldelgass [4228] * branches/1.3 (modified) * branches/1.3/examples/flow/demo3/data-values.tcl (modified) * branches/1.3/examples/flow/flowtest.tcl (modified) merge r3942 from trunk Tue, 11 Mar 2014 17:05:06 GMT ldelgass [4227] * branches/1.3 (modified) * branches/1.3/examples/flow/flowtest.tcl (modified) merge r3938 from trunk