momo
|
3298ebcfa3
|
changed the url to use netbeans (more reliable source)
|
2015-07-15 13:29:55 -04:00 |
|
jmillman
|
94c8e7b6fe
|
Merge remote-tracking branch 'upstream/develop' into expand_image_format_support
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/ImageFile.java
|
2015-07-15 09:53:56 -04:00 |
|
jmillman
|
66e9277f5f
|
Merge remote-tracking branch 'upstream/develop' into data_result_viewer_video_thumbnails
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/ImageFile.java
|
2015-07-15 09:43:56 -04:00 |
|
jmillman
|
0fcd572595
|
work on Ig backgroundloading of video thumbnails
|
2015-07-14 16:07:29 -04:00 |
|
jmillman
|
4afb53166d
|
cleanup, modify ImageUtils API to be about "thumbnails" not "icons" and deprecate old API
|
2015-07-14 12:06:10 -04:00 |
|
jmillman
|
a14e321f8b
|
verify is delegating appropriately to Image and refactor ThumbnailCache
|
2015-07-14 11:12:29 -04:00 |
|
jmillman
|
bdeead6462
|
Ig temp commit
|
2015-07-13 17:06:20 -04:00 |
|
Richard Cordovano
|
b4ee3471eb
|
Merge develop branch into collaborative branch
|
2015-07-13 16:43:28 -04:00 |
|
jmillman
|
dc65afc62b
|
Merge branch 'include_all_drawable_mimetypes' into twelvemonkeys_imageio
Conflicts:
Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java
Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
|
2015-07-13 11:55:03 -04:00 |
|
jmillman
|
733c4ee9c2
|
video thumbs IG temp
|
2015-07-10 16:23:02 -04:00 |
|
jmillman
|
faa0c886cf
|
build video thumbnails in background thread, build video thumbnail based on entire file not just short snippet
|
2015-07-10 16:08:28 -04:00 |
|
jmillman
|
e148978437
|
reduce duplication in DataContentViewerMEdia and MediaViewImagePanel by moving common code to ImageUtils
|
2015-07-09 17:43:22 -04:00 |
|
jmillman
|
c9bcf48acc
|
cleanup logic in DataContentViewerMedia
|
2015-07-09 17:24:19 -04:00 |
|
jmillman
|
47156eb9ad
|
reorder lines for readability
|
2015-07-09 16:48:24 -04:00 |
|
jmillman
|
69d299222d
|
refactor imagutils , have Thumbnail cache do in memory caching but let IamgeUtils handle disk based cache. Fix tga support in IG
|
2015-07-09 16:29:16 -04:00 |
|
jmillman
|
b0670b3992
|
use twelvemnkeys to load lots more image formats
|
2015-07-09 13:09:18 -04:00 |
|
jmillman
|
865b7f8498
|
fix caching of full images to improve performance
|
2015-07-07 12:24:56 -04:00 |
|
jmillman
|
f7e56bebcc
|
Merge branch 'develop' into include_all_drawable_mimetypes
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
|
2015-07-02 17:20:46 -04:00 |
|
jmillman
|
276a6155cf
|
comments
|
2015-07-02 16:23:08 -04:00 |
|
jmillman
|
ae38edf854
|
add some more image format extensions
|
2015-07-02 15:24:53 -04:00 |
|
jmillman
|
4db07ba65e
|
add "undisplayable" icon to DrawableTile.fxml and SlideShow.fxml; show this icon , when we can't display the contents of a drawable file.
|
2015-07-02 15:04:37 -04:00 |
|
jmillman
|
798ce18f0b
|
fix animated gif loading; add "undisplayable" icon to DrawableTile.fxml
|
2015-07-02 14:14:53 -04:00 |
|
jmillman
|
47d6318ecd
|
Merge remote-tracking branch 'upstream/develop' into include_all_drawable_mimetypes
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
|
2015-07-02 14:14:07 -04:00 |
|
jmillman
|
bf68bea824
|
Merge remote-tracking branch 'upstream/develop' into include_all_drawable_mimetypes
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
|
2015-07-02 12:56:32 -04:00 |
|
jmillman
|
a2a8fc0bc6
|
move Tag events to ...casemodule.events package; explicitly implement Serializable interface.
use as needed logger to avoid serializing it.
|
2015-07-02 10:54:29 -04:00 |
|
jmillman
|
1138ed5f89
|
fix video/supoprted mimetype confusion
|
2015-07-02 10:34:14 -04:00 |
|
jmillman
|
8c224393e5
|
remove unsed icons
|
2015-07-02 10:33:34 -04:00 |
|
Richard Cordovano
|
e59ba14a44
|
Merge pull request #1417 from millmanorama/concurrent_hashmap_npe_fix
improve synchronization and guard the videoFileMap from null keys to eliminate NPE
|
2015-07-02 09:36:25 -04:00 |
|
jmillman
|
beb8efaa6a
|
Extract FileTypeUtils from ImageGalleryModule
remove FileTypeIcons
remove deprecated method from GroupManager
|
2015-07-01 15:58:37 -04:00 |
|
jmillman
|
64e887b098
|
work towards showing a filetype icon even when we can't show the file
|
2015-07-01 15:58:30 -04:00 |
|
jmillman
|
e2cb9544f8
|
experimental work to show mimetype icon for undisplayable images/videos
|
2015-07-01 15:58:24 -04:00 |
|
jmillman
|
13d60ead02
|
use FileTypeDetector and mimetypes to decide what to include only falling back on extension if we can not get a mime type.
|
2015-07-01 15:58:15 -04:00 |
|
jmillman
|
924d012527
|
fix rebuilding the contents tree when switching grouping
|
2015-07-01 15:54:07 -04:00 |
|
jmillman
|
5866b88a35
|
improve synchronization and guard the videoFileMap from null keys to eliminate NPE
|
2015-07-01 15:52:12 -04:00 |
|
Richard Cordovano
|
a07802d73c
|
Merge pull request #1407 from millmanorama/manually_sort_unseengroups
replace buggy JavaFX SortedLists with explicit sorting
|
2015-06-30 16:24:46 -04:00 |
|
Richard Cordovano
|
e1a6068298
|
Merge pull request #1406 from millmanorama/tag_group_menu
fix tag group menu bug ...
|
2015-06-30 16:23:45 -04:00 |
|
Richard Cordovano
|
6129da5679
|
Merge pull request #1405 from millmanorama/duplicate_tag_warning
Duplicate tag warning
|
2015-06-30 16:23:17 -04:00 |
|
jmillman
|
c12faa9859
|
refactor TagEvents heirarchy to support serialization;
don't try to lookup DeletedTag by Id, it won't exist. Instead send DeletedTagInfo which has key info of deleted tag and is serializable.
|
2015-06-30 12:27:23 -04:00 |
|
jmillman
|
3e3a48e184
|
replace buggy JavaFX SortedLists with explicit sorting
|
2015-06-29 16:08:22 -04:00 |
|
jmillman
|
019e0b9584
|
fix tag group menu bug
|
2015-06-29 15:38:07 -04:00 |
|
jmillman
|
8b30d1bb7b
|
check for duplicate tags in ImageGallery like we do in Autopsy.
|
2015-06-29 14:43:18 -04:00 |
|
jmillman
|
3a37fe0ef1
|
fixup! Merge branch 'develop' into hash_set_display
|
2015-06-29 11:15:20 -04:00 |
|
jmillman
|
ae9f9b0e31
|
Merge branch 'develop' into hash_set_display
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
|
2015-06-29 11:11:09 -04:00 |
|
jmillman
|
a234f9647d
|
Merge branch 'develop' into hash_set_display
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
|
2015-06-29 11:07:15 -04:00 |
|
jmillman
|
0854d5bd41
|
Merge branch 'develop' into hash_set_display
Conflicts:
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/AddTagAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/actions/CategorizeAction.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java
|
2015-06-29 10:54:38 -04:00 |
|
Richard Cordovano
|
d1219f78de
|
Merge develop into collaborative
|
2015-06-25 13:15:54 -04:00 |
|
jmillman
|
5b904edba6
|
fix merge mistakes
|
2015-06-25 11:31:53 -04:00 |
|
jmillman
|
773e4293c5
|
SlideShow toggle is disabled when there is no group selected; fix relative paths to images in fxml
|
2015-06-25 10:55:13 -04:00 |
|
jmillman
|
bb85f3feda
|
SlideShow toggle is disabled initialy; fix relative paths to images in fxml
|
2015-06-25 10:55:11 -04:00 |
|
jmillman
|
257ebc64da
|
clean up add tag action, use invokeLater not invokeAndWait; getNonCategoryTagNames returns TagNames in alphabetical order by displayname
|
2015-06-25 10:54:44 -04:00 |
|