diff --git a/MatterControlLib/ApplicationView/ThumbnailsConfig.cs b/MatterControlLib/ApplicationView/ThumbnailsConfig.cs index 4dc43dc66..eaa8eb7ed 100644 --- a/MatterControlLib/ApplicationView/ThumbnailsConfig.cs +++ b/MatterControlLib/ApplicationView/ThumbnailsConfig.cs @@ -83,6 +83,11 @@ namespace MatterHackers.MatterControl public ImageBuffer LoadCachedImage(ILibraryItem libraryItem, int width, int height) { + var staticDataFilename = Path.Combine("Images", "Thumbnails", CacheFilename(libraryItem, width, height)); + if (AggContext.StaticData.FileExists(staticDataFilename)) + { + return AggContext.StaticData.LoadImage(staticDataFilename); + } ImageBuffer cachedItem = LoadImage(this.CachePath(libraryItem, width, height)); if (cachedItem != null) { @@ -118,11 +123,16 @@ namespace MatterHackers.MatterControl $"{libraryItem.ID}.png"); } + public string CacheFilename(ILibraryItem libraryItem, int width, int height) + { + return $"{ libraryItem.ID}-{ width}x{ height}.png"; + } + public string CachePath(ILibraryItem libraryItem, int width, int height) { return ApplicationController.CacheablePath( Path.Combine("Thumbnails", "Library"), - $"{libraryItem.ID}-{width}x{height}.png"); + CacheFilename(libraryItem, width, height)); } internal void QueueForGeneration(Func func) diff --git a/StaticData/Images/Thumbnails/-1284546840-100x100.png b/StaticData/Images/Thumbnails/-1284546840-100x100.png new file mode 100644 index 000000000..6e5b508e2 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1284546840-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-1284546840-22x22.png b/StaticData/Images/Thumbnails/-1284546840-22x22.png new file mode 100644 index 000000000..b630682a7 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1284546840-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-1284546840-256x256.png b/StaticData/Images/Thumbnails/-1284546840-256x256.png new file mode 100644 index 000000000..f49bdc178 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1284546840-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-13339506-100x100.png b/StaticData/Images/Thumbnails/-13339506-100x100.png new file mode 100644 index 000000000..faea1cde6 Binary files /dev/null and b/StaticData/Images/Thumbnails/-13339506-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-13339506-22x22.png b/StaticData/Images/Thumbnails/-13339506-22x22.png new file mode 100644 index 000000000..30d43f3e5 Binary files /dev/null and b/StaticData/Images/Thumbnails/-13339506-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-13339506-256x256.png b/StaticData/Images/Thumbnails/-13339506-256x256.png new file mode 100644 index 000000000..d9e48eb0e Binary files /dev/null and b/StaticData/Images/Thumbnails/-13339506-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-1526684541-100x100.png b/StaticData/Images/Thumbnails/-1526684541-100x100.png new file mode 100644 index 000000000..d8e67070a Binary files /dev/null and b/StaticData/Images/Thumbnails/-1526684541-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-1526684541-18x18.png b/StaticData/Images/Thumbnails/-1526684541-18x18.png new file mode 100644 index 000000000..29a171230 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1526684541-18x18.png differ diff --git a/StaticData/Images/Thumbnails/-1526684541-256x256.png b/StaticData/Images/Thumbnails/-1526684541-256x256.png new file mode 100644 index 000000000..6dc382e60 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1526684541-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-1526684541-50x50.png b/StaticData/Images/Thumbnails/-1526684541-50x50.png new file mode 100644 index 000000000..74b6d3261 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1526684541-50x50.png differ diff --git a/StaticData/Images/Thumbnails/-1526684541-70x70.png b/StaticData/Images/Thumbnails/-1526684541-70x70.png new file mode 100644 index 000000000..4f7dddb9b Binary files /dev/null and b/StaticData/Images/Thumbnails/-1526684541-70x70.png differ diff --git a/StaticData/Images/Thumbnails/-1573341319-100x100.png b/StaticData/Images/Thumbnails/-1573341319-100x100.png new file mode 100644 index 000000000..ab281f04e Binary files /dev/null and b/StaticData/Images/Thumbnails/-1573341319-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-1573341319-22x22.png b/StaticData/Images/Thumbnails/-1573341319-22x22.png new file mode 100644 index 000000000..44a26b343 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1573341319-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-1573341319-256x256.png b/StaticData/Images/Thumbnails/-1573341319-256x256.png new file mode 100644 index 000000000..7e535c97f Binary files /dev/null and b/StaticData/Images/Thumbnails/-1573341319-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-1718598742-100x100.png b/StaticData/Images/Thumbnails/-1718598742-100x100.png new file mode 100644 index 000000000..4a40ebc06 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1718598742-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-1718598742-22x22.png b/StaticData/Images/Thumbnails/-1718598742-22x22.png new file mode 100644 index 000000000..99cece8df Binary files /dev/null and b/StaticData/Images/Thumbnails/-1718598742-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-1718598742-256x256.png b/StaticData/Images/Thumbnails/-1718598742-256x256.png new file mode 100644 index 000000000..15563986b Binary files /dev/null and b/StaticData/Images/Thumbnails/-1718598742-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-1814692685-100x100.png b/StaticData/Images/Thumbnails/-1814692685-100x100.png new file mode 100644 index 000000000..be78dc5ff Binary files /dev/null and b/StaticData/Images/Thumbnails/-1814692685-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-1814692685-22x22.png b/StaticData/Images/Thumbnails/-1814692685-22x22.png new file mode 100644 index 000000000..98f4c27c2 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1814692685-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-1814692685-256x256.png b/StaticData/Images/Thumbnails/-1814692685-256x256.png new file mode 100644 index 000000000..06345b149 Binary files /dev/null and b/StaticData/Images/Thumbnails/-1814692685-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-214995899-100x100.png b/StaticData/Images/Thumbnails/-214995899-100x100.png new file mode 100644 index 000000000..3c70903be Binary files /dev/null and b/StaticData/Images/Thumbnails/-214995899-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-214995899-22x22.png b/StaticData/Images/Thumbnails/-214995899-22x22.png new file mode 100644 index 000000000..1197e830e Binary files /dev/null and b/StaticData/Images/Thumbnails/-214995899-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-214995899-256x256.png b/StaticData/Images/Thumbnails/-214995899-256x256.png new file mode 100644 index 000000000..d3aa03f92 Binary files /dev/null and b/StaticData/Images/Thumbnails/-214995899-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-430322085-100x100.png b/StaticData/Images/Thumbnails/-430322085-100x100.png new file mode 100644 index 000000000..dad2782f8 Binary files /dev/null and b/StaticData/Images/Thumbnails/-430322085-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-430322085-22x22.png b/StaticData/Images/Thumbnails/-430322085-22x22.png new file mode 100644 index 000000000..b98e75bef Binary files /dev/null and b/StaticData/Images/Thumbnails/-430322085-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-430322085-256x256.png b/StaticData/Images/Thumbnails/-430322085-256x256.png new file mode 100644 index 000000000..8f675bb37 Binary files /dev/null and b/StaticData/Images/Thumbnails/-430322085-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-457173883-100x100.png b/StaticData/Images/Thumbnails/-457173883-100x100.png new file mode 100644 index 000000000..7cd54fd57 Binary files /dev/null and b/StaticData/Images/Thumbnails/-457173883-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-457173883-22x22.png b/StaticData/Images/Thumbnails/-457173883-22x22.png new file mode 100644 index 000000000..bbe95192a Binary files /dev/null and b/StaticData/Images/Thumbnails/-457173883-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-457173883-256x256.png b/StaticData/Images/Thumbnails/-457173883-256x256.png new file mode 100644 index 000000000..6324e72b2 Binary files /dev/null and b/StaticData/Images/Thumbnails/-457173883-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-547681469-100x100.png b/StaticData/Images/Thumbnails/-547681469-100x100.png new file mode 100644 index 000000000..669fadab4 Binary files /dev/null and b/StaticData/Images/Thumbnails/-547681469-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-547681469-22x22.png b/StaticData/Images/Thumbnails/-547681469-22x22.png new file mode 100644 index 000000000..d1c536d09 Binary files /dev/null and b/StaticData/Images/Thumbnails/-547681469-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-547681469-256x256.png b/StaticData/Images/Thumbnails/-547681469-256x256.png new file mode 100644 index 000000000..efd44bc9f Binary files /dev/null and b/StaticData/Images/Thumbnails/-547681469-256x256.png differ diff --git a/StaticData/Images/Thumbnails/-680553488-100x100.png b/StaticData/Images/Thumbnails/-680553488-100x100.png new file mode 100644 index 000000000..8cd3d2469 Binary files /dev/null and b/StaticData/Images/Thumbnails/-680553488-100x100.png differ diff --git a/StaticData/Images/Thumbnails/-680553488-22x22.png b/StaticData/Images/Thumbnails/-680553488-22x22.png new file mode 100644 index 000000000..bdcabef46 Binary files /dev/null and b/StaticData/Images/Thumbnails/-680553488-22x22.png differ diff --git a/StaticData/Images/Thumbnails/-680553488-256x256.png b/StaticData/Images/Thumbnails/-680553488-256x256.png new file mode 100644 index 000000000..20107d295 Binary files /dev/null and b/StaticData/Images/Thumbnails/-680553488-256x256.png differ diff --git a/StaticData/Images/Thumbnails/1262105247-100x100.png b/StaticData/Images/Thumbnails/1262105247-100x100.png new file mode 100644 index 000000000..2c1cb5e4a Binary files /dev/null and b/StaticData/Images/Thumbnails/1262105247-100x100.png differ diff --git a/StaticData/Images/Thumbnails/1262105247-22x22.png b/StaticData/Images/Thumbnails/1262105247-22x22.png new file mode 100644 index 000000000..ad4ded625 Binary files /dev/null and b/StaticData/Images/Thumbnails/1262105247-22x22.png differ diff --git a/StaticData/Images/Thumbnails/1262105247-256x256.png b/StaticData/Images/Thumbnails/1262105247-256x256.png new file mode 100644 index 000000000..0b67e737e Binary files /dev/null and b/StaticData/Images/Thumbnails/1262105247-256x256.png differ diff --git a/StaticData/Images/Thumbnails/1432943398-100x100.png b/StaticData/Images/Thumbnails/1432943398-100x100.png new file mode 100644 index 000000000..288a4da1f Binary files /dev/null and b/StaticData/Images/Thumbnails/1432943398-100x100.png differ diff --git a/StaticData/Images/Thumbnails/1432943398-18x18.png b/StaticData/Images/Thumbnails/1432943398-18x18.png new file mode 100644 index 000000000..70f431e4b Binary files /dev/null and b/StaticData/Images/Thumbnails/1432943398-18x18.png differ diff --git a/StaticData/Images/Thumbnails/1432943398-256x256.png b/StaticData/Images/Thumbnails/1432943398-256x256.png new file mode 100644 index 000000000..7907be097 Binary files /dev/null and b/StaticData/Images/Thumbnails/1432943398-256x256.png differ diff --git a/StaticData/Images/Thumbnails/1432943398-50x50.png b/StaticData/Images/Thumbnails/1432943398-50x50.png new file mode 100644 index 000000000..c580c1938 Binary files /dev/null and b/StaticData/Images/Thumbnails/1432943398-50x50.png differ diff --git a/StaticData/Images/Thumbnails/1432943398-70x70.png b/StaticData/Images/Thumbnails/1432943398-70x70.png new file mode 100644 index 000000000..ff262fc13 Binary files /dev/null and b/StaticData/Images/Thumbnails/1432943398-70x70.png differ diff --git a/StaticData/Images/Thumbnails/1734149335-100x100.png b/StaticData/Images/Thumbnails/1734149335-100x100.png new file mode 100644 index 000000000..3b2d7f6a7 Binary files /dev/null and b/StaticData/Images/Thumbnails/1734149335-100x100.png differ diff --git a/StaticData/Images/Thumbnails/1734149335-18x18.png b/StaticData/Images/Thumbnails/1734149335-18x18.png new file mode 100644 index 000000000..7c52b33ef Binary files /dev/null and b/StaticData/Images/Thumbnails/1734149335-18x18.png differ diff --git a/StaticData/Images/Thumbnails/1734149335-256x256.png b/StaticData/Images/Thumbnails/1734149335-256x256.png new file mode 100644 index 000000000..dfdf716ea Binary files /dev/null and b/StaticData/Images/Thumbnails/1734149335-256x256.png differ diff --git a/StaticData/Images/Thumbnails/1734149335-50x50.png b/StaticData/Images/Thumbnails/1734149335-50x50.png new file mode 100644 index 000000000..97222d9cd Binary files /dev/null and b/StaticData/Images/Thumbnails/1734149335-50x50.png differ diff --git a/StaticData/Images/Thumbnails/1734149335-70x70.png b/StaticData/Images/Thumbnails/1734149335-70x70.png new file mode 100644 index 000000000..e4c10f5fd Binary files /dev/null and b/StaticData/Images/Thumbnails/1734149335-70x70.png differ diff --git a/StaticData/Images/Thumbnails/2079226511-100x100.png b/StaticData/Images/Thumbnails/2079226511-100x100.png new file mode 100644 index 000000000..cd8873cbd Binary files /dev/null and b/StaticData/Images/Thumbnails/2079226511-100x100.png differ diff --git a/StaticData/Images/Thumbnails/2079226511-18x18.png b/StaticData/Images/Thumbnails/2079226511-18x18.png new file mode 100644 index 000000000..2060aad73 Binary files /dev/null and b/StaticData/Images/Thumbnails/2079226511-18x18.png differ diff --git a/StaticData/Images/Thumbnails/2079226511-256x256.png b/StaticData/Images/Thumbnails/2079226511-256x256.png new file mode 100644 index 000000000..62986b97b Binary files /dev/null and b/StaticData/Images/Thumbnails/2079226511-256x256.png differ diff --git a/StaticData/Images/Thumbnails/2079226511-50x50.png b/StaticData/Images/Thumbnails/2079226511-50x50.png new file mode 100644 index 000000000..8d751f2a2 Binary files /dev/null and b/StaticData/Images/Thumbnails/2079226511-50x50.png differ diff --git a/StaticData/Images/Thumbnails/2079226511-70x70.png b/StaticData/Images/Thumbnails/2079226511-70x70.png new file mode 100644 index 000000000..efc377b0d Binary files /dev/null and b/StaticData/Images/Thumbnails/2079226511-70x70.png differ diff --git a/StaticData/Images/Thumbnails/237213011-100x100.png b/StaticData/Images/Thumbnails/237213011-100x100.png new file mode 100644 index 000000000..196b64b88 Binary files /dev/null and b/StaticData/Images/Thumbnails/237213011-100x100.png differ diff --git a/StaticData/Images/Thumbnails/237213011-18x18.png b/StaticData/Images/Thumbnails/237213011-18x18.png new file mode 100644 index 000000000..a78e6e82b Binary files /dev/null and b/StaticData/Images/Thumbnails/237213011-18x18.png differ diff --git a/StaticData/Images/Thumbnails/237213011-256x256.png b/StaticData/Images/Thumbnails/237213011-256x256.png new file mode 100644 index 000000000..1404b8b9f Binary files /dev/null and b/StaticData/Images/Thumbnails/237213011-256x256.png differ diff --git a/StaticData/Images/Thumbnails/237213011-50x50.png b/StaticData/Images/Thumbnails/237213011-50x50.png new file mode 100644 index 000000000..17170acb1 Binary files /dev/null and b/StaticData/Images/Thumbnails/237213011-50x50.png differ diff --git a/StaticData/Images/Thumbnails/237213011-70x70.png b/StaticData/Images/Thumbnails/237213011-70x70.png new file mode 100644 index 000000000..555c2a1f3 Binary files /dev/null and b/StaticData/Images/Thumbnails/237213011-70x70.png differ diff --git a/StaticData/Images/Thumbnails/450151768-100x100.png b/StaticData/Images/Thumbnails/450151768-100x100.png new file mode 100644 index 000000000..7b2088933 Binary files /dev/null and b/StaticData/Images/Thumbnails/450151768-100x100.png differ diff --git a/StaticData/Images/Thumbnails/450151768-22x22.png b/StaticData/Images/Thumbnails/450151768-22x22.png new file mode 100644 index 000000000..35c780d4a Binary files /dev/null and b/StaticData/Images/Thumbnails/450151768-22x22.png differ diff --git a/StaticData/Images/Thumbnails/450151768-256x256.png b/StaticData/Images/Thumbnails/450151768-256x256.png new file mode 100644 index 000000000..3cb4beee7 Binary files /dev/null and b/StaticData/Images/Thumbnails/450151768-256x256.png differ diff --git a/StaticData/Images/Thumbnails/547584298-100x100.png b/StaticData/Images/Thumbnails/547584298-100x100.png new file mode 100644 index 000000000..d3b17ed00 Binary files /dev/null and b/StaticData/Images/Thumbnails/547584298-100x100.png differ diff --git a/StaticData/Images/Thumbnails/547584298-18x18.png b/StaticData/Images/Thumbnails/547584298-18x18.png new file mode 100644 index 000000000..c1a0d8d85 Binary files /dev/null and b/StaticData/Images/Thumbnails/547584298-18x18.png differ diff --git a/StaticData/Images/Thumbnails/547584298-256x256.png b/StaticData/Images/Thumbnails/547584298-256x256.png new file mode 100644 index 000000000..98148bcbb Binary files /dev/null and b/StaticData/Images/Thumbnails/547584298-256x256.png differ diff --git a/StaticData/Images/Thumbnails/547584298-50x50.png b/StaticData/Images/Thumbnails/547584298-50x50.png new file mode 100644 index 000000000..d0956d6c7 Binary files /dev/null and b/StaticData/Images/Thumbnails/547584298-50x50.png differ diff --git a/StaticData/Images/Thumbnails/547584298-70x70.png b/StaticData/Images/Thumbnails/547584298-70x70.png new file mode 100644 index 000000000..b460fc00a Binary files /dev/null and b/StaticData/Images/Thumbnails/547584298-70x70.png differ diff --git a/StaticData/Images/Thumbnails/716626541-100x100.png b/StaticData/Images/Thumbnails/716626541-100x100.png new file mode 100644 index 000000000..21702b336 Binary files /dev/null and b/StaticData/Images/Thumbnails/716626541-100x100.png differ diff --git a/StaticData/Images/Thumbnails/716626541-22x22.png b/StaticData/Images/Thumbnails/716626541-22x22.png new file mode 100644 index 000000000..afc1ed40e Binary files /dev/null and b/StaticData/Images/Thumbnails/716626541-22x22.png differ diff --git a/StaticData/Images/Thumbnails/716626541-256x256.png b/StaticData/Images/Thumbnails/716626541-256x256.png new file mode 100644 index 000000000..c1ca696b5 Binary files /dev/null and b/StaticData/Images/Thumbnails/716626541-256x256.png differ diff --git a/StaticData/Images/Thumbnails/815145829-100x100.png b/StaticData/Images/Thumbnails/815145829-100x100.png new file mode 100644 index 000000000..ae95c0501 Binary files /dev/null and b/StaticData/Images/Thumbnails/815145829-100x100.png differ diff --git a/StaticData/Images/Thumbnails/815145829-18x18.png b/StaticData/Images/Thumbnails/815145829-18x18.png new file mode 100644 index 000000000..c054531fc Binary files /dev/null and b/StaticData/Images/Thumbnails/815145829-18x18.png differ diff --git a/StaticData/Images/Thumbnails/815145829-256x256.png b/StaticData/Images/Thumbnails/815145829-256x256.png new file mode 100644 index 000000000..910de485f Binary files /dev/null and b/StaticData/Images/Thumbnails/815145829-256x256.png differ diff --git a/StaticData/Images/Thumbnails/815145829-50x50.png b/StaticData/Images/Thumbnails/815145829-50x50.png new file mode 100644 index 000000000..4c177a3b7 Binary files /dev/null and b/StaticData/Images/Thumbnails/815145829-50x50.png differ diff --git a/StaticData/Images/Thumbnails/815145829-70x70.png b/StaticData/Images/Thumbnails/815145829-70x70.png new file mode 100644 index 000000000..379aee683 Binary files /dev/null and b/StaticData/Images/Thumbnails/815145829-70x70.png differ diff --git a/StaticData/Images/Thumbnails/823080669-100x100.png b/StaticData/Images/Thumbnails/823080669-100x100.png new file mode 100644 index 000000000..df433fdbf Binary files /dev/null and b/StaticData/Images/Thumbnails/823080669-100x100.png differ diff --git a/StaticData/Images/Thumbnails/823080669-22x22.png b/StaticData/Images/Thumbnails/823080669-22x22.png new file mode 100644 index 000000000..ee1d23e30 Binary files /dev/null and b/StaticData/Images/Thumbnails/823080669-22x22.png differ diff --git a/StaticData/Images/Thumbnails/823080669-256x256.png b/StaticData/Images/Thumbnails/823080669-256x256.png new file mode 100644 index 000000000..b036fb720 Binary files /dev/null and b/StaticData/Images/Thumbnails/823080669-256x256.png differ