vmario
/
doodle3d-client
mirror of https://github.com/Doodle3D/doodle3d-client.git
0
0
Fork 0
Code Issues Releases Wiki Activity
489 Commits 8 Branches 37 Tags 2.6 MiB
Commit Graph

47 Commits

Author SHA1 Message Date
Wouter R 4a3da30ebd Log git/version information in web console (#305). 
The information is dynamically inserted when grunt is run.
 2016-04-23 17:36:35 +02:00
Rick Companje 95f5ce97b5 manage sketches and file manager 2014-12-17 09:45:40 +01:00
Rick Companje 3d99c146a0 added a button for importing photos for tracing by hand 2014-10-09 16:24:24 +02:00
peteruithoven 36d336663e Settings refactoring & JS file Reorganising 2014-02-04 11:00:32 +01:00
peteruithoven fcf966b2e3 Implementing enable disable in Button.js 
Removing global enableButton and disableButton
 2014-01-30 17:49:15 +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
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
peteruithoven 8b229c0aff More consistent button behaviour 2014-01-17 12:51:27 +01:00
peteruithoven bbed35d877 Generalized Popups 2014-01-16 21:30:57 +01:00
peteruithoven ab329aaaf1 VerticalShapes toggle button 2014-01-13 15:52:40 +01:00
peteruithoven f7fec0aec6 FadeIn popups and button groups 2014-01-10 14:04:36 +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 b978b5ada5 Integrated progressbar 2013-10-17 14:40:33 +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 e01175ed81 styles and html pertaining to the new Progressbar and Thermometer look and feel 2013-10-16 23:11:06 +02:00
peteruithoven 6419af4055 Using cgi-bin for network/openap and network/associate 2013-10-16 12:31:22 +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
peteruithoven abc9841bc7 Handling new print3d driver (using new api, printer states) 2013-10-11 12:39:05 +02:00
Adriaan Wormgoor 0a44087989 changes to how the draw and preview canvasses are positioned and initted 2013-10-11 11:42:27 +02:00
peteruithoven d417a7454f Better network connecting feedback 2013-10-10 12:12:33 +02:00
peteruithoven b6dca873e7 Use uhttpd lua handler 2013-10-02 14:47:33 +02:00
Wouter R a45d1ad8ed Bugfix for heatup change. 2013-09-27 16:04:56 +02:00
peteruithoven ce8e306994 Preventing OS X / iOS captive portal popup altogether 2013-09-25 19:01:08 +02:00
peteruithoven 80b4a53d5a Raw captive portal detected popup 2013-09-25 16:19:40 +02:00
Adriaan Wormgoor 267587fe2f vertical shapes implemented 2013-09-18 22:35:38 +02:00
peteruithoven a692976be6 Only preheat the first time the settings where saved 2013-09-18 18:56:57 +02:00
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