/trunk/src Developers: mdavis

Activity by Clock Time

Activity in Directories

Most Recent Commits

mdavis 2005-12-22 19:42 Rev.: 32920

Pass mouse locaiton and state to enter/leave events

0 lines of code changed in 2 files:

• Dataflow/GUI: Painter.tcl (new)

mdavis 2005-12-22 13:03 Rev.: 32917

Don't copy 2D nrrd when converting to 3D.

Rewrite draw_slice_lines to handle more than 3 windows.

Fix slicing on other volumes when probing outside their boundaries.

Fix mouse button being pressed crash when user drags outside window.

Remove harware mouse cursor when in GL window.

0 lines of code changed in 2 files:

• Dataflow/Modules/Render: Painter.cc (new)

mdavis 2005-12-21 16:08 Rev.: 32911

SCIRun->Render->Painter module changes:

Added SliceWindow::render_grid(). Renders a grid under the volumes. Resizes grid spacing depending on level of zoom.

Add ability to handle 2D nrrds as input module. Assumes 2D nrrds range from [0,1] in Z.

Moved Painter::create_volume functionality into NrrdVolume copy constructor.

Mouse Zoom tool now zooms smoothly across all scales.

Revise todo list.

295 lines of code changed in 5 files:

• Dataflow/Modules/Render: Painter.cc (+270 -62), Painter.h (new), PainterTools.cc (+17 -1)

mdavis 2005-12-21 14:50 Rev.: 32907

Check for null input NrrdData

5 lines of code changed in 1 file:

• Packages/Insight/Dataflow/Modules/Converters: NrrdToImage.cc (+5)

mdavis 2005-12-21 14:49 Rev.: 32906

Added ThresholdSegmentationLevelSetImageFilter::check_for_waiting_input method. Checks port mailbox for input data when in send_intermediate mode. Stops looping network from blocking from sending too much data to this module

36 lines of code changed in 1 file:

• Packages/Insight/Dataflow/Modules/Filters: ThresholdSegmentationLevelSetImageFilter.cc (+36 -7)

mdavis 2005-12-21 14:44 Rev.: 32905

Remove dead code from Painter, removed printf from LindedPane

3 lines of code changed in 3 files:

• Dataflow/GUI: Linkedpane.tcl (new), Painter.tcl (+3 -179)

mdavis 2005-12-21 14:43 Rev.: 32904

Add ability to initalize GuiVar with null context, added GuiVar::set_context to allow later setting of context. Added checks for null GuiContext before setting/getting value. Added GuiContext * GuiContext::get_parent() method to allow creation of sibling GuiContexts, such as in copy constructors.

0 lines of code changed in 6 files:

• Core/GuiInterface: GuiContext.h (new), GuiVar.cc (new), GuiVar.h (new)

mdavis 2005-12-21 14:38 Rev.: 32903

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:

• Core/Geom: ColorMappedNrrdTextureObj.cc (changed), FreeTypeTextTexture.cc (new)

mdavis 2005-12-16 17:34 Rev.: 32885

Added 'Filter Data' bundle port to support filter tool support in a dataflow loop

0 lines of code changed in 2 files:

• Dataflow/XML: Painter.xml (changed)

mdavis 2005-12-16 17:33 Rev.: 32884

Initial suport for ITK Threshold Segmentation Level Set filter.

Added first port to be non-dynamic port that only gets filtered output data when painter is in a filter mode. Painter enters filter mode when tool sets filter_ variable and executes module.

Add scheduler callback to turn off filter mode when network finishes execution

Autoview on execute. Needs more logic to not autoview when volumes dont change.

Fix volume trasnform when spacing not present, calculate spacing from min/max values of axis.

Added Painter::StatisticsTool (keyboard "j" to activate) to display numerical values Mean and Standard deviation of user selected voxel list. Automatically rescales Colormap Lookup Table to display window level equal to mean and window width equal to two times standard deviation. Useful for bringing out contrast in low contrast areas by mouse clicking and dragging over areas.

Added ITKThresholdTool (keyboard "h" to activate) to paint seed values for threshold filter and cause execute. Must have supporting downstream modules to actually perform the filter operations.

Minor update to Painter todo list

382 lines of code changed in 3 files:

