trakem2/tony-azevedo.git
11 years agoA fix for bug 255 (the doubled and offset brush drawing in area lists)double-brushing-fix
Mark Longair [Sun, 28 Nov 2010 13:42:27 +0000 (28 14:42 +0100)]
A fix for bug 255 (the doubled and offset brush drawing in area lists)

The transformations were applied in a different order when adding
areas for each mouse event and adding areas in the interpolator
thread.

11 years agoFix for a NPE when selecting a node with the 'g' key
Mark Longair [Mon, 22 Nov 2010 10:17:26 +0000 (22 11:17 +0100)]
Fix for a NPE when selecting a node with the 'g' key

Sometimes the node_layer_map.get(active_layer) call will return
null, which causes a NullPointerException.

11 years agoTree: fixed potential source of mysteriously disappearing nodes
Albert Cardona [Fri, 19 Nov 2010 19:57:24 +0000 (19 20:57 +0100)]
Tree: fixed potential source of mysteriously disappearing nodes
when using a single layer, i.e. color cues set to zero.
The Tree.paint method iterates that list of nodes and removes
the nodes that are not within the field of view. Hence the patchy
disappearance: the rectangular field of view remained and the rest was
thrown out.

11 years agoCentrality and Vertex: removed debugging messages.
Albert Cardona [Fri, 19 Nov 2010 10:56:25 +0000 (19 11:56 +0100)]
Centrality and Vertex: removed debugging messages.

11 years agoCentrality/branchWise seems to work as expected.
Albert Cardona [Fri, 19 Nov 2010 10:53:30 +0000 (19 11:53 +0100)]
Centrality/branchWise seems to work as expected.

11 years agoFixed minor issues with Display3D.
Albert Cardona [Tue, 16 Nov 2010 18:18:09 +0000 (16 19:18 +0100)]
Fixed minor issues with Display3D.
Namely, call 'center' directly to the front display that was gathered.

11 years agoMerge remote branch 'origin/control-click-3d'
Albert Cardona [Tue, 16 Nov 2010 18:12:36 +0000 (16 19:12 +0100)]
Merge remote branch 'origin/control-click-3d'

11 years agoConnector.intersectsOrigin now requires a Layer as argument.
Albert Cardona [Tue, 16 Nov 2010 17:55:42 +0000 (16 18:55 +0100)]
Connector.intersectsOrigin now requires a Layer as argument.

11 years agotypo
Albert Cardona [Tue, 16 Nov 2010 17:55:16 +0000 (16 18:55 +0100)]
typo

11 years agoMinor warning fix
Albert Cardona [Tue, 16 Nov 2010 17:55:06 +0000 (16 18:55 +0100)]
Minor warning fix

11 years agoMake control-click in the 3D viewer centre the TrakEM2 display on that point
Mark Longair [Tue, 16 Nov 2010 15:24:13 +0000 (16 16:24 +0100)]
Make control-click in the 3D viewer centre the TrakEM2 display on that point

11 years ago0.8l
Albert Cardona [Tue, 16 Nov 2010 13:37:25 +0000 (16 14:37 +0100)]
0.8l

11 years agoAdded individual area measurements table for AreaList and AreaTree,
Albert Cardona [Tue, 16 Nov 2010 13:16:49 +0000 (16 14:16 +0100)]
Added individual area measurements table for AreaList and AreaTree,
as requested by John Anderson and Rita Bopp.

11 years agoPolyline: fixed warnings.
Albert Cardona [Tue, 16 Nov 2010 12:43:45 +0000 (16 13:43 +0100)]
Polyline: fixed warnings.

11 years agoDisplayCanvas: filter as well look-ahead cache images.
Albert Cardona [Fri, 12 Nov 2010 18:17:25 +0000 (12 19:17 +0100)]
DisplayCanvas: filter as well look-ahead cache images.
Thanks to Dan Bumbarger for reporting.

