Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional Thumbnail Support #601

Merged
merged 5 commits into from
Apr 27, 2020
Merged

Additional Thumbnail Support #601

merged 5 commits into from
Apr 27, 2020

Conversation

jneilliii
Copy link
Contributor

Changes necessary to support both PrusaSlicerThumbnails and UltimakerFormatPackage plugin's extracted thumbnails, resolves #566

Copy link
Owner

@UnchartedBull UnchartedBull left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just some minor style changes :)

src/app/files.service.ts Outdated Show resolved Hide resolved
src/app/files.service.ts Outdated Show resolved Hide resolved
src/app/files/files.component.html Outdated Show resolved Hide resolved
src/app/octoprint-api/filesAPI.ts Outdated Show resolved Hide resolved
jneilliii and others added 4 commits April 27, 2020 17:19
Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>
Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>
Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>
@jneilliii jneilliii requested a review from UnchartedBull April 27, 2020 21:31
@jneilliii
Copy link
Contributor Author

Requested changes committed and verified working, thanks for the pointer on that string/array thing.

Copy link
Owner

@UnchartedBull UnchartedBull left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@UnchartedBull UnchartedBull merged commit 898e242 into UnchartedBull:master Apr 27, 2020
UnchartedBull added a commit that referenced this pull request May 15, 2020
* Additional Thumbnail Support (#601)

* Changes necessary to support both PrusaSlicerThumbnails and UltimakerFormatPackage plugin's extracted thumbnails

* Update src/app/files/files.component.html

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* Update src/app/files.service.ts

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* Update src/app/files.service.ts

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* change to string for thumbnail

Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

* Bump electron from 8.2.3 to 8.2.4 (#602)

* Properly handle Connection Errors (#569)

* ignore first 500 error

* properly check for connection errors

* check against connecting state as well

* Bump @angular/language-service from 9.1.3 to 9.1.4 (#604)

* Bump @angular/cli from 9.1.3 to 9.1.4 (#605)

* Bump @angular-devkit/build-angular from 0.901.3 to 0.901.4 (#606)

* Bump electron from 8.2.4 to 8.2.5 (#608)

* Bump electron-builder from 22.5.1 to 22.6.0 (#603)

* Bump ts-node from 8.9.1 to 8.10.0 (#611)

* Bump ts-node from 8.10.0 to 8.10.1 (#612)

* Bump wait-on from 4.0.2 to 5.0.0 (#618)

* Bump @types/node from 13.13.4 to 13.13.5 (#619)

* Bump tslib from 1.11.1 to 1.11.2 (#621)

* Bump @angular/language-service from 9.1.4 to 9.1.5 (#626)

* Bump @angular/language-service from 9.1.5 to 9.1.6 (#628)

* Bump @angular/cli from 9.1.4 to 9.1.5 (#629)

* Bump @angular-devkit/build-angular from 0.901.4 to 0.901.5 (#630)

* Bump tslib from 1.11.2 to 1.12.0 (#632)

* Bump @types/node from 13.13.5 to 14.0.0 (#634)

* Bump @types/node from 14.0.0 to 14.0.1 (#635)

* Bump @angular/language-service from 9.1.6 to 9.1.7 (#636)

* Bump tslib from 1.12.0 to 1.13.0 (#637)

* Bump @angular/cli from 9.1.5 to 9.1.6 (#638)

* Bump electron from 8.2.5 to 8.3.0 (#641)

* Bump @angular-devkit/build-angular from 0.901.5 to 0.901.6 (#639)

* Filament Change Process (#642)

* basic pagination

* styling filament list

* load spools from FilamentManager

* spool list almost done, some regex issues

* Finished Spool Listing

* Started working on heating screen

* finish page 2 design

* update config for extruder speed

* add config parameter + update initial setup screen

* progress on page 2

* finish filament unload

* finished screen 3

* finish page 4 design

* finish page 5 styling

* some fixes

* starting to add functionality

* Should be all working now

* make extruder movements works

* some fixes

* Add settings

* naming and default values

* CodeFactor issues

* disable extruder after unloading filament

* Bump @types/lodash from 4.14.150 to 4.14.151 (#644)

* working (#643)

* Update README

* 1.5.0

* Update Changelog

* fix config error

Co-authored-by: jneilliii <jneilliii+github@gmail.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
UnchartedBull added a commit that referenced this pull request Aug 20, 2020
* starting the website

* more cleanup, add screenshots, installation

* add supported plugins

* Add tips and tricks

* Finish up design so far

* move style sheets

* merge master (#645)

* Additional Thumbnail Support (#601)

* Changes necessary to support both PrusaSlicerThumbnails and UltimakerFormatPackage plugin's extracted thumbnails

* Update src/app/files/files.component.html

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* Update src/app/files.service.ts

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* Update src/app/files.service.ts

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* change to string for thumbnail

Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

* Bump electron from 8.2.3 to 8.2.4 (#602)

* Properly handle Connection Errors (#569)

* ignore first 500 error

* properly check for connection errors

* check against connecting state as well

* Bump @angular/language-service from 9.1.3 to 9.1.4 (#604)

* Bump @angular/cli from 9.1.3 to 9.1.4 (#605)

* Bump @angular-devkit/build-angular from 0.901.3 to 0.901.4 (#606)

* Bump electron from 8.2.4 to 8.2.5 (#608)

* Bump electron-builder from 22.5.1 to 22.6.0 (#603)

* Bump ts-node from 8.9.1 to 8.10.0 (#611)

* Bump ts-node from 8.10.0 to 8.10.1 (#612)

* Bump wait-on from 4.0.2 to 5.0.0 (#618)

* Bump @types/node from 13.13.4 to 13.13.5 (#619)

* Bump tslib from 1.11.1 to 1.11.2 (#621)

* Bump @angular/language-service from 9.1.4 to 9.1.5 (#626)

* Bump @angular/language-service from 9.1.5 to 9.1.6 (#628)

* Bump @angular/cli from 9.1.4 to 9.1.5 (#629)

* Bump @angular-devkit/build-angular from 0.901.4 to 0.901.5 (#630)

* Bump tslib from 1.11.2 to 1.12.0 (#632)

* Bump @types/node from 13.13.5 to 14.0.0 (#634)

* Bump @types/node from 14.0.0 to 14.0.1 (#635)

* Bump @angular/language-service from 9.1.6 to 9.1.7 (#636)

* Bump tslib from 1.12.0 to 1.13.0 (#637)

* Bump @angular/cli from 9.1.5 to 9.1.6 (#638)

* Bump electron from 8.2.5 to 8.3.0 (#641)

* Bump @angular-devkit/build-angular from 0.901.5 to 0.901.6 (#639)

* Filament Change Process (#642)

* basic pagination

* styling filament list

* load spools from FilamentManager

* spool list almost done, some regex issues

* Finished Spool Listing

* Started working on heating screen

* finish page 2 design

* update config for extruder speed

* add config parameter + update initial setup screen

* progress on page 2

* finish filament unload

* finished screen 3

* finish page 4 design

* finish page 5 styling

* some fixes

* starting to add functionality

* Should be all working now

* make extruder movements works

* some fixes

* Add settings

* naming and default values

* CodeFactor issues

* disable extruder after unloading filament

* Bump @types/lodash from 4.14.150 to 4.14.151 (#644)

* working (#643)

* Update README

* 1.5.0

* Update Changelog

* fix config error

Co-authored-by: jneilliii <jneilliii+github@gmail.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* update to match wiki

* Update FAQ

* fixed some issue with mobile devices

* Language + Formatting

* update images

* [CodeFactor] Apply fixes

* Codefactor

Co-authored-by: jneilliii <jneilliii+github@gmail.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: codefactor-io <support@codefactor.io>
kantlivelong pushed a commit to kantlivelong/OctoDash that referenced this pull request May 5, 2021
* starting the website

* more cleanup, add screenshots, installation

* add supported plugins

* Add tips and tricks

* Finish up design so far

* move style sheets

* merge master (UnchartedBull#645)

* Additional Thumbnail Support (UnchartedBull#601)

* Changes necessary to support both PrusaSlicerThumbnails and UltimakerFormatPackage plugin's extracted thumbnails

* Update src/app/files/files.component.html

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* Update src/app/files.service.ts

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* Update src/app/files.service.ts

Co-Authored-By: Timon G. <timon.gaebelein@icloud.com>

* change to string for thumbnail

Co-authored-by: Timon G. <timon.gaebelein@icloud.com>

* Bump electron from 8.2.3 to 8.2.4 (UnchartedBull#602)

* Properly handle Connection Errors (UnchartedBull#569)

* ignore first 500 error

* properly check for connection errors

* check against connecting state as well

* Bump @angular/language-service from 9.1.3 to 9.1.4 (UnchartedBull#604)

* Bump @angular/cli from 9.1.3 to 9.1.4 (UnchartedBull#605)

* Bump @angular-devkit/build-angular from 0.901.3 to 0.901.4 (UnchartedBull#606)

* Bump electron from 8.2.4 to 8.2.5 (UnchartedBull#608)

* Bump electron-builder from 22.5.1 to 22.6.0 (UnchartedBull#603)

* Bump ts-node from 8.9.1 to 8.10.0 (UnchartedBull#611)

* Bump ts-node from 8.10.0 to 8.10.1 (UnchartedBull#612)

* Bump wait-on from 4.0.2 to 5.0.0 (UnchartedBull#618)

* Bump @types/node from 13.13.4 to 13.13.5 (UnchartedBull#619)

* Bump tslib from 1.11.1 to 1.11.2 (UnchartedBull#621)

* Bump @angular/language-service from 9.1.4 to 9.1.5 (UnchartedBull#626)

* Bump @angular/language-service from 9.1.5 to 9.1.6 (UnchartedBull#628)

* Bump @angular/cli from 9.1.4 to 9.1.5 (UnchartedBull#629)

* Bump @angular-devkit/build-angular from 0.901.4 to 0.901.5 (UnchartedBull#630)

* Bump tslib from 1.11.2 to 1.12.0 (UnchartedBull#632)

* Bump @types/node from 13.13.5 to 14.0.0 (UnchartedBull#634)

* Bump @types/node from 14.0.0 to 14.0.1 (UnchartedBull#635)

* Bump @angular/language-service from 9.1.6 to 9.1.7 (UnchartedBull#636)

* Bump tslib from 1.12.0 to 1.13.0 (UnchartedBull#637)

* Bump @angular/cli from 9.1.5 to 9.1.6 (UnchartedBull#638)

* Bump electron from 8.2.5 to 8.3.0 (UnchartedBull#641)

* Bump @angular-devkit/build-angular from 0.901.5 to 0.901.6 (UnchartedBull#639)

* Filament Change Process (UnchartedBull#642)

* basic pagination

* styling filament list

* load spools from FilamentManager

* spool list almost done, some regex issues

* Finished Spool Listing

* Started working on heating screen

* finish page 2 design

* update config for extruder speed

* add config parameter + update initial setup screen

* progress on page 2

* finish filament unload

* finished screen 3

* finish page 4 design

* finish page 5 styling

* some fixes

* starting to add functionality

* Should be all working now

* make extruder movements works

* some fixes

* Add settings

* naming and default values

* CodeFactor issues

* disable extruder after unloading filament

* Bump @types/lodash from 4.14.150 to 4.14.151 (UnchartedBull#644)

* working (UnchartedBull#643)

* Update README

* 1.5.0

* Update Changelog

* fix config error

Co-authored-by: jneilliii <jneilliii+github@gmail.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* update to match wiki

* Update FAQ

* fixed some issue with mobile devices

* Language + Formatting

* update images

* [CodeFactor] Apply fixes

* Codefactor

Co-authored-by: jneilliii <jneilliii+github@gmail.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: codefactor-io <support@codefactor.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Display preview images from Prusaslicer gcode
2 participants