• Dataflow/Modules/Render: Painter.cc (+179 -43), Painter.h (+41 -5), PainterTools.cc (+162 -1)

mdavis 2005-12-13 11:11 Rev.: 32826

Fix compile

1 lines of code changed in 1 file:

• Packages/Insight/Dataflow/Modules/Filters: ThresholdSegmentationLevelSetImageFilter.cc (+1 -1)

mdavis 2005-12-13 10:19 Rev.: 32825

Undo acciental checkin

0 lines of code changed in 2 files:

• Dataflow/GUI: ComponentWizard.tcl (changed)

mdavis 2005-12-13 10:16 Rev.: 32824

Move Linkedpane to seperate file

96 lines of code changed in 5 files:

• Dataflow/GUI: ComponentWizard.tcl (+16 -11), Linkedpane.tcl (+79), ViewSlices.tcl (new), sub.mk (+1)

mdavis 2005-12-12 20:19 Rev.: 32821

Fix probe and slice number display for volumes that dont start at origin. Remove printf. Mark a few todos done

3 lines of code changed in 1 file:

• Dataflow/Modules/Render: Painter.cc (+3 -5)

mdavis 2005-12-12 19:46 Rev.: 32820

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

196 lines of code changed in 11 files:

• Core/Geom: FreeType.cc (+1 -1), FreeTypeTextTexture.cc (+46 -14), FreeTypeTextTexture.h (new), NrrdTextureObj.cc (+45 -312), NrrdTextureObj.h (+5 -26)
• Dataflow/Modules/Render: Painter.cc (+93 -188), Painter.h (+3 -7)

mdavis 2005-12-12 10:54 Rev.: 32801

Remove dead code (Includes mip, gradient mask, geometry for viewer, colormap2, and old paint code).

12 lines of code changed in 2 files:

• Dataflow/Modules/Render: Painter.cc (+9 -375), Painter.h (+3 -56)

mdavis 2005-12-10 16:58 Rev.: 32796

Persistent colormap and opacity for volumes so everything doesnt reset when re-executing module.

Added constructor to NrrdVolume, calls NrrdVolume::set_nrrd which handles naming and Color lookup table and data range calculation previously in Painter::execute.

Added NrrdVolume::vector_to_index, calculates world space vector span in index space.

Added SliceWindow::x_dir and SliceWindow::y_dir methods to return world space vectors of screen space x and y directions.

Code cleanup of Painter::execute method, still needs to handle sending data.

Add todo list to comments.

132 lines of code changed in 2 files:

• Dataflow/Modules/Render: Painter.cc (+123 -85), Painter.h (+9 -3)

mdavis 2005-12-10 14:13 Rev.: 32795

Remove dead code (NRRD_EXEC)

Remove SliceWindow x_ and y_ pan offsets and collapse into center_ variable.

Rewrite PanTool to use SliceWindow::center_ instead of x_, and y_

Move Painter::world_to_screen and Painter::screen_to_world into SliceWindow::world_to_screen and SliceWindow::screen_to_world

Move Painter::zoom_in and Painter::zoom_out into SliceWindow::zoom_in and SliceWindow::zoom_out

70 lines of code changed in 3 files:

• Dataflow/Modules/Render: Painter.cc (+46 -77), Painter.h (+5 -10), PainterTools.cc (+19 -19)

mdavis 2005-12-10 13:19 Rev.: 32794

Remove Painter::get_value and Painter::set_value methods. Replaced by templated nrrd_set_value and nrrd_get_value.

Rewrite FloodfillTool to use proper indexing and respect volume boundaries, removes infinte loop. Added code comments to FloodfillTool.

84 lines of code changed in 3 files:

• Dataflow/Modules/Render: Painter.cc (+4 -136), Painter.h (+34 -22), PainterTools.cc (+46 -28)

mdavis 2005-12-09 22:04 Rev.: 32793

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.

647 lines of code changed in 8 files:

• Core/Geom: ColorMappedNrrdTextureObj.cc (+121 -78), ColorMappedNrrdTextureObj.h (new)
• Core/Math: MiscMath.h (new)
• Dataflow/Modules/Render: Painter.cc (+282 -315), Painter.h (+162 -16), PainterTools.cc (+72 -50)

(132 more)