Commit a0b94e6
authored
Desktop large image Support (#1613)
* initial large image desktop testing
* faster loading
* restructure logic
* basic functionality
* short circuit calc for 0 files
* limit to tiff types for desktop
* linting and build errors
* fix PNG rendering
* remove samplingRange code and defaulting to 0-255
* large image electron support improvements1 parent eae308f commit a0b94e6
15 files changed
Lines changed: 1276 additions & 57 deletions
File tree
- client
- dive-common
- platform
- desktop
- backend
- native
- tiles
- frontend
- components
- web-girder/views
- src
- @types
- components/annotators
- docs
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -111,6 +111,8 @@ interface SaveAttributeTrackFilterArgs { | |||
| 111 | 111 | interface FrameImage { | |
| 112 | 112 | url: string; | |
| 113 | 113 | filename: string; | |
| 114 | + /** Required for large-image (tiled) datasets; used as itemId for getTiles/getTileURL */ | ||
| 115 | + id?: string; | ||
| 114 | 116 | } | |
| 115 | 117 | ||
| 116 | 118 | export interface MultiCamImportFolderArgs { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -76,11 +76,18 @@ const fileVideoTypes = [ | |||
| 76 | 76 | const largeImageTypes = [ | |
| 77 | 77 | 'image/geotiff', | |
| 78 | 78 | 'image/tiff', | |
| 79 | + 'image/tif', | ||
| 79 | 80 | 'image/x-tiff', | |
| 80 | 81 | 'image/nitf', | |
| 81 | 82 | 'image/ntf', | |
| 82 | 83 | ]; | |
| 83 | 84 | ||
| 85 | + const largeImageDesktopTypes = [ | ||
| 86 | + 'geotiff', | ||
| 87 | + 'tiff', | ||
| 88 | + 'tif', | ||
| 89 | + ]; | ||
| 90 | + | ||
| 84 | 91 | const websafeImageTypes = [ | |
| 85 | 92 | // 'image/apng', | |
| 86 | 93 | // 'image/bmp', | |
@@ -149,6 +156,7 @@ export { | |||
| 149 | 156 | websafeVideoTypes, | |
| 150 | 157 | inputAnnotationTypes, | |
| 151 | 158 | largeImageTypes, | |
| 159 | + largeImageDesktopTypes, | ||
| 152 | 160 | inputAnnotationFileTypes, | |
| 153 | 161 | listFileTypes, | |
| 154 | 162 | zipFileTypes, | |
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -39,6 +39,8 @@ | |||
| 39 | 39 | "csv-stringify": "^5.6.0", | |
| 40 | 40 | "d3": "^5.12.0", | |
| 41 | 41 | "geojs": "~1.6.2", | |
| 42 | + "geotiff": "^3.0.0", | ||
| 43 | + "pngjs": "^7.0.0", | ||
| 42 | 44 | "glob-to-regexp": "^0.4.1", | |
| 43 | 45 | "lodash": "^4.17.19", | |
| 44 | 46 | "moment": "^2.29.1", | |
0 commit comments