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

42 Commits

Author SHA1 Message Date
Adriaan Wormgoor 8311fdd9c1 vertical shapes sidebar now auto-resizes as well 2013-10-12 12:13:33 +02:00
Adriaan Wormgoor 613be4e619 fixed Firefox layouting issue of settings popup 2013-10-11 23:33:19 +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 7126f1db79 Readded print and stop button disabled css 2013-10-11 16:18:41 +02:00
Adriaan Wormgoor 8f5a2f7664 minor updates. 2013-10-11 15:08:50 +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 65f43f197f updates css styles 2013-10-11 11:44:28 +02:00
Adriaan Wormgoor b6f77fc39e many updates CSS and LESS files and generally a responsive scaling overhaul of the settings page 2013-10-10 19:18:29 +02:00
Adriaan Wormgoor a38535ecd1 the resulting css files which LESS outputs 2013-10-09 18:52:54 +02:00
Adriaan Wormgoor 1e646caef0 removed this because it's being rolled into the styles.css by LESS 2013-10-09 18:50:11 +02:00
Adriaan Wormgoor dd2ca8a1cb commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch) 2013-09-27 18:15:33 +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
Adriaan Wormgoor 44f3895d34 small change to make settings page appear directly over the d3d interface 2013-09-18 20:43:00 +02:00
Adriaan Wormgoor fdfaafd99d simple code changes. Border around D3D interface makes slightly more sense. 2013-09-18 20:17:25 +02:00
Adriaan Wormgoor 6e32a36e12 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.
 2013-09-18 19:08:58 +02:00
Adriaan Wormgoor c51107a275 changes (sry) 2013-09-18 17:45:02 +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 5a45d1f3b5 minor repositioning of temp-guage so that it doesn't overlap with the info-button 2013-09-18 16:19:06 +02:00
Adriaan Wormgoor 066eb182f0 intermediary progress 2013-09-18 16:02:51 +02:00
Adriaan Wormgoor f6fd05113a made the 'ok' button have a mouseover 'hand' cursor 2013-09-18 12:06:47 +02:00
Adriaan Wormgoor bd83fc42f8 commented out part of the css (not final solution) 2013-09-18 12:04:53 +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 7bd05d4f1f Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Network ui
 2013-09-06 11:03:50 +02:00
peteruithoven 200052dae0 Network ui 2013-09-02 18:07:22 +02:00
Adriaan Wormgoor 44c46b47b8 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client 
# By peteruithoven (3) and Wouter R (1)
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Properly reading all the values from the form when saving
  Settings improvements
  Settings refactoring
  Add redirect.html (only used as 404 page in captive portal mode).
 2013-08-30 09:52:28 +02:00
Adriaan Wormgoor 76946d724e minor css changes 2013-08-30 09:51:05 +02:00
peteruithoven 2deec18072 Settings improvements 2013-08-28 18:33:25 +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
Adriaan Wormgoor 39157ab392 Added a div 'preview_tmp' as a precursor to a more efficient way of showing the doodle preview 2013-08-16 22:26:00 +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
Adriaan Wormgoor cbbe820d77 added a settings popup -> the gearbox icon botomright is now clickable -> a settings popup will appear, showing various 3d printer settings. These settings are partially loaded from and saved back to the wifibox 2013-07-28 02:47:42 +02:00
Adriaan Wormgoor f439592faf adjusted css and htmls 2013-07-28 02:46:32 +02:00
Adriaan Wormgoor 6990cf37ab lower text wasn't always showing (put it higher) and the text was iPad specific. It's generic now. 2013-07-27 18:19:50 +02:00
Adriaan Wormgoor ceebebbb69 updated css 2013-07-26 23:54:21 +02:00
Adriaan Wormgoor ae4e8e080b - interfaces scales vertically 
- on tablets and smartphones it automatically fills the width
- doesn't *do* much yet
- drawing doesn't scale to the viewport of the draw area yet
- preview on the right doesn't either.
 2013-07-05 19:23:28 +02:00