Lines of Code
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| Totals | 306 (100.0%) | 13194 (100.0%) | 43.1 |
| callahan | 80 (26.1%) | 8785 (66.6%) | 109.8 |
| mdavis | 69 (22.5%) | 3080 (23.3%) | 44.6 |
| wmartin | 7 (2.3%) | 752 (5.7%) | 107.4 |
| worthen | 115 (37.6%) | 311 (2.4%) | 2.7 |
| mjc | 19 (6.2%) | 184 (1.4%) | 9.6 |
| kuzimmer | 6 (2.0%) | 48 (0.4%) | 8.0 |
| jas | 2 (0.7%) | 20 (0.2%) | 10.0 |
| bigler | 3 (1.0%) | 9 (0.1%) | 3.0 |
| hartner | 1 (0.3%) | 4 (0.0%) | 4.0 |
| dav | 3 (1.0%) | 1 (0.0%) | 0.3 |
| sparker | 1 (0.3%) | 0 (0.0%) | 0.0 |
Fix FreeTypeTextTexture bounding box to correctly render text without cropping. Fixed Colormap to handle when colormap range == 0 and causes Nan crash. Changed default colormap to have transparent black for first color
0 lines of code changed in 4 files:
removed pre_draw and post_draw from the GeomEllipsoid::draw routine. These are handled appropriately in GeomSphere::draw which is called by GeomEllipsoid::draw. Furthermore the nested pre_draws were causing picking to fail by returning bogus addresses for the picked objects. Picking will now work for ellipsoids that are members of a GeomPick.
0 lines of code changed in 2 files:
Dataflow/Modules/Render/Painter.cc
Dataflow/Modules/Render/Painter.h
-Factor out code from Painter module into FreeTypeTextTextue.
-Fix precision of mouse coordinates in Painter window text
-Removed all draw_labels code
Core/Geom/FreeTypeTextTexture.cc
Core/Geom/FreeTypeTextTexture.h
-Simplify code to render in 2D at pixel coordinates.
Core/Geom/NrrdTextureObj.cc
Core/Geom/NrrdTextureObj.h
-Simplify code to only handle textures for FreeTypeTextTexture for now.
-Don't rescale, pad data instead
Core/Geom/FreeType.cc
-Increase max size of bounding box by one to not clip rendered text
100 lines of code changed in 9 files:
post_draw was not called in GeomEllipsoid, this caused the glNameStack to overflow when trying to use picking on large sets of ellipsoids
1 lines of code changed in 1 file:
Dataflow/Modules/Render/Painter.cc
Dataflow/Modules/Render/Painter.h:
- *Major rewrite* to allow arbitrary number of nrrds with different resolutions ans spacing. Navigates through space instead of slices. Allows viewing overlapping volumes acquired at different resolutions (such as PET vs CT).
- Render volumes at true position in space and scale instead of always at origin.
- Chaged text to display spatial mouse position in XYZ coordinates, and current volume slice coordinates as Saggital, Axial, Coronal indices. Only display slice coordinates when mouse is over volume.
- Added methods to transform between index space and world space (and vice versa): NrrdVolume:index_to_world(vector<int> &), and NrrdVolume::world_to_slice(Point &). Other conveince methods for center, min, max of NrrdVolume.
- Remove error checking for nrrds of non matching dimensions/scale.
- Added templated NrrdVolume::get/set_value method to Painter.h to allow for slightly more optimized painting code.
Dataflow/Modules/Render/PainterTools.cc:
- Updated Crop, Floodfill, & PixelPaint Tools to handle new volumes that reside anywhere in space (not necessarily at origin)
Core/Geom/ColorMappedNrrdTextureObj.h
Core/Geom/ColorMappedNrrdTextureObj.cc:
- Updated code to remove NrrdPad and instead use clever OpenGL pixel transfer offsets to load non-power-of-2 textures and overlapping textures. Code support for adding tiled textures in future for textures larger than card supports.
130 lines of code changed in 3 files:
Fix memory leak in freetype renderig causing applicaiton memory footprint to grow when mousing over Painter or ViewSlices GUIs
26 lines of code changed in 1 file:
Fix texturing when OpenGL does not support non-power-of-2 textures
26 lines of code changed in 2 files:
Add ColorMappedNrrdTextureObj
0 lines of code changed in 2 files:
Add FloodFill and Pixel Paint tools to Painter Module. Make painter module render opacity from colormaps correctly. Added class Core/Geom/ColorMappedNrrdTextureObj to encapsulate applying a colormap to a slice of a 3d nrrd. This is necessary because OpenGL does not transform alpha in color matrix, so the color lookup table had to be moved from gl to software. Added value display to text labels. Fixed orientation bug in painter. Made four view default in Painter module
418 lines of code changed in 2 files:
Use NrrdData Nrrd constructor, clean up all the nrrdNew() memory leaks associated with old usage.
6 lines of code changed in 2 files:
ReFactor Painter tools into seperate virtual classes that inherit from Painter::PainterTool to allow rapid development of future tools. Move Color Lookup Table functionality into OpenGL
207 lines of code changed in 2 files:
Add Teem lib to fix OSX build
2 lines of code changed in 1 file:
Initial commit of NrrdTextureObj, and FreeTypeTextTexture classes. NrrdTextureObj just handles the binding of a 2D texture to the GL context. FreeTypeTextTexture renders a TrueType font to a NrrdTextureObj and provides calls to render to GL quads.
617 lines of code changed in 5 files:
Move GeomViewerItem class from Dataflow/Modules/Render/ViewGeom.h to Core/Geom/GeomViewerItem.h
274 lines of code changed in 3 files:
Cosmetic code cleanup of DrawInfoOpenGL. Make all class member variable names end with an underscore ('_') to follow coding convetion. Removed GL header includes from DrawInfoOpenGL.h -- which forced adding GL includes to Core/Volume .cc files.
398 lines of code changed in 5 files:
-Cut out DrawInfoOpenGL from Core/Geom/GeomOpenGL.cc into Core/Geom/GeomOpenGL.cc.
-Rename Core/Geom/GeomOpenGL.h to Core/Geom/DrawInfoOpenGL.h
-Fix #include statments for files that included Core/Geom/GeomOpenGL.h -- some files didn't need this include at all, just the sci_gl* includes.
-Add Plane::get(double[4]) method to return values how OpenGL wants them for clipping planes
-General cleanup and removed a few unused variables in DrawInfoOpenGL struct
-Moved ViewWindow:: symbols out of Dataflow/Modules/Render/OpenGL and into Dataflow/Modules/Render/ViewWindow.cc (where they belong)
-Hopefully this will provide some initial incentive to improve our GL state handling ablities
654 lines of code changed in 17 files:
Get Windows Port back where we left off.
Core/Basis changes are to get symbols exported properly.
Core/Volume and ShaderProgramARB changes are temporary ifdefs of things that won't compile (GL extensions) or won't work
Everything else is to put it back the way it was (TCLInterface::exec and eval, OpenGL.cc, and Timer.cc).
4 lines of code changed in 2 files:
Increase ambient scale term for TexSquare so ViewSlices cutting planes dont render as black when not facing the light source in BioIMage
7 lines of code changed in 1 file:
Remove loop to calculate const data.
20 lines of code changed in 1 file:
initial commit of H_O_Basis branch merge
54 lines of code changed in 4 files:
(46 more)