mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 10:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1326 from millmanorama/scroll_to_tile_infinite_loop_fix

Browse Source 
attempt to fix infinite loop
This commit is contained in:
Richard Cordovano 2015-06-09 14:10:51 -04:00
commit 6849f7d52c
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/GroupPane.java
View File

@ -206,6 +206,8 @@ public class GroupPane extends BorderPane implements GroupView {
* to determine whether fileIDs are visible or are offscreen. No entry * to determine whether fileIDs are visible or are offscreen. No entry
* indicates the given fileID is not displayed on screen. DrawableCells are * indicates the given fileID is not displayed on screen. DrawableCells are
* responsible for adding and removing themselves from this map. * responsible for adding and removing themselves from this map.
*
* TODO: use ConcurrentHashMap ?
*/ */
@ThreadConfined(type = ThreadType.UI) @ThreadConfined(type = ThreadType.UI)
private final Map<Long, DrawableCell> cellMap = new HashMap<>(); private final Map<Long, DrawableCell> cellMap = new HashMap<>();
@ -500,30 +502,35 @@ public class GroupPane extends BorderPane implements GroupView {
@ThreadConfined(type = ThreadType.UI) @ThreadConfined(type = ThreadType.UI)
private void scrollToFileID(final Long newFileID) { private void scrollToFileID(final Long newFileID) {
if (newFileID == null) { if (newFileID == null) {
//scrolling to no file doesn't make sense, so abort. return; //scrolling to no file doesn't make sense, so abort.
return;
} }
int selectedIndex = grouping.get().fileIds().indexOf(newFileID); final ObservableList<Long> fileIds = getGrouping().fileIds();
int selectedIndex = fileIds.indexOf(newFileID);
if (selectedIndex == -1) { if (selectedIndex == -1) {
//somehow we got passed a file id that isn't in the curent group. //somehow we got passed a file id that isn't in the curent group.
//this should never happen, but if it does everything is going to fail, so abort. //this should never happen, but if it does everything is going to fail, so abort.
return; return;
} }
Optional<ScrollBar> scrollBarOptional = getScrollBar(); getScrollBar().ifPresent(scrollBar -> {
scrollBarOptional.ifPresent((ScrollBar scrollBar) -> {
DrawableCell cell = cellMap.get(newFileID); DrawableCell cell = cellMap.get(newFileID);
//while there is no tile/cell for the given id, scroll based on index in group //while there is no tile/cell for the given id, scroll based on index in group
while (cell == null) { while (isNull(cell)) {
//TODO: can we maintain a cached mapping from fileID-> index to speed up performance
//get the min and max index of files that are in the cellMap
Integer minIndex = cellMap.keySet().stream() Integer minIndex = cellMap.keySet().stream()
.map(grouping.get().fileIds()::indexOf) .mapToInt(fileID -> fileIds.indexOf(fileID))
.min(Integer::compare).get(); .min().getAsInt();
Integer maxIndex = cellMap.keySet().stream() Integer maxIndex = cellMap.keySet().stream()
.map(grouping.get().fileIds()::indexOf) .mapToInt(fileID -> fileIds.indexOf(fileID))
.max(Integer::compare).get(); .max().getAsInt();
//[minIndex, maxIndex] is the range of indexes in the fileIDs list that are currently displayed
if (minIndex < 0 && maxIndex < 0) {
return;
}
if (selectedIndex < minIndex) { if (selectedIndex < minIndex) {
scrollBar.decrement(); scrollBar.decrement();
@ -535,18 +542,14 @@ public class GroupPane extends BorderPane implements GroupView {
scrollBar.adjustValue(.5); scrollBar.adjustValue(.5);
} }
cell = cellMap.get(newFileID); cell = cellMap.get(newFileID);
} }
final Bounds gridViewBounds = gridView.localToScene(gridView.getBoundsInLocal()); final Bounds gridViewBounds = gridView.localToScene(gridView.getBoundsInLocal());
Bounds tileBounds = cell.localToScene(cell.getBoundsInLocal()); Bounds tileBounds = cell.localToScene(cell.getBoundsInLocal());
//while the cell is not within the visisble bounds of the gridview, scroll based on screen coordinates //while the cell is not within the visisble bounds of the gridview, scroll based on screen coordinates
int i = 0; int i = 0;
while (gridViewBounds.contains(tileBounds) == false && (i++ < 100)) {
while (gridViewBounds.contains(tileBounds)
== false && (i++ < 100)) {
if (tileBounds.getMinY() < gridViewBounds.getMinY()) { if (tileBounds.getMinY() < gridViewBounds.getMinY()) {
scrollBar.decrement(); scrollBar.decrement();