11 years agoDisplay: updated FastFlat CLAHE to use getInstance().run method.
Albert Cardona [Fri, 12 Nov 2010 18:16:37 +0000 (12 19:16 +0100)]
Display: updated FastFlat CLAHE to use getInstance().run method.

11 years agoCorrecting lots of warnings.
Albert Cardona [Fri, 12 Nov 2010 17:51:26 +0000 (12 18:51 +0100)]
Correcting lots of warnings.

11 years agoCorrecting lots of warnings.
Albert Cardona [Fri, 12 Nov 2010 17:50:56 +0000 (12 18:50 +0100)]
Correcting lots of warnings.

11 years agoAreaContainer: remove unused import
Albert Cardona [Fri, 12 Nov 2010 16:51:52 +0000 (12 17:51 +0100)]
AreaContainer: remove unused import

11 years agoAffineTransformMode: cleanup warnings
Albert Cardona [Fri, 12 Nov 2010 16:51:40 +0000 (12 17:51 +0100)]
AffineTransformMode: cleanup warnings

11 years agoFixed lots of warnings.
Albert Cardona [Fri, 12 Nov 2010 12:56:52 +0000 (12 13:56 +0100)]
Fixed lots of warnings.
Also replaced a Hashtable for a HashMap,
and removed many Iterator from loops.

11 years agoCleaned up lineage/Identify.java
Albert Cardona [Thu, 11 Nov 2010 23:25:23 +0000 (12 00:25 +0100)]
Cleaned up lineage/Identify.java

11 years agoCleaned up warnings from vector package.
Albert Cardona [Thu, 11 Nov 2010 23:06:21 +0000 (12 00:06 +0100)]
Cleaned up warnings from vector package.

11 years agoTree now uses a HashMap instead of a TreeMap to store the sets of nodes.
Albert Cardona [Tue, 9 Nov 2010 17:56:08 +0000 (9 18:56 +0100)]
Tree now uses a HashMap instead of a TreeMap to store the sets of nodes.

11 years agoCosmetic fix and docs.
Albert Cardona [Tue, 9 Nov 2010 17:55:15 +0000 (9 18:55 +0100)]
Cosmetic fix and docs.

11 years agoMore minor fixes to FakeImagePlus
Albert Cardona [Tue, 9 Nov 2010 17:21:36 +0000 (9 18:21 +0100)]
More minor fixes to FakeImagePlus

11 years agoLayer: added a find under point method that may use instanceof.
Albert Cardona [Tue, 9 Nov 2010 17:21:23 +0000 (9 18:21 +0100)]
Layer: added a find under point method that may use instanceof.

11 years agoOrganized imports and added generics
Albert Cardona [Tue, 9 Nov 2010 17:17:45 +0000 (9 18:17 +0100)]
Organized imports and added generics

11 years agoorganized imports
Albert Cardona [Tue, 9 Nov 2010 17:17:05 +0000 (9 18:17 +0100)]
organized imports

11 years agoAreaWrapper VK_M: fixed error, was inverse transforming twice.
Albert Cardona [Tue, 9 Nov 2010 17:07:30 +0000 (9 18:07 +0100)]
AreaWrapper VK_M: fixed error, was inverse transforming twice.
Thanks to Graham Knott for reporting.

11 years agoremove debug message
Albert Cardona [Tue, 9 Nov 2010 17:06:58 +0000 (9 18:06 +0100)]
remove debug message

11 years agoManualAlignMode: 1-based logging of loaded layers.
Albert Cardona [Tue, 9 Nov 2010 12:13:30 +0000 (9 13:13 +0100)]
ManualAlignMode: 1-based logging of loaded layers.

11 years agoLayerSet: be more careful with idlayers map.
Albert Cardona [Tue, 9 Nov 2010 12:10:10 +0000 (9 13:10 +0100)]
LayerSet: be more careful with idlayers map.

