Commit Graph

236 Commits

Author SHA1 Message Date
peteruithoven c4ec82c9a7 Separating logic in network/status handler 2014-02-04 15:52:37 +01:00
peteruithoven 556fc0dd1e Removed separate client and ap mode state system 2014-02-04 15:26:43 +01:00
peteruithoven 4ef164fb17 Fixed inappropriate network mode switching #90 2014-02-04 14:36:10 +01:00
peteruithoven 6cac5fc6f5 Fixed can't find network.encryption javascript error 2014-02-04 14:35:30 +01:00
peteruithoven 1523ba3227 Refactored openap 2014-02-04 14:34:03 +01:00
peteruithoven 42e43c9a38 Using cgi-bin again for associate api call 2014-02-04 14:33:08 +01:00
peteruithoven 219bd190c0 Reenabled commented parts and small fixes 2014-02-04 14:18:50 +01:00
peteruithoven 59c26a6713 Less logging 2014-02-04 12:51:31 +01:00
peteruithoven 36d336663e Settings refactoring & JS file Reorganising 2014-02-04 11:00:32 +01:00
Wouter R 2427856be9 Fix bounds calculation of paths with coords >|9999|. 2014-02-02 02:43:33 +01:00
peteruithoven 98d836b321 Better fix for Button 2014-02-02 01:03:07 +01:00
peteruithoven 0b33b87009 Fixed Buttons 2014-02-02 00:37:05 +01:00
peteruithoven 6d71db1e84 By leaving Button's enabled undefined the enable / disabled are always executed the first time 2014-01-31 15:21:05 +01:00
peteruithoven 735cff2edd JSHinted 2014-01-31 14:34:44 +01:00
peteruithoven fcf966b2e3 Implementing enable disable in Button.js
Removing global enableButton and disableButton
2014-01-30 17:49:15 +01:00
peteruithoven 8ec5772f77 Implemented new button class #47 2014-01-30 15:45:03 +01:00
peteruithoven 8a4ab7c519 Only attempt preheat when printer is in idle mode and also preheat when new printer is connected 2014-01-27 13:19:20 +01:00
peteruithoven eef5307464 Using onButtonClick only (preventing double print call) #174 2014-01-20 13:28:33 +01:00
peteruithoven 58eec424df Less logging 2014-01-20 12:58:21 +01:00
Wouter R e1206f73d4 Fix loading of sketches for wordart. 2014-01-19 17:49:44 +01:00
Wouter R 304657a104 Reindent Svg.js. 2014-01-19 17:43:27 +01:00
peteruithoven 4185865289 Less logging 2014-01-18 17:45:23 +01:00
peteruithoven 7f5079d2cb Removed debug status message 2014-01-18 15:41:09 +01:00
Wouter R 92a28f54b8 Merge branch 'develop' of github.com:Doodle3D/doodle3d-client into develop 2014-01-17 18:04:40 +01:00
Wouter R de757cae0a Disable log messages in shape transform functions. 2014-01-17 18:03:42 +01:00
Wouter R 7288ac8b1e Change settings window to use popup handlers as well. 2014-01-17 17:59:26 +01:00
peteruithoven 679cf9b5a5 Check if there is preview slice image when doing redraw 2014-01-17 16:29:42 +01:00
peteruithoven 6dafeafa37 less logs 2014-01-17 16:29:42 +01:00
peteruithoven 577bc28bc9 Update preview bounds when move/zoom or rotate 2014-01-17 16:29:42 +01:00
Wouter R 74b9149175 Formatting of SettingsWindow.js. 2014-01-17 16:28:29 +01:00
Wouter R 5eb129d2a2 New event structure in Popup, shape and wordart popups now behave correctly.
Add copyright notice for wordart font.
2014-01-17 15:10:39 +01:00
Wouter R d634f2e9c3 Merge branch 'text-experiment' into develop
Conflicts:
	js/Help.js
	js/buttonbehaviors.js
	js/main.js
	js_src/Keyboard.js
	js_src/Shape.js
	js_src/verticalShapes.js
	www/index.html
