0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-29 11:54:55 +01:00
Commit Graph

16 Commits

Author SHA1 Message Date
Adriaan Wormgoor
aee5fecb88 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach
# By Adriaan Wormgoor (6) and peteruithoven (4)
# Via Adriaan Wormgoor (2) and peteruithoven (2)
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  objectHeight and twist fix and temp display fix
  minor repositioning of temp-guage so that it doesn't overlap with the info-button
  gcode generated twist now complies with the doodle preview
  made the 'ok' button have a mouseover 'hand' cursor
  commented out call to missing setPrintprogress()
  removed wrong unit in settings
  Removed unused draw logic
  additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV
  new favicon (for Firefox)
  a few new favicons and homescreen icons

Conflicts:
	js/Thermometer.js
	js/gcodeGenerating_v01.js
2013-09-18 17:44:26 +02:00
Adriaan Wormgoor
066eb182f0 intermediary progress 2013-09-18 16:02:51 +02:00
Adriaan Wormgoor
82165c585b additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV 2013-09-18 10:57:46 +02:00
Adriaan Wormgoor
6eddb1835c first implementation of different layouting. Doesn't work well yet.. 2013-09-18 10:46:36 +02:00
Adriaan Wormgoor
95bedd09f1 Thermometer class plus the changes necessary to implement it 2013-09-17 13:08:52 +02:00
Adriaan Wormgoor
edf24d45d2 - additional items added to the settings array (which is set from wifibox)
- gcode generation takes more settings from that settings array (making gcode generation more configurable by the user)
2013-09-07 16:06:59 +02:00
peteruithoven
c15c023829 Settings refactoring 2013-08-27 15:34:28 +02:00
Adriaan Wormgoor
69df58c054 Updated preview rendering. onMouseUp / onTouchEnd the preview is now cached to an Image() object (image/png) (via a proxy Canvas element (id='preview_tmp') and used to draw the preview. This allows for much faster move up/down and twist left/right behavior. 2013-08-21 17:37:20 +02:00
peteruithoven
5c7e226caf wifiboxIsRemote default to false 2013-08-20 10:55:08 +02:00
peteruithoven
96e14615c8 fixed isRemote mode. Pressing stop button brings interface directly in IDLE mode. 2013-08-19 17:55:01 +02:00
Adriaan Wormgoor
62689b007c temp rollback to fix the iPad freaking out onOrientationChange event 2013-08-16 23:10:05 +02:00
Adriaan Wormgoor
65fbe62e6b Now looks for querystring variables which allow us to control Doodle3D's behavior, such as disabling the attempt to communicatie with the wifibox or disabling printcommands (i.e.: debug stuff and such). 2013-08-16 22:28:58 +02:00
peteruithoven
c6818eae45 oops 2013-08-09 22:36:18 +02:00
peteruithoven
85d91a2f36 Checking printing progress and disabling/enabling print and stop buttons
Cleaning up a bit of the mess
2013-08-09 22:25:14 +02:00
peteruithoven
de8af029c5 Simpler settings window layout 2013-08-08 00:22:23 +02:00
peteruithoven
6df5e255c2 Basic feedback and more control
Display temperature
Only show temperature when connected with printer
Move index.html javascript to main.js
stop button (Still having issues in firmware)
OOP style printer control
Added a proxy.php file to forward cross domain posts and get's. (should
not be necessary)
2013-08-07 20:47:47 +02:00