11 years agoLayerSet: fixed potential mishap with layerindices map when creating undos.
Albert Cardona [Tue, 9 Nov 2010 11:41:08 +0000 (9 12:41 +0100)]
LayerSet: fixed potential mishap with layerindices map when creating undos.

11 years agoTMLHandler: considerable cleanup of generic types
Albert Cardona [Tue, 9 Nov 2010 11:39:03 +0000 (9 12:39 +0100)]
TMLHandler: considerable cleanup of generic types

11 years agoLayerSet: catch potential error in LayerSet.indexOf
Albert Cardona [Tue, 9 Nov 2010 11:37:03 +0000 (9 12:37 +0100)]
LayerSet: catch potential error in LayerSet.indexOf

11 years agoAdded a separate color cue boolean for areas,
Albert Cardona [Tue, 9 Nov 2010 10:33:45 +0000 (9 11:33 +0100)]
Added a separate color cue boolean for areas,
accessible via "Display - Properties..." dialog.

11 years agoCentrality: minor fix
Albert Cardona [Tue, 9 Nov 2010 10:32:27 +0000 (9 11:32 +0100)]
Centrality: minor fix

11 years agoAreaWrapper: do not store copies of the AffineTransform,
Albert Cardona [Mon, 8 Nov 2010 21:19:05 +0000 (8 22:19 +0100)]
AreaWrapper: do not store copies of the AffineTransform,
may be out of synch.
Trying to cope with bizarre error in the interpolator
observed by Nuno da Costa, in which the interpolator
and the painted points add areas in different places.

11 years agoTree: commented out debug message
Albert Cardona [Mon, 8 Nov 2010 21:16:58 +0000 (8 22:16 +0100)]
Tree: commented out debug message

11 years ago0.8k
Albert Cardona [Wed, 3 Nov 2010 17:48:44 +0000 (3 18:48 +0100)]
0.8k

11 years agoAdded checkbox "use red/blue for color cues" in Display - Properties dialog.
Albert Cardona [Wed, 3 Nov 2010 17:42:52 +0000 (3 18:42 +0100)]
Added checkbox "use red/blue for color cues" in Display - Properties dialog.

11 years agoProfile.getBezierArrays() returns resized copies of the arrays.
Albert Cardona [Tue, 2 Nov 2010 09:23:20 +0000 (2 10:23 +0100)]
Profile.getBezierArrays() returns resized copies of the arrays.
(Resized to n_points.)

11 years agoProfile: added getPointCount()
Albert Cardona [Tue, 2 Nov 2010 09:22:47 +0000 (2 10:22 +0100)]
Profile: added getPointCount()

11 years agoCleaned up profile, no more warnings.
Albert Cardona [Mon, 1 Nov 2010 16:41:53 +0000 (1 17:41 +0100)]
Cleaned up profile, no more warnings.

11 years agoProcess: be interruptible.
Albert Cardona [Mon, 1 Nov 2010 15:35:39 +0000 (1 16:35 +0100)]
Process: be interruptible.

11 years agoImplemented Centrality/branchWise
Albert Cardona [Tue, 26 Oct 2010 17:17:30 +0000 (26 13:17 -0400)]
Implemented Centrality/branchWise
and modified Vertex and Tree.
Now Vertex contains a generic object, which can be a Node, if desired.

11 years agoMerger: pink for 2 changed; orange for 1 changed; magenta for both
Albert Cardona [Wed, 13 Oct 2010 20:25:30 +0000 (13 22:25 +0200)]
Merger: pink for 2 changed; orange for 1 changed; magenta for both
and similar when only tags have changes.

11 years agoMerger: single selection in main table.
Albert Cardona [Wed, 13 Oct 2010 19:00:53 +0000 (13 21:00 +0200)]
Merger: single selection in main table.

11 years agoProcess: name threads properly
Albert Cardona [Wed, 13 Oct 2010 18:43:21 +0000 (13 20:43 +0200)]
Process: name threads properly

