Branch: refs/heads/develop
Home: https://github.com/cytoscape/cytoscape-impl
Commit: fcfc34de3fde239acab0b5461fef40477b5a113f
https://github.com/cytoscape/cytoscape-impl/commit/fcfc34de3fde239acab0b5461fef40477b5a113f
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-10 (Mon, 10 Sep 2018)
Changed paths:
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationTree.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/IllegalAnnotationStructureException.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GroupAnnotationImpl.java
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationLoadTest.java
A
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationStructureTest.java
A
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTest.java
A
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTreeTest.java
Log Message:
-----------
Start of annotation tree and cycle detection. Refs #4314
Commit: 80b664eb31c31bca07e0e9c10475a21ed85d0eac
https://github.com/cytoscape/cytoscape-impl/commit/80b664eb31c31bca07e0e9c10475a21ed85d0eac
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-10 (Mon, 10 Sep 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationTree.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GroupAnnotationImpl.java
R
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationStructureTest.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTest.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTreeTest.java
A
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotatorStructureTest.java
Log Message:
-----------
Test for tree structure. Refs #4314
Commit: 60f6e3e197d61997138751d22bb5d98c205e7459
https://github.com/cytoscape/cytoscape-impl/commit/60f6e3e197d61997138751d22bb5d98c205e7459
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-10 (Mon, 10 Sep 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationTree.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMainPanel.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTreeTest.java
Log Message:
-----------
Replace AnnotationNode with AnnotationTree. Refs #4314
Commit: 0b834c8e7ebc59926a85e74218b88a6d3b9bbce0
https://github.com/cytoscape/cytoscape-impl/commit/0b834c8e7ebc59926a85e74218b88a6d3b9bbce0
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-11 (Tue, 11 Sep 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationManagerImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationTree.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AbstractAnnotation.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AnnotationSelection.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GroupAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/ArrowAnnotationDialog.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/BoundedTextAnnotationDialog.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/ImageAnnotationDialog.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/ShapeAnnotationDialog.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/dialogs/TextAnnotationDialog.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/listeners/CanvasMouseMotionListener.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/GroupAnnotationsTask.java
R
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationLoadTest.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMainPanel.java
A
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AbstractAnnotationTest.java
R
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTest.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTreeTest.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotatorStructureTest.java
Log Message:
-----------
Cycle detection for annotations built using API. Basic enforcement of
z-order. Refs #4314
Commit: a62aaa6bffe7697c7cd033bd4e452fa9c8c36fa7
https://github.com/cytoscape/cytoscape-impl/commit/a62aaa6bffe7697c7cd033bd4e452fa9c8c36fa7
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-12 (Wed, 12 Sep 2018)
Changed paths:
A
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationNode.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationTree.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ReorderAnnotationsTask.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ReorderSelectedAnnotationsTaskFactory.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMainPanel.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMediator.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AbstractAnnotationTest.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTreeTest.java
Log Message:
-----------
Two trees for each canvas. Shift z-order. Refs #4314
Commit: 689b4e48c13237b0807b1eece8e89ce572fdbe93
https://github.com/cytoscape/cytoscape-impl/commit/689b4e48c13237b0807b1eece8e89ce572fdbe93
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-13 (Thu, 13 Sep 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationNode.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationTree.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/GroupAnnotationsTask.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/GroupAnnotationsTaskFactory.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ReorderAnnotationsTask.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/ReorderSelectedAnnotationsTaskFactory.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/tasks/UngroupAnnotationsTask.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMainPanel.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/ui/AnnotationMediator.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTreeTest.java
Log Message:
-----------
Add canvas parameter to AnnotatationTree methods. Some cleanup. Refs
#4314
Commit: 13c6cdd09c6671e7bf726916a6a04610053f5a6d
https://github.com/cytoscape/cytoscape-impl/commit/13c6cdd09c6671e7bf726916a6a04610053f5a6d
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-14 (Fri, 14 Sep 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationTree.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/AnnotationSelection.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GroupAnnotationImpl.java
Log Message:
-----------
Fix dragging nested groups. Refs #4314
Commit: fcabf186cc54f47f0f8faec63914acb395f964cf
https://github.com/cytoscape/cytoscape-impl/commit/fcabf186cc54f47f0f8faec63914acb395f964cf
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-14 (Fri, 14 Sep 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationManagerImpl.java
Log Message:
-----------
Minor fix to AnnotationManager. Refs #4314
Commit: 9675b5cb0ec7cfcf5426f67d2d93ea3b85b760fa
https://github.com/cytoscape/cytoscape-impl/commit/9675b5cb0ec7cfcf5426f67d2d93ea3b85b760fa
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-17 (Mon, 17 Sep 2018)
Changed paths:
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/ArbitraryGraphicsCanvas.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingCanvas.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InnerCanvas.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationManagerImpl.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/AnnotationTree.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/CyAnnotator.java
M
ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/cyannotator/annotations/GroupAnnotationImpl.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotationTreeTest.java
M
ding-impl/ding-presentation-impl/src/test/java/org/cytoscape/ding/impl/cyannotator/AnnotatorStructureTest.java
Log Message:
-----------
Fix adding a group annotation automatically adds all its children. Refs
#4314
Commit: 8cbc17910fd0550ac359ebb2da4f57ce9213e7d6
https://github.com/cytoscape/cytoscape-impl/commit/8cbc17910fd0550ac359ebb2da4f57ce9213e7d6
Author: Mike Kucera <mikekuc...@gmail.com>
Date: 2018-09-17 (Mon, 17 Sep 2018)
Changed paths:
M core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedEdgesTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedNodesTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideSelectedTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideUnselectedEdgesTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideUnselectedNodesTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/HideUnselectedTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllEdgesTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllNodesTaskFactoryImpl.java
M
core-task-impl/src/main/java/org/cytoscape/task/internal/hide/UnHideAllTaskFactoryImpl.java
A
core-task-impl/src/main/resources/images/tooltips/apply-preferred-layout.gif
A core-task-impl/src/main/resources/images/tooltips/first-neighbors.gif
M core-task-impl/src/main/resources/images/tooltips/fit-content.gif
A core-task-impl/src/main/resources/images/tooltips/fit-selected.gif
A core-task-impl/src/main/resources/images/tooltips/show-hide.gif
A core-task-impl/src/main/resources/images/tooltips/zoom-in.gif
A core-task-impl/src/main/resources/images/tooltips/zoom-out.gif
M jobs-impl/src/main/java/org/cytoscape/jobs/internal/JobStatusBar.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/model/SelectionMode.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/CytoscapeToolBar.java
M
swing-application-impl/src/main/java/org/cytoscape/internal/view/MemStatusPanel.java
A
swing-application-impl/src/main/resources/images/tooltips/selection-mode-annotations.gif
M
table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
M
work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/utils/GUIDefaults.java
M
work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/view/TaskStatusBar.java
Log Message:
-----------
Merge branch 'develop' into feature/annotation_tree
Compare:
https://github.com/cytoscape/cytoscape-impl/compare/2ad056c2dc6b...8cbc17910fd0
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to cytoscape-cvs+unsubscr...@googlegroups.com.
To post to this group, send email to cytoscape-cvs@googlegroups.com.
Visit this group at https://groups.google.com/group/cytoscape-cvs.
For more options, visit https://groups.google.com/d/optout.
