Lines of Code
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| Totals | 537 (100.0%) | 9591 (100.0%) | 17.8 |
| mjc | 447 (83.2%) | 5657 (59.0%) | 12.6 |
| callahan | 46 (8.6%) | 2242 (23.4%) | 48.7 |
| jeroen | 21 (3.9%) | 905 (9.4%) | 43.0 |
| mdavis | 13 (2.4%) | 377 (3.9%) | 29.0 |
| allen | 8 (1.5%) | 278 (2.9%) | 34.7 |
| jfsheph | 1 (0.2%) | 69 (0.7%) | 69.0 |
| darbyb | 1 (0.2%) | 63 (0.7%) | 63.0 |
added ToPointCloud and removed from Unstructure
83 lines of code changed in 3 files:
Added 'Filter Data' bundle port to support filter tool support in a dataflow loop
0 lines of code changed in 2 files:
completely revert commit 32690, as it broke all of Uintah
2872 lines of code changed in 283 files:
removal of xerces, replaced with libxml2, turn on validaton for component loading, fix all invalid xml
2263 lines of code changed in 143 files:
Change input and output ports to Bundle to allow arbitrary numbers of inputs/outputs and their datatypes
5 lines of code changed in 1 file:
Initial commit of SCIRun->Render->Painter module for painting segmentaion seeds. Just a copy of ViewSlices module, no functionalty changed at this point.
144 lines of code changed in 1 file:
added port that outputs filename plus extension
4 lines of code changed in 1 file:
Merge NCMIR branch into trunk. New modules SliceReader (reads in Analyze files a slice at a time), SeedPoints, and BuildSeedVolume. Removed ThresholdSegmentationLevelSetImageFilter generating files and replaced with permanant files to allow for stopping the segmentation. LevelSetSegmenter app now built when Insight package is enabled although it currently crashes and I think the crash is related to bug 2805.
63 lines of code changed in 1 file:
New Feature - Multiple 2D transfer functions per volume via user selected clipping planes.
At the network level, this makes the SCIRun->Visualization->VolumeVisualizer 2D colormap input port a dynamic input port. The first 2d colormap input behaves as before and thus backwards funcitonality is the same.
Any subsequent 2D colormaps input to the VolumeVisualizer will create an arrow widget in the viewer. This widget specifies where the new transfer funciton will be applied to the volume. The arrow points in the direction where the transfer function is not applied, allowing the user to more easily pick the direction of the clipping plane while not being occluded by the volume. But if the widget is occluded by the volume, it still shows as a lightly stippled widget that the user can still manipulate.
Files changed and a brief description:
A Core/Geom/GeomStippleOccluded.cc
A Core/Geom/GeomStippleOccluded.h
M Core/Geom/sub.mk
M Core/Geom/GeomSwitch.h
M Core/Geom/GeomOpenGL.cc
---> Added GeomStippleOccluded container that inherits from GeomSwitch. All children look normal, until they are occluded by another object, then they are drawn with a stipple pattern to allow them to be seen behind other objects. Gives a nice transparency look without the computation expense. Very useful for widgets.
M Core/Volume/VolumeRenderer.cc
M Core/Volume/VolumeRenderer.h
---> Added parameter to VolumeRenderer constructor to take in an array of clipping planes that determine where the 2D colormaps are applied. Added support for computing multple transfer functions regions with call to TextureBrick::mask_polygons. Other minor Code Cleanup.
M Core/Volume/TextureBrick.cc
M Core/Volume/TextureBrick.h
---> Rewrite for code clarity. Major addition of mask_polygons method, which takes in a vector of clipping Planes, slices the polygons into clipped and non-clipped regions, and returns their resultant bitmasks. Remove min/max of t parameter calculation that was causing re-slicing of volume at different planes for each different zoom level.
M Core/Volume/SliceRenderer.h
M Core/Volume/SliceRenderer.cc
---> Minor code to support the vector of colormap2's being passed down
M Core/Volume/TextureRenderer.h
M Core/Volume/TextureRenderer.cc
---> Code factoring to seperate long blocks of code in build_colormap2. Added code for rendering multiple colormap2s into one texture to support the multiple transfer functions that can be applied to a volume. Set bitmask for which colormaps to apply to a polygon via shader parameter to draw_polygons. Got rid of extraneous use_pbuffer_ boolean. Other minor code cleanup.
M Core/Volume/VolShader.h
M Core/Volume/VolShader.cc
---> Added shader to render using multiple transfer functions via a bitmask. Trickery by using a floating point parameter as a boolean bit mask.
M Core/Geometry/Plane.cc
M Core/Geometry/Plane.h
---> Added Plane::ChangePlane(Point,Vector) for linking w/ ArrowWidget. Added Plane::Intersect(Point, Vector, t) to get the parametric parameter where a ray hits the plane, used in TextureBrick::mask_polygons.
M Dataflow/XML/VolumeVisualizer.xml
---> Made last ColorMap2D port dynamic to support multiple transfer functions.
M Dataflow/GUI/VolumeVisualizer.tcl
---> Added checkbutton to turn off transfer function clipping plane arrow widgets.
M Dataflow/Widgets/ArrowWidget.cc
M Dataflow/Widgets/ArrowWidget.h
M Dataflow/Widgets/BaseWidget.cc
M Dataflow/Widgets/BaseWidget.h
---> Added boolean parameter to constructor to specify if ArrowWidget is rendered with a stipple pattern when occluded. Useful when arrow widget is inside the volume.
M Dataflow/Modules/Visualization/VolumeSlicer.cc
---> Send Colormap2 as vector to SliceRenderer.
M Dataflow/Modules/Visualization/VolumeVisualizer.cc
---> Create an arrow widget for each extra ColorMap2, so user can specify half-plaen where transfer function is applied to volume. Code for multiple transfer funcitons.
-McKay Davis
1 lines of code changed in 1 file:
added new module for setting properties
84 lines of code changed in 1 file:
allowed point cloud option - although this can be done in gatherfields it is not obvious
2 lines of code changed in 1 file:
Major rewrite of the two different texture builders and associated
files to now use:
-dynamic compiling
-type descriptions
-vector interface for min/max
-allow for different fields/nrrds
-fixed state bugs
2 lines of code changed in 1 file:
Add ability to have 1D colormaps in EditColorMap2D
5 lines of code changed in 1 file:
Changed name of module to make it more userfriendly
68 lines of code changed in 2 files:
Update for the Bundle modules (simplification of module code), (2) Addition of module to create a dense matrix directly from the GUI, (3) Some modules to do some basic string manipulations, creation, merging, sprintf, filenametostring (4) New module to display string in viewer ShowString (Multiple line option, arbritary amount of lines, so more information can be stored in the title then time and unit alone)
833 lines of code changed in 18 files:
Add MaskVector output to ClipByFunciton
5 lines of code changed in 1 file:
Add MaskVector output port to ClipLattice
4 lines of code changed in 1 file:
Initial commit of mask vector code
78 lines of code changed in 2 files:
Better ClipField and ClipByFunction documentation, bug #2678 (from branch)
17 lines of code changed in 2 files:
CubitInterface now reads back TetVolMeshes correctly from Cubit. Added path to ncdump in GUI. Fix output port type. Added error checking and cleanup of temporary files.
1 lines of code changed in 1 file:
(11 more)