11 years agoMerger: proper color for unmatched rows.
Albert Cardona [Wed, 13 Oct 2010 18:09:52 +0000 (13 20:09 +0200)]
Merger: proper color for unmatched rows.

11 years agoMerger: clearer context dialog and ability to send unmatched elements.
Albert Cardona [Wed, 13 Oct 2010 15:46:39 +0000 (13 17:46 +0200)]
Merger: clearer context dialog and ability to send unmatched elements.

11 years agoDisplay: added method "show", to call showCentered in a non-static way.
Albert Cardona [Wed, 13 Oct 2010 15:08:42 +0000 (13 17:08 +0200)]
Display: added method "show", to call showCentered in a non-static way.

11 years agoProjectTree: removed some warnings and simplified insertSegmentations
Albert Cardona [Wed, 13 Oct 2010 15:08:01 +0000 (13 17:08 +0200)]
ProjectTree: removed some warnings and simplified insertSegmentations

11 years agoTree: when going to a node from tabular view, set it as the receiver.
Albert Cardona [Wed, 13 Oct 2010 08:33:59 +0000 (13 10:33 +0200)]
Tree: when going to a node from tabular view, set it as the receiver.

11 years agoTemplateTree: larger text field for typing in a new name of a type.
Albert Cardona [Tue, 12 Oct 2010 19:34:05 +0000 (12 21:34 +0200)]
TemplateTree: larger text field for typing in a new name of a type.

11 years agoLayerSet: larger text field for typing in a new tag.
Albert Cardona [Tue, 12 Oct 2010 19:33:41 +0000 (12 21:33 +0200)]
LayerSet: larger text field for typing in a new tag.

11 years agoNode and Tree: updated API for Node.setConfidence and fixed direct setting
Albert Cardona [Tue, 12 Oct 2010 19:31:02 +0000 (12 21:31 +0200)]
Node and Tree: updated API for Node.setConfidence and fixed direct setting
of the confidence by typing a number 0--5.

11 years agoNode: fixed painting location of the confidence box.
Albert Cardona [Tue, 12 Oct 2010 19:21:50 +0000 (12 21:21 +0200)]
Node: fixed painting location of the confidence box.

11 years agoMerger: more useful info, such as common and unique nodes to each tree,
Albert Cardona [Tue, 12 Oct 2010 19:13:32 +0000 (12 21:13 +0200)]
Merger: more useful info, such as common and unique nodes to each tree,
and common and unique nodes with tags.

11 years agoAdded more options to the Merger popup.
Albert Cardona [Tue, 12 Oct 2010 13:11:01 +0000 (12 15:11 +0200)]
Added more options to the Merger popup.

11 years agoTreeConnectorView: when there's only one target, print more than just its id.
Albert Cardona [Tue, 12 Oct 2010 13:10:46 +0000 (12 15:10 +0200)]
TreeConnectorView: when there's only one target, print more than just its id.

11 years agoTreeConnectorsView: don't list Connectors as targets.
Albert Cardona [Tue, 12 Oct 2010 13:10:13 +0000 (12 15:10 +0200)]
TreeConnectorsView: don't list Connectors as targets.

11 years agoProcess.unbound ... forgot one method
Albert Cardona [Tue, 12 Oct 2010 10:12:42 +0000 (12 12:12 +0200)]
Process.unbound ... forgot one method

11 years agoMerger: use unbound parallel processing.
Albert Cardona [Tue, 12 Oct 2010 10:11:09 +0000 (12 12:11 +0200)]
Merger: use unbound parallel processing.

11 years agoProcess.unbound: don't wait for tasks to finish before submitting new ones.
Albert Cardona [Tue, 12 Oct 2010 10:10:58 +0000 (12 12:10 +0200)]
Process.unbound: don't wait for tasks to finish before submitting new ones.