2014-01-17 13:21:02 +01:00
Wouter R 032d6413f7 Merge branch 'text-experiment' of github.com:Doodle3D/doodle3d-client into text-experiment 2014-01-17 13:00:08 +01:00
peteruithoven 8b229c0aff More consistent button behaviour 2014-01-17 12:51:27 +01:00
Wouter R b25044d2d6 Bounds checking on all sketch transforms (WIP, there's still an issue with scaling up). 2014-01-17 12:37:54 +01:00
peteruithoven 88b711d1f3 Small tour code cleanup 2014-01-17 12:04:01 +01:00
Wouter R 1098c86dd5 Bounds checking in shape move/zoom (WIP).
More specific unbinding of popup key handlers.
2014-01-17 00:57:22 +01:00
Wouter R 06ff438119 Add keyword to draw calibration diamond.
Remove some unneeded log messages.
2014-01-17 00:21:29 +01:00
Wouter R 57c928f195 Add esc/enter support to cancel or accept popups. 2014-01-16 23:28:58 +01:00
peteruithoven bbed35d877 Generalized Popups 2014-01-16 21:30:57 +01:00
peteruithoven e9a2b90483 New Twist and Height buttons 2014-01-16 16:07:40 +01:00
peteruithoven 942d9d8bbf Enable enter key usage for tour again 2014-01-16 12:48:57 +01:00
peteruithoven 7d726f513e Turned logo into btn 2014-01-16 12:16:09 +01:00
peteruithoven fc8c83ae19 Turning popupMask in a Button 2014-01-16 12:05:27 +01:00
peteruithoven a952a1ee7b Disabling all click events after a touchStart 2014-01-16 12:05:27 +01:00
Wouter R c697806385 Silliness. 2014-01-15 20:16:46 +01:00
Wouter R e8c9932014 Prevent magnifying glass from appearing on iPad.
Cancel wordart on click/tap outside dialog popup.
2014-01-15 18:08:26 +01:00
Wouter R 97201587c0 Fix move/zoom/rotate buttons on android (both chrome and native browser).
Remove reference to undefined variable; remove unneeded log message.
2014-01-15 17:30:11 +01:00
Wouter R e125939db8 Fix direction of rotate buttons.
Ignore key presses with modifiers in order to not obstruct regular shortcuts.
2014-01-15 14:20:49 +01:00
peteruithoven 606f7cb359 Implemented Copse as new WordArt font 2014-01-15 13:49:38 +01:00
peteruithoven d68b9cbefc Edit menu 2014-01-13 18:04:51 +01:00
peteruithoven 01f28a2403 Edit button group 2014-01-13 16:38:26 +01:00
peteruithoven ab329aaaf1 VerticalShapes toggle button 2014-01-13 15:52:40 +01:00
peteruithoven d156dc9902 Added mouse position info link in comments 2014-01-10 17:23:58 +01:00
peteruithoven b2fd2a2f77 Cross platform & cross browser relative mouse position retrieval 2014-01-10 17:22:02 +01:00
peteruithoven 82b57def39 Cleanup 2014-01-10 17:21:43 +01:00
peteruithoven f7fec0aec6 FadeIn popups and button groups 2014-01-10 14:04:36 +01:00
peteruithoven 139e4ca6ae Cleanup 2014-01-10 14:04:17 +01:00
peteruithoven a4ad7d7198 Cleanup 2014-01-10 13:59:55 +01:00
Rick Companje 0ad800b021 removed files 2014-01-09 18:10:54 +01:00
Adriaan Wormgoor 4ec660fd74 overhaul of client files to 'www' dir. This dir will now as a 'bin' dir of sorts. Outside of the 'www' dir there will be old files, temp files and also shell scripts which support continuous compilation and minification of css and js files 2013-10-21 11:40:38 +02:00
Adriaan Wormgoor 66271c5287 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Small css tweak
  Messages! Showing info about buffering, connection to wifibox and printer
  Leave warning while sending
  Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings
  Added network reconnect hint
  Integrated progressbar
  Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved

Conflicts:
	css/styles.min.css
	js/main.js
2013-10-21 10:39:21 +02:00
Adriaan Wormgoor 524643e28a clearfix fix for progressguage and thermometer layouting 2013-10-21 10:28:04 +02:00
peteruithoven 10724b1746 Messages! Showing info about buffering, connection to wifibox and printer 2013-10-18 19:11:10 +02:00
peteruithoven 46d2ae4bfc Leave warning while sending 2013-10-18 16:38:20 +02:00
peteruithoven 5ceabf41ba Added heatup in startgcode and replace {printingTemp} and {preheatTemp} for settings 2013-10-18 15:55:11 +02:00
peteruithoven 10ca22d7e9 Added network reconnect hint 2013-10-18 13:23:50 +02:00
peteruithoven b978b5ada5 Integrated progressbar 2013-10-17 14:40:33 +02:00
peteruithoven 53e8ccc294 Save settings before connect to network / create access point and display validation errors and only close settings when settings are saved 2013-10-17 14:09:13 +02:00
Adriaan Wormgoor b2191217cb better margins for thermo and progress 2013-10-16 23:32:50 +02:00
Adriaan Wormgoor b89f2385b8 removed debug-method (thermo and progress (dis)appearing) 2013-10-16 23:20:13 +02:00
Adriaan Wormgoor 5c9c8c8e8c Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Check gcode generation feasibility check to prevent iPad/iPhone crashes
  Removing confirm
  stop status checks on override and start them again when there is a first response
  reset the status check when printer state is overruled
2013-10-16 23:11:13 +02:00
Adriaan Wormgoor e01175ed81 styles and html pertaining to the new Progressbar and Thermometer look and feel 2013-10-16 23:11:06 +02:00
peteruithoven ff14078d46 Check gcode generation feasibility check to prevent iPad/iPhone crashes 2013-10-16 22:25:15 +02:00
peteruithoven b1ded5d41b Removing confirm 2013-10-16 18:32:24 +02:00
peteruithoven d5aef3bf95 stop status checks on override and start them again when there is a first response 2013-10-16 18:27:17 +02:00
peteruithoven 9ab36d999e reset the status check when printer state is overruled 2013-10-16 18:27:17 +02:00
Adriaan Wormgoor b32f6d8c61 Class for Progressbar 2013-10-16 15:57:30 +02:00
peteruithoven 828a6a3b0a new extruder algorithm and retrieving gcodestart and end from settings 2013-10-16 14:28:19 +02:00
peteruithoven 6419af4055 Using cgi-bin for network/openap and network/associate 2013-10-16 12:31:22 +02:00
peteruithoven 50cb44b865 Wait for heating 2013-10-16 12:30:36 +02:00
peteruithoven 51e4394491 Slight delay for gcode generation so that display is updated first. Hide stop untill gcode is send completely. 2013-10-14 18:51:37 +02:00
Wouter R e29dd1576c Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into HEAD 2013-10-14 17:47:33 +02:00
Wouter R 356630e7ba NOTE: hack! this is temporary.
Hide stop button after print is started, until gcode sending is completed (to prevent sending gcode after stopping).
2013-10-14 17:46:55 +02:00
peteruithoven 9fb9ee2bc4 More robust state override 2013-10-14 17:42:23 +02:00
Wouter R 07fa1f62e8 NOTE: this commit is temporary and should be reverted!
Add confirmation dialog when stop print button is pressed.
Add modal alert when print is started to prevent repeated clicking of button (which in turn corrupts gcode buffering).
Change preheat M109 to M104 to speed up printing cycle.
2013-10-14 16:40:48 +02:00
peteruithoven bd341d6ff7 Also send next gcode part when buffering 2013-10-14 15:09:06 +02:00
peteruithoven f84b1639d5 Stop sending print parts when print is stopped 2013-10-14 14:55:22 +02:00
peteruithoven 399c55f84f Only send a start argument with api:printer/print on the first send 2013-10-12 17:46:15 +02:00
peteruithoven af325f4bd3 Remove event handler from stop butten when disabled 2013-10-12 17:30:44 +02:00
Adriaan Wormgoor 12337f6ceb in debugmode, canvas should be manipulable through touch 2013-10-12 15:34:57 +02:00
Adriaan Wormgoor 613be4e619 fixed Firefox layouting issue of settings popup 2013-10-11 23:33:19 +02:00
Adriaan Wormgoor 632a0a0895 ..removed too much 2013-10-11 18:42:33 +02:00
Adriaan Wormgoor aea89d3422 - fixed canvasdrawing bug w.r.t. touch-enabled devices
- removed some superfluous lines
2013-10-11 18:40:03 +02:00
Adriaan Wormgoor 53e9a7e4a4 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Readded print and stop button disabled css
  hasControl feedback
2013-10-11 18:00:17 +02:00
Adriaan Wormgoor fe53e31c27 removed unnecessary files, but moreover fixed a bug which was badly affecting the settings popup 2013-10-11 18:00:10 +02:00
peteruithoven 253561210d hasControl feedback 2013-10-11 16:18:41 +02:00
Adriaan Wormgoor d61b9cb0d8 Merge branch 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client into feature/printerdriver
# By peteruithoven
# Via peteruithoven
* 'feature/printerdriver' of https://github.com/Doodle3D/doodle3d-client:
  Fixing double printer.print call
  Starting print right away, remove some target temp display hacks
2013-10-11 15:44:22 +02:00
peteruithoven 8ff028dce1 Fixing double printer.print call 2013-10-11 15:34:18 +02:00
peteruithoven 1c930efdf5 Starting print right away, remove some target temp display hacks 2013-10-11 15:34:18 +02:00