0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-24 18:17:56 +01:00
Commit Graph

62 Commits

Author SHA1 Message Date
peteruithoven
64d1c32f09 Wait slightly longer before wrong printer type warning 2014-03-12 16:30:37 +01:00
Wouter R
ee6bab1c5a Change message.set() to set html instead of text.
Move message div to appear on top of logo and dialog overlays.
Minor text modifications.
2014-03-06 13:43:08 +01:00
Wouter R
2eaf21a030 Display hint about wrong printer type setting if connecting takes longer than 15 seconds. 2014-03-05 23:06:23 +01:00
Wouter R
e050c8e080 Add connecting state. 2014-03-05 22:34:28 +01:00
Wouter R
2457ce656e Code formatting. 2014-03-05 13:49:15 +01:00
peteruithoven
daba2ef1c6 hack: delay preheat to have a proper connection with printer 2014-02-12 17:27:41 +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
Wouter R
de757cae0a Disable log messages in shape transform functions. 2014-01-17 18:03:42 +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
e9a2b90483 New Twist and Height buttons 2014-01-16 16:07:40 +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
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
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
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
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
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
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
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
af325f4bd3 Remove event handler from stop butten when disabled 2013-10-12 17:30:44 +02:00
peteruithoven
253561210d hasControl feedback 2013-10-11 16:18:41 +02:00
peteruithoven
8ff028dce1 Fixing double printer.print call 2013-10-11 15:34:18 +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
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
peteruithoven
fa0a610a8c commented out call to missing setPrintprogress() 2013-09-18 11:34:36 +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
0a40895509 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
# By peteruithoven
# Via peteruithoven
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  Always dump gcode in textarea
2013-09-17 13:10:38 +02:00
Adriaan Wormgoor
95bedd09f1 Thermometer class plus the changes necessary to implement it 2013-09-17 13:08:52 +02:00
peteruithoven
a57a36f420 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client
Conflicts:
	js/buttonbehaviors.js
2013-09-13 16:06:27 +02:00
peteruithoven
b830205a73 Always dump gcode in textarea 2013-09-13 16:03:04 +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
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
6803837ce2 a little cleanup 2013-08-30 09:52:02 +02:00