Commit graph

38 commits

Author SHA1 Message Date
Gina Häußge
dae1c0367a Merge branch 'daprice-sorting_persistence' into devel
Conflicts:
	octoprint/static/js/ui.js
2013-03-03 19:38:26 +01:00
Gina Häußge
9b3fc0c65e Set default instance name to empty string 2013-03-03 16:57:35 +01:00
Dale Price
eecb19ecf6 store file sorting options in the browser's LocalStorage 2013-03-02 22:56:58 -06:00
Gina Häußge
766e9f0e7f Show custom title first in head in case of small tabs 2013-03-02 13:38:30 +01:00
Gina Häußge
e0b405054a Fixed some whitespace and reworked custom title to always include an "OctoPrint" prefix (gotta protect the "brand" here ;)) 2013-03-02 12:42:35 +01:00
Richard Mitchell
260606601d Title and limited color control via settings 2013-03-02 10:56:32 +00:00
Richard Mitchell
b2408c92a5 Didn't add the restart button after all 2013-03-01 21:57:13 +00:00
Richard Mitchell
324601dfed Did clever stuff at first for restart but replacing the appearance of start is all that is needed I believe 2013-03-01 21:52:15 +00:00
Gina Häußge
899d618efe Couple of fixes while merging... 2013-02-23 22:46:29 +01:00
Richard Mitchell
0e6fd2bde2 Merge remote-tracking branch 'upstream/devel' into devel 2013-02-23 18:40:28 +00:00
Richard Mitchell
e79aede3f4 Bug in bootstrap forcing use of knockout click binding - actually works better 2013-02-23 18:38:18 +00:00
Richard Mitchell
8a3df3d4e7 Easier than I thought to add/remove temperature profiles 2013-02-23 17:59:27 +00:00
Richard Mitchell
9ba88a7d1a New temperature profile settings and hooked into ui. WIP: add and remove profiles 2013-02-23 17:47:01 +00:00
Gina Häußge
2e766a7eca Added custom controls with multiple commands
Closes #48
2013-02-23 18:08:59 +01:00
Richard Mitchell
9e351339a4 Added features for quick setting of temperatures for PLA and ABS - configured via new settings.
Not perfect, I'd like to show temperature to be set in UI.
On clicking it always moves to the top of the page.
The overflow and temp layout changes are to allow the drop down to display outside of the tab.

Is it worth having more temp boxes e.g. Nylon? - array like similar to move speeds?
2013-02-23 01:09:30 +00:00
Gina Häußge
1c4203b708 Added settings dialog for configuring OctoPrint
Warning: Many settings will need a restart of OctoPrint to take effect, adding corresponding notes is still a TODO. There's also no proper validation and error handling yet, so use at your own risk.
2013-02-17 22:30:34 +01:00
Gina Häußge
bd68e0ae54 Added sorting and filtering options for gcode files.
Closes #21
2013-02-10 21:48:24 +01:00
Richard Mitchell
4035ebcec5 Various control for jogging, speed reduced 2013-02-10 16:00:47 +00:00
Gina Häußge
8c9c2ecfee Added extrusion controls, kept motor and fan controls in general control area as suggested (recurring demand suggests that they definitely aren't something to be added by anyone individually via custom controls), made custom controls always position themselves below the general stuff. 2013-02-10 00:40:06 +01:00
Gina Häußge
5f55ebd90a GCode file list now automatically switches to page with newly uploaded file as soon as upload request comes back from backend as finished. Progress bar also gets emptied again then. Careful: might take a bit after the upload progress reaches 100% since the file still has to be written to disk in the backend (have to look into how to get this done in a streaming way), metadata analysis gets triggered after returning a response.
Different sorting options are still on my mental todo list ;)

Closes #34.
2013-02-04 22:24:32 +01:00
Gina Häußge
3de0d1b1e5 Fixed file deletion for gcode files 2013-02-04 21:41:02 +01:00
Gina Häußge
959feba9ca First version with gcode viewer integration.
Did some minor changes: renamed gcode tab, renamed gcode file download endpoint, added some margin for gcode viewer accordion. Not sure yet what to do about the gcode viewer controls/settings, until I figure this out they'll stay where they are now ,)
2013-02-03 22:01:11 +01:00
Gina Häußge
ea52bbfb14 Merge branch 'gcodeViewer' into devel
Conflicts:
	octoprint/server.py
	octoprint/settings.py
	octoprint/static/js/ui.js
2013-02-03 21:38:00 +01:00
Gina Häußge
6fd0646128 Revamped gcode analysis.
Now UI and backend take data from saved metadata (if available). Metadata gets written after file upload and also on startup (for files that have not been added yet). Gcode analysis is interrupted if a printjob is started and resumed when it ends. Frontend is notified when new metadata comes available and UI triggers reload of gcode file list.  Also started on implementing proper logging.
2013-02-03 21:14:22 +01:00
Alex Ustyantsev
1b70801a6b Fixed some residual stuff after rebase 2013-02-03 12:44:41 +03:00
Alex Ustyantsev
4163d9436f Some cleanup from initial integration: removed separate icon for viewing gcode 2013-02-03 12:05:45 +03:00
Alex Ustyantsev
e49669430b gCodeVisualizer can be enabled as a feature in config now (enabled by
default)
2013-02-03 12:04:41 +03:00
Alex Ustyantsev
644e5907ec Auto-load file on connect; some refactoring 2013-02-03 12:02:41 +03:00
Alex Ustyantsev
4b69bde8bb Initial implementation of autoupdate gcodeview on status from server 2013-02-03 12:02:41 +03:00
Alex Ustyantsev
7c00dd5594 Initial gCodeViewer (http://github.com/hudbrog/gCodeViewer) integration 2013-02-03 12:01:01 +03:00
Gina Häußge
49cd1ffbd6 Gcode filemanagement now lives in its own module. Upload triggers gcode analysis, result is stored into metadata file. Print jobs triggered and their results are saved as well. Adjusted UI to display gcode analysis result and last print date and (color coded) result if available. Also adjusted gcode file list to color code entries according to last print result. 2013-01-30 20:56:17 +01:00
Gina Häußge
84c9403e65 parametrized_command => parametric_command 2013-01-27 18:52:25 +01:00
Gina Häußge
ee7a1f9615 Added custom controls via configuration file.
Closes #13
2013-01-27 18:28:11 +01:00
Gina Häußge
0552d43b16 Further work on custom controls and custom bitrate for timelapses 2013-01-27 11:12:28 +01:00
Gina Häußge
01ffd88a37 Use UTC timestamps only for the temperature graph. Should get rid of weird timestamps in case server and client are in a different timezone.
Also fixed the "display minutes since the epoch when not connected to a freshly started server" issue ;)
2013-01-22 17:44:20 +01:00
Gina Häußge
ca3c973bfc Added checkbox to enable autoscroll in the terminal tab. 2013-01-20 14:34:44 +01:00
Gina Häußge
1e77467a41 Added pagination for gcode files. 2013-01-20 13:43:29 +01:00
Gina Häußge
720f3b3eb6 Renamed from Printer WebUI to OctoPrint
The location of the config folder has changed. OctoPrint will try to migrate the configuration from its old location (~/.printerwebui, ...) to its new one (~/.octoprint, ...). For this to work the following conditions must be met: 1) the old config folder exists and is a directory 2) the new config folder does not exist at all. The migration functionality will be in the future.
2013-01-18 23:44:11 +01:00
Renamed from printer_webui/static/js/ui.js (Browse further)