0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-12-23 05:33:49 +01:00
Commit Graph

131 Commits

Author SHA1 Message Date
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
Adriaan Wormgoor
88c6845592 some js files were postfixed with version numbers (eg. v01, v02, etc), but this is bullshit from source control perspective, hence removed the postfixes 2013-10-11 15:06:32 +02:00
Adriaan Wormgoor
58b3a12c6b massive commit due to merging branch 'new_layouting_approach' into feature/printerdriver
----------------------------------------------------------------------

Merge branch 'new_layouting_approach' into feature/printerdriver

* new_layouting_approach: (22 commits)
  changed chmod
  adjustments to make preview be initialized and updated better (when resizing)
  updates css styles
  changes to how the draw and preview canvasses are positioned and initted
  many updates CSS and LESS files and generally a responsive scaling overhaul of the settings page
  new LESS
  simple js lib for managing the folded in/out state of the sidebars on the minimal interface
  arrow file used in the minimal doodle3d interface
  the resulting css files which LESS outputs
  removed this because it's being rolled into the styles.css by LESS
  moved logos to their own dir + removed a few redundant ones
  copy normalize.css to the LESS dir since it's a source file
  smallest size of the doodle3d logo
  started using LESS for stylesheeting
  commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch)
  a lot of changes -> almost there but the drawing is not consistent yet across devices. Drawing on the draw canvas is going OK but the preview is not drawing well now. Giving up for now.
  changes (sry)
  intermediary progress
  commented out part of the css (not final solution)
  added todo for future
  ...
2013-10-11 15:02:26 +02:00
Adriaan Wormgoor
759616a8d4 changed chmod 2013-10-11 14:07:15 +02:00
Adriaan Wormgoor
080cc5670c adjustments to make preview be initialized and updated better (when resizing) 2013-10-11 13:42:12 +02:00
peteruithoven
abc9841bc7 Handling new print3d driver (using new api, printer states) 2013-10-11 12:39:05 +02:00