11 years agoMerger: add progress bar
Albert Cardona [Tue, 12 Oct 2010 09:53:59 +0000 (12 11:53 +0200)]
Merger: add progress bar

11 years agoMerger: parallelized matches.
Albert Cardona [Tue, 12 Oct 2010 09:51:43 +0000 (12 11:51 +0200)]
Merger: parallelized matches.

11 years agoSnapshotPanel: minor fix
Albert Cardona [Tue, 12 Oct 2010 09:08:30 +0000 (12 11:08 +0200)]
SnapshotPanel: minor fix

11 years agoTentative Merger for merging sibling projects.
Albert Cardona [Tue, 12 Oct 2010 09:08:18 +0000 (12 11:08 +0200)]
Tentative Merger for merging sibling projects.
Only operates on Tree instances (AreaTree, Treeline and Connector)
at the moment.

11 years agoboolean Node.hasSameTags(Node)
Albert Cardona [Tue, 12 Oct 2010 08:24:48 +0000 (12 10:24 +0200)]
boolean Node.hasSameTags(Node)

11 years agoTree: add methods to retrive a Vertex representation and their centrality.
Albert Cardona [Tue, 12 Oct 2010 08:24:08 +0000 (12 10:24 +0200)]
Tree: add methods to retrive a Vertex representation and their centrality.

11 years agoGeneralized Centrality class: operates on any graph of Vertex instances.
Albert Cardona [Tue, 12 Oct 2010 08:23:39 +0000 (12 10:23 +0200)]
Generalized Centrality class: operates on any graph of Vertex instances.

11 years agoDisplayablePanel: idlabel must be set always.
Albert Cardona [Sat, 9 Oct 2010 08:26:53 +0000 (9 09:26 +0100)]
DisplayablePanel: idlabel must be set always.

11 years agoSearch: minor fix.
Albert Cardona [Thu, 7 Oct 2010 09:21:26 +0000 (7 11:21 +0200)]
Search: minor fix.

11 years agoSearch: select in display all selected rows.
Albert Cardona [Wed, 6 Oct 2010 18:36:04 +0000 (6 20:36 +0200)]
Search: select in display all selected rows.
Requested by Wei-Chung Allen Lee

11 years agoDisplayablePanel: update the idlabel as well when setting a Displayable.
Albert Cardona [Wed, 6 Oct 2010 11:00:18 +0000 (6 13:00 +0200)]
DisplayablePanel: update the idlabel as well when setting a Displayable.
Spotted by Casey Schneider-Mizell.

11 years ago0.8i
Albert Cardona [Tue, 5 Oct 2010 16:21:11 +0000 (5 18:21 +0200)]
0.8i

11 years agoAdded analysis/Centrality
Albert Cardona [Tue, 5 Oct 2010 16:20:04 +0000 (5 18:20 +0200)]
Added analysis/Centrality

11 years agoMinor fix.
Albert Cardona [Tue, 5 Oct 2010 16:17:46 +0000 (5 18:17 +0200)]
Minor fix.

11 years agoDefault layers to color cue: 0 (was: -1, aka all)
Albert Cardona [Tue, 5 Oct 2010 14:26:39 +0000 (5 16:26 +0200)]
Default layers to color cue: 0 (was: -1, aka all)

11 years agoUpdated lineage/identify.clj to clojure 1.3
Albert Cardona [Mon, 4 Oct 2010 18:07:00 +0000 (4 20:07 +0200)]
Updated lineage/identify.clj to clojure 1.3

11 years agoTree: added menu item to tree tabular view to generate subtree reviews.
Albert Cardona [Mon, 4 Oct 2010 14:09:07 +0000 (4 16:09 +0200)]
Tree: added menu item to tree tabular view to generate subtree reviews.

11 years agoProperly determine which Display to repaint when operating the transparency slider.
Albert Cardona [Mon, 4 Oct 2010 14:03:02 +0000 (4 16:03 +0200)]
Properly determine which Display to repaint when operating the transparency slider.

11 years agoAreaTree node: paint handle with a black rind.
Albert Cardona [Mon, 4 Oct 2010 14:01:52 +0000 (4 16:01 +0200)]
AreaTree node: paint handle with a black rind.

11 years agoTree and Node: fix node edge painting.
Albert Cardona [Mon, 4 Oct 2010 13:14:34 +0000 (4 15:14 +0200)]
Tree and Node: fix node edge painting.
The edge to a node paints with that node's color.
Also minor fixes in style of painting full of half edges.

11 years agonew method Tree.createNewNode, copies the color of the modelNode
Albert Cardona [Mon, 4 Oct 2010 09:50:25 +0000 (4 11:50 +0200)]
new method Tree.createNewNode, copies the color of the modelNode

11 years agoNode: typo
Albert Cardona [Mon, 4 Oct 2010 09:50:01 +0000 (4 11:50 +0200)]
Node: typo

11 years agoTree.adjustNodeColors: fixed color assignment.
Albert Cardona [Mon, 4 Oct 2010 09:49:50 +0000 (4 11:49 +0200)]
Tree.adjustNodeColors: fixed color assignment.

11 years agoNode.NodeCollection constructor is now public
Albert Cardona [Mon, 4 Oct 2010 09:48:32 +0000 (4 11:48 +0200)]
Node.NodeCollection constructor is now public

11 years agoNode.SlabIterator must be static
Albert Cardona [Mon, 4 Oct 2010 09:48:16 +0000 (4 11:48 +0200)]
Node.SlabIterator must be static

11 years agoFixed potential deadlocks.
Albert Cardona [Sun, 3 Oct 2010 16:05:06 +0000 (3 18:05 +0200)]
Fixed potential deadlocks.
In short: never call from within a synch block a method
that (itself or what it calls) synchs on a different lock.

11 years agoTree and Node: added getBranchNodes, getBranchAndEndNodes, computeAllDegrees.
Albert Cardona [Sun, 3 Oct 2010 15:09:46 +0000 (3 17:09 +0200)]
Tree and Node: added getBranchNodes, getBranchAndEndNodes, computeAllDegrees.
And getEndNodes to Node.
For Node, applies to its subtree only. For Tree, to the root (the whole tree)

11 years agoTreeline: commented out debugging message
Albert Cardona [Sat, 2 Oct 2010 14:53:14 +0000 (2 16:53 +0200)]
Treeline: commented out debugging message

11 years agoini.trakem2.tree: removed many warnings.
Albert Cardona [Sat, 2 Oct 2010 10:42:37 +0000 (2 12:42 +0200)]
ini.trakem2.tree: removed many warnings.

11 years agoTreeConnectorsView: bring to front any open instances instead of a new one.
Albert Cardona [Fri, 1 Oct 2010 19:23:24 +0000 (1 21:23 +0200)]
TreeConnectorsView: bring to front any open instances instead of a new one.

11 years agoProject.destroy calls LayerSet.destroy.
Albert Cardona [Fri, 1 Oct 2010 19:19:54 +0000 (1 21:19 +0200)]
Project.destroy calls LayerSet.destroy.
Why it didn't before I haven't got the faintest idea.

11 years agoLayerSet: minor fix
Albert Cardona [Fri, 1 Oct 2010 19:19:28 +0000 (1 21:19 +0200)]
LayerSet: minor fix

11 years agoSearch: organized imports
Albert Cardona [Fri, 1 Oct 2010 19:19:15 +0000 (1 21:19 +0200)]
Search: organized imports

11 years agoTree.destroy closes any open TreeConnectorView
Albert Cardona [Fri, 1 Oct 2010 19:19:02 +0000 (1 21:19 +0200)]
Tree.destroy closes any open TreeConnectorView