Mark Longair [Tue, 22 Sep 2009 17:50:48 +0000 (22 18:50 +0100)]
An (as yet largely untested) patch to let TrakEM2 build with openjdk
Changes include:
- Removing the special case for reading grayscale images - if this
takes too much memory in ImageIO it's a bad bug in that system.
- Remove some commented out methods that refer to old code and
special cases.
- openStream() can't throw Exception, so remove that throws clause.
- rename openJpeg2() to openJpegFromStream()
The test method testDebugAlpha() suggests that writing JPEGs with
an alpha channel doesn't work under my version of OpenJDK. (See
comments on Bug 53.)
Albert Cardona [Thu, 24 Sep 2009 13:49:33 +0000 (24 15:49 +0200)]
IJError now trys to call getCause recursively on the given error.
Albert Cardona [Thu, 24 Sep 2009 13:47:46 +0000 (24 15:47 +0200)]
Attempted to show popup dialog of tools within Display: can't do it directly.
Albert Cardona [Thu, 24 Sep 2009 10:06:23 +0000 (24 12:06 +0200)]
Merge branch 'master' of git+ssh://leafwd@repo.or.cz/srv/git/trakem2
Albert Cardona [Thu, 24 Sep 2009 10:06:12 +0000 (24 12:06 +0200)]
Fixed lasso blow tool, or, worked around an error in HashMap
when the value of a key/value pair changes internally,
which results in the old value (??) being retrieved instead.
Also constrained blow tool within limits of the box.
Stephan Saalfeld [Thu, 24 Sep 2009 09:00:15 +0000 (24 11:00 +0200)]
Merge branch 'master' of ssh://repo.or.cz/srv/git/trakem2
Albert Cardona [Thu, 24 Sep 2009 08:25:47 +0000 (24 10:25 +0200)]
Added a fix for Windows machines for the fast-marching tool box repaint.
Albert Cardona [Thu, 24 Sep 2009 08:11:22 +0000 (24 10:11 +0200)]
Removed debugging message.
Albert Cardona [Thu, 24 Sep 2009 08:02:17 +0000 (24 10:02 +0200)]
Merge branch 'master' of git+ssh://leafwd@repo.or.cz/srv/git/trakem2
Albert Cardona [Thu, 24 Sep 2009 08:01:49 +0000 (24 10:01 +0200)]
Added layer composites on LayerPanel right-click menu.
Some fixes to repainting on "Reset all layer <colors|alphas|composites>"
Albert Cardona [Wed, 23 Sep 2009 18:46:45 +0000 (23 20:46 +0200)]
Readded removal of DNDTree drag gesture listener.
Needs testing: in the past, doing so used to throw an IllegalArgumentException
Albert Cardona [Wed, 23 Sep 2009 18:45:58 +0000 (23 20:45 +0200)]
Cleaned up DNDTree cell renderer, split into proper subclasses.
Albert Cardona [Wed, 23 Sep 2009 17:27:32 +0000 (23 19:27 +0200)]
Ensure graceful fallback of Patch.paint when setComposite fails.
Albert Cardona [Wed, 23 Sep 2009 17:27:07 +0000 (23 19:27 +0200)]
Ensure ImageData is also a Paintable
Albert Cardona [Wed, 23 Sep 2009 17:18:28 +0000 (23 19:18 +0200)]
Defaulting import stack to "One slice per layer (Patches)"
Albert Cardona [Wed, 23 Sep 2009 17:09:04 +0000 (23 19:09 +0200)]
NonLinearTransformMode now supports composites for Patch.
Also fixed improper ordering of patches, since they were
grabbed from the selection without proper within-layer stack index
ordering.
Stephan Saalfeld [Wed, 23 Sep 2009 13:26:02 +0000 (23 15:26 +0200)]
Saving a lot of RAM in visualizing the lens distortion model
Albert Cardona [Wed, 23 Sep 2009 13:20:07 +0000 (23 15:20 +0200)]
Added blow tool for arealist.
Ignacio Arganda [Wed, 23 Sep 2009 09:26:19 +0000 (23 11:26 +0200)]
Added model to be used in Register Virtual Stack.
Ignacio Arganda [Wed, 23 Sep 2009 09:25:42 +0000 (23 11:25 +0200)]
Added set methods.
Albert Cardona [Tue, 22 Sep 2009 03:57:44 +0000 (22 05:57 +0200)]
Fixed lack of proper undo for fast-marching
(was jumping two steps)
Albert Cardona [Sun, 20 Sep 2009 09:22:28 +0000 (20 11:22 +0200)]
Improved semiautomatic segmentation by fast-marching.
* Works constrained to box, seen as XOR color and resizable with shift+wheel
* Scans coordinate in lines for better speed inconstructing the Area object.
Albert Cardona [Sat, 19 Sep 2009 19:29:43 +0000 (19 21:29 +0200)]
Added test_distortioncorrection_trakem2.js by Stephan Saalfeld.
Albert Cardona [Fri, 18 Sep 2009 19:03:26 +0000 (18 21:03 +0200)]
Commented out debug messages from Stack
Albert Cardona [Fri, 18 Sep 2009 16:48:14 +0000 (18 18:48 +0200)]
DisplayablePanel mousePressed event for the icons is executed now in
its Display's dispatcher.
Albert Cardona [Fri, 18 Sep 2009 16:35:55 +0000 (18 18:35 +0200)]
DisplayablePanel will use exclusively Displayable.isLocked2(), i.e. the locked boolean directly
to avoid querying the entire linking group.
Albert Cardona [Fri, 18 Sep 2009 16:35:11 +0000 (18 18:35 +0200)]
Fixed bug in Selection.setLocked: was toggling the LINK icon, not the LOCK icon.
Albert Cardona [Fri, 18 Sep 2009 16:34:42 +0000 (18 18:34 +0200)]
Displayable.setLocked will ALTER the locked boolean of each linked Displayable.
Displayables other than text label and profile now respect properly
the user's choice of not linking patches automatically--implemented at the
GUI Display.select, not at Displayable.linkPatches.
Albert Cardona [Fri, 18 Sep 2009 15:28:19 +0000 (18 17:28 +0200)]
Debugging msg.
Albert Cardona [Fri, 18 Sep 2009 15:12:35 +0000 (18 17:12 +0200)]
More agressive update of tabs after changing their panels.
Albert Cardona [Fri, 18 Sep 2009 11:54:55 +0000 (18 13:54 +0200)]
Simplified Display.openLater a bit.
Albert Cardona [Fri, 18 Sep 2009 11:43:58 +0000 (18 13:43 +0200)]
Redesigned Dispatcher to use an ExecutorService.
Albert Cardona [Fri, 18 Sep 2009 11:43:35 +0000 (18 13:43 +0200)]
Moved scrollToShow in Display.updateTab to the swing thread.
Albert Cardona [Fri, 18 Sep 2009 11:43:14 +0000 (18 13:43 +0200)]
Ensuring thread priority of the Bureaucrat is maximum Thread.NORM_PRIORITY
Albert Cardona [Fri, 18 Sep 2009 09:29:40 +0000 (18 11:29 +0200)]
Don't add a ZDisplayable to a subproject if its empty.
Albert Cardona [Fri, 18 Sep 2009 09:29:21 +0000 (18 11:29 +0200)]
Trigger loading of Ball data before cropping.
Albert Cardona [Fri, 18 Sep 2009 09:29:05 +0000 (18 11:29 +0200)]
Open a properly zoomed Display canvas for subproject.
Albert Cardona [Fri, 18 Sep 2009 09:28:34 +0000 (18 11:28 +0200)]
Trigger generation of interpolated points for Pipe, and loading from db if not done so.
Albert Cardona [Thu, 17 Sep 2009 22:00:51 +0000 (18 00:00 +0200)]
Added calculateBoundingBox to ZDisplayable.crop overriden methods.
Albert Cardona [Thu, 17 Sep 2009 21:50:30 +0000 (17 23:50 +0200)]
Tentative fix for create subproject with ZDisplayable that span beyond
the desired layer range.
Albert Cardona [Thu, 17 Sep 2009 21:20:32 +0000 (17 23:20 +0200)]
Removed debug message from TemplateThing
Albert Cardona [Thu, 17 Sep 2009 21:09:06 +0000 (17 23:09 +0200)]
Fixed creation of subprojects: a subproject now gets its own UNUID
and its own UNUID-folder with its own, newly generated mipmaps.
Albert Cardona [Thu, 17 Sep 2009 20:20:25 +0000 (17 22:20 +0200)]
Proper error message for out of memory when opening an ImagePlus.
Albert Cardona [Thu, 17 Sep 2009 20:00:36 +0000 (17 22:00 +0200)]
Broadcast that redo/undo history is empty.
Albert Cardona [Thu, 17 Sep 2009 19:57:33 +0000 (17 21:57 +0200)]
Better repainting of AreaList after brushing.
Albert Cardona [Thu, 17 Sep 2009 19:57:19 +0000 (17 21:57 +0200)]
Restored moving Patch with arrow keys, one pixel at a time.
Albert Cardona [Thu, 17 Sep 2009 16:00:03 +0000 (17 18:00 +0200)]
Merge branch 'align'
Albert Cardona [Thu, 17 Sep 2009 15:58:44 +0000 (17 17:58 +0200)]
Merge branch 'align'
Albert Cardona [Thu, 17 Sep 2009 15:58:41 +0000 (17 17:58 +0200)]
Merge branch 'stack'
Stephan Saalfeld [Thu, 17 Sep 2009 15:44:37 +0000 (17 17:44 +0200)]
Merge branch 'stack' into align
Albert Cardona [Thu, 17 Sep 2009 15:32:24 +0000 (17 17:32 +0200)]
Forking out of EDT in Compare mousePressed popup.
Albert Cardona [Thu, 17 Sep 2009 15:15:40 +0000 (17 17:15 +0200)]
0.7k
Albert Cardona [Thu, 17 Sep 2009 15:14:29 +0000 (17 17:14 +0200)]
Merge branch 'master' into stack
Albert Cardona [Thu, 17 Sep 2009 15:14:08 +0000 (17 17:14 +0200)]
Merge branch 'master' into align
Albert Cardona [Thu, 17 Sep 2009 15:13:01 +0000 (17 17:13 +0200)]
Ensuring file path correctness for Windows. !@#$%^&*(!
Stephan Saalfeld [Thu, 17 Sep 2009 11:41:56 +0000 (17 13:41 +0200)]
Hopefully fixed the scaling in Stack
Stephan Saalfeld [Thu, 17 Sep 2009 07:05:58 +0000 (17 09:05 +0200)]
Merge branch 'stack' into align
Stephan Saalfeld [Thu, 17 Sep 2009 07:05:39 +0000 (17 09:05 +0200)]
Merge branch 'stack' of ssh://repo.or.cz/srv/git/trakem2 into stack
Stephan Saalfeld [Thu, 17 Sep 2009 07:05:09 +0000 (17 09:05 +0200)]
Merge branch 'stack' into align
Stephan Saalfeld [Thu, 17 Sep 2009 07:04:51 +0000 (17 09:04 +0200)]
separated the actual alignLayersLinearly job from the UI-method
Stephan Saalfeld [Thu, 17 Sep 2009 07:03:24 +0000 (17 09:03 +0200)]
Loader uses db_lock
Albert Cardona [Wed, 16 Sep 2009 20:59:59 +0000 (16 22:59 +0200)]
Reverted removal of Loader's lock()/unlock() method content until
clarifying OutOfMemoryErrors that Saalfeld is getting.
Albert Cardona [Wed, 16 Sep 2009 20:58:26 +0000 (16 22:58 +0200)]
Merge branch 'master' into stack
Albert Cardona [Wed, 16 Sep 2009 11:24:05 +0000 (16 13:24 +0200)]
Added "Import stack with landmarks..." to import a sequence of Patches as a Stack
(which is a ZDisplayable), using a reference set of Ball (one single x,y,z ball for
each Ball).
This replaces the need for a script, and sets the stage for future
transfer of objects other than a sequence of Patches from one project to
another.
Stephan Saalfeld [Wed, 16 Sep 2009 15:52:40 +0000 (16 17:52 +0200)]
Merge branch 'align' of ssh://repo.or.cz/srv/git/trakem2 into align
Stephan Saalfeld [Wed, 16 Sep 2009 15:52:18 +0000 (16 17:52 +0200)]
Fixed a bug that prevented the multi-layer mosaicking from
properly performing with different models selected for intra-
and cross-section registration respectively.
TODO---this might work, but it is ugly and unreadable.
Fixed the deformation---centerpoints reference the patches
instead of tiles that were not the same(!).
TODO---I will test that now on a larger data set just to see
how it works...
Albert Cardona [Wed, 16 Sep 2009 15:41:58 +0000 (16 17:41 +0200)]
Better repainting of the Display toolbar on listening to changes in ImageJ's toolbar.
Albert Cardona [Tue, 15 Sep 2009 20:09:39 +0000 (15 22:09 +0200)]
Fixed Displayable.getBoundingBox for a Collection: could return
a rectangle containing point 0,0 when not appropriate, just
because the rectangle was being created without proper checks.
Albert Cardona [Tue, 15 Sep 2009 19:58:32 +0000 (15 21:58 +0200)]
Now adding VectorString3D to Display3D is much easier and can be done in
batch-mode for best speed.
Stephan Saalfeld [Mon, 14 Sep 2009 20:01:27 +0000 (14 22:01 +0200)]
Merge branch 'stack' of ssh://repo.or.cz/srv/git/trakem2 into stack
Conflicts:
ini/trakem2/display/Stack.java
Albert Cardona [Mon, 14 Sep 2009 16:11:32 +0000 (14 18:11 +0200)]
Fixing potential ConcurrentModificationException in Display3D
Stephan Saalfeld [Mon, 14 Sep 2009 08:31:17 +0000 (14 10:31 +0200)]
a very intermediate commit that interrupts me at starting the
graph-based pre-alignment.
Amend this with the next...
Albert Cardona [Mon, 14 Sep 2009 06:00:13 +0000 (14 08:00 +0200)]
Merge branch 'master' into fixing-3D-viewer
Albert Cardona [Mon, 14 Sep 2009 05:55:05 +0000 (14 07:55 +0200)]
Reworked Display3D.show(ProjectThing, ...) to generate meshes in a separate
set of threads and to batch-add them every 4 seconds and when done, using
a scheduled task.
Albert Cardona [Mon, 14 Sep 2009 05:54:09 +0000 (14 07:54 +0200)]
Reworked Project.isBasicType(String)
Albert Cardona [Mon, 14 Sep 2009 05:52:28 +0000 (14 07:52 +0200)]
Added type declarations to returned Set by ProjectThing.findBasicTypeChildren
Albert Cardona [Sun, 13 Sep 2009 14:48:26 +0000 (13 16:48 +0200)]
Removed debug msg
Albert Cardona [Sun, 13 Sep 2009 14:45:39 +0000 (13 16:45 +0200)]
Properly setting the stack centered when doing so from drag and drop.
Albert Cardona [Sun, 13 Sep 2009 14:36:27 +0000 (13 16:36 +0200)]
Added support for importing a stack as a Stack ZDisplayable.
Albert Cardona [Sun, 13 Sep 2009 14:36:02 +0000 (13 16:36 +0200)]
Renamed and redirected debugging input from Patch when removing the whole patch stack.
Albert Cardona [Sun, 13 Sep 2009 11:50:23 +0000 (13 13:50 +0200)]
Preventing potential exception when quitting ImageJ
Albert Cardona [Sun, 13 Sep 2009 11:46:15 +0000 (13 13:46 +0200)]
Stack: fail gracefully to normal alpha composite when other composites are not supported.
Albert Cardona [Sun, 13 Sep 2009 11:37:24 +0000 (13 13:37 +0200)]
Added support for "Duplicate" of Stack instances.
Albert Cardona [Sun, 13 Sep 2009 11:06:01 +0000 (13 13:06 +0200)]
Implemeneted Stack.isDeletable()
Albert Cardona [Sun, 13 Sep 2009 11:04:15 +0000 (13 13:04 +0200)]
Merge branch 'master' into stack
Conflicts:
ini/trakem2/persistence/Loader.java
Albert Cardona [Sun, 13 Sep 2009 10:59:58 +0000 (13 12:59 +0200)]
Reworked logic of gm_lock: does not need lock()/unlock() functionality.
Albert Cardona [Sun, 13 Sep 2009 10:59:31 +0000 (13 12:59 +0200)]
Fixing priority of the crash Thread regenerating feeder launcher.
Albert Cardona [Sun, 13 Sep 2009 10:59:00 +0000 (13 12:59 +0200)]
Added fix for preventing more-than-once regeneration when opening a crashed project.
Noticed by Stephan Saalfeld.
Albert Cardona [Sun, 13 Sep 2009 10:28:12 +0000 (13 12:28 +0200)]
Fixed error in Patch.clone and in a Patch constructor
regarding the o_width,o_height setup
which screwed up the "Duplicate" command for Patch objects.
Noticed by Stephan Saalfeld -- thanks!
Albert Cardona [Sun, 13 Sep 2009 10:27:08 +0000 (13 12:27 +0200)]
Added convenient method to print generic Object for Utils
Albert Cardona [Sun, 13 Sep 2009 09:39:03 +0000 (13 11:39 +0200)]
Ensure correctness of Display list of Display instances by making it a Vector (synchronized) instead of an ArrayList.
Albert Cardona [Sun, 13 Sep 2009 07:38:12 +0000 (13 09:38 +0200)]
Loader automatically retries loading images up to MAX_RETRIES on OutOfMemoryError
Albert Cardona [Sun, 13 Sep 2009 07:37:38 +0000 (13 09:37 +0200)]
Added safety null template handling for TMLHandler
Albert Cardona [Sun, 13 Sep 2009 07:35:58 +0000 (13 09:35 +0200)]
Minor optimization for Utils.toString(Object)
Stephan Saalfeld [Fri, 11 Sep 2009 16:24:47 +0000 (11 18:24 +0200)]
decaching was not successful---truing another one...
Stephan Saalfeld [Fri, 11 Sep 2009 15:39:30 +0000 (11 17:39 +0200)]
Decache processed patches after application of the CT.
Stephan Saalfeld [Thu, 10 Sep 2009 16:49:48 +0000 (10 18:49 +0200)]
Merge branch 'align' of ssh://repo.or.cz/srv/git/trakem2 into align
Conflicts:
mpicbg/trakem2/align/Align.java
Stephan Saalfeld [Thu, 10 Sep 2009 16:47:35 +0000 (10 18:47 +0200)]
Added a deform option to the multi-layer-mosaic method.
Instead of transforming each tile with the affine (rigid or
whatever) transformation estimated in the global
intra-and-cross-layer optimization, the center-points of each
tile are used to deform the intra-section registered layer with a
MLS-transform. That is, the overall appearance of the registration
is that of the globally optimized but sections are continuous in
themselves.
TODO Lacking a sufficient data set, not yet really tested. I will
soon try it with the L1 "second_set"...
Stephan Saalfeld [Thu, 10 Sep 2009 16:22:42 +0000 (10 18:22 +0200)]
Added a deform option to the multi-layer-mosaic method.
Instead of transforming each tile with the affine (rigid or
whatever) transformation estimated in the global
intra-and-cross-layer optimization, the center-points of each
tile are used to deform the intra-section registered layer with a
MLS-transform. That is, the overall appearance of the registration
is that of the globally optimized but sections are continuous in
themselves.
TODO Lacking a sufficient data set, not yet really tested. I will
soon try it with the L1 "second_set"...
Stephan Saalfeld [Thu, 10 Sep 2009 16:10:44 +0000 (10 18:10 +0200)]
Added a convenience method to export a flat image for a selection.