3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-02 07:11:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
29052 commits 345 branches 300 tags 757 MiB
Commit graph

7047 commits

Author SHA1 Message Date
Remco Burema
b413b4cdb6 Correct a typo in typing. [CURA-6016] 2018-12-11 17:21:14 +01:00
ChrisTerBeke
a766effce8 Fix typing for optional callback for on_progress 2018-12-11 12:43:43 +01:00
Lipu Fei
2275e5c71f Refactor code to use constants in CuraConstants 
CURA-6005
 2018-12-11 12:13:46 +01:00
Lipu Fei
8e4ad23da1 Add CuraConstants 
CURA-6005

Put constant values into a separate file CuraConstants.py
 2018-12-11 12:12:35 +01:00
Jaime van Kessel
f67ac8d7c4 Update far less agressively for the material models 
CURA-6016
 2018-12-11 10:59:17 +01:00
ChrisTerBeke
79430f9faf Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 2018-12-11 10:56:38 +01:00
Diego Prado Gesto
f0257e2b79 Merge branch 'master' into ui_rework_4_0 2018-12-11 10:29:46 +01:00
Diego Prado Gesto
77703e1fb8 Catch an exception from numpy that happens when loading some models 2018-12-11 09:58:23 +01:00
Jaime van Kessel
bb1950525a Limit the amount of times the buildplate rebuild is done 
CURA-6016
 2018-12-11 09:42:34 +01:00
Jaime van Kessel
909f36d28e Let the settingsMenu use the extruders of the active machine instead of the extruderModel 
The extruder model gets updated way to much (for all material changes) but we only need the
number and names of the extruders, since the other menu's do this by themselves
 2018-12-11 09:24:22 +01:00
Jaime van Kessel
3132b1f689 Update the extruder Model a whole lot less 
CURA-6016
 2018-12-10 16:56:44 +01:00
Jaime van Kessel
1436301d78 Ensure setActiveExtruderIndex only gets called once when switching machines 
CURA-6016
 2018-12-10 16:20:00 +01:00
Diego Prado Gesto
d318bb5c87 Merge branch 'master' into ui_rework_4_0 2018-12-10 15:41:28 +01:00
Diego Prado Gesto
11d8831d7a Use the capitalized version of the buildplate name 2018-12-10 15:40:18 +01:00
Jaime van Kessel
d495ec18bb Filter a bit more intelligently on when to check for errors 
CURA-6016
 2018-12-10 15:28:20 +01:00
Diego Prado Gesto
e479772f4d Merge branch 'master' into ui_rework_4_0 2018-12-10 11:43:24 +01:00
Daniel Schiavini
bfe04a55f9 Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-10 10:45:37 +01:00
Ellecross
3db3203e0d
Merge pull request #4951 from Ultimaker/CURA-5939_crash_dialog 
Merging this Cura 5939 crash dialog together with Aleksei!
 2018-12-10 10:28:00 +01:00
Ghostkeeper
c44b74454f
Revert "No longer make BuildVolume set max bounds." 
This reverts commit 1467e703ae.
This variable was actually used... In Uranium, by the scale tiny models feature.
 2018-12-07 14:22:39 +01:00
Diego Prado Gesto
15f81da95b Do not show the layer height in the header panel when the profile is not supported 2018-12-07 13:47:58 +01:00
Daniel Schiavini
4f82a2759a STAR-322: Improving configuration models interface 2018-12-07 12:04:02 +01:00
Jaime van Kessel
ab8a2a9b2b Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-6006-login-required 2018-12-07 10:51:48 +01:00
Daniel Schiavini
a1c252d3a2 Revert "Revert "fix merge conflict"" 
This reverts commit 4bffa6d90f.
 2018-12-07 10:25:46 +01:00
Daniel Schiavini
4bffa6d90f Revert "fix merge conflict" 
This reverts commit ec03b012a7, reversing
changes made to 2af33738d1.
 2018-12-07 10:22:32 +01:00
Jaime van Kessel
2a0954f246 Gracefully handle the conectionError when logging in 2018-12-07 09:35:53 +01:00
ChrisTerBeke
ec03b012a7 fix merge conflict 2018-12-06 16:39:58 +01:00
Ghostkeeper
05b32548f3
Code style: Start comments with a space 
Contributes to issue CURA-5876.
 2018-12-06 16:27:56 +01:00
Aleksei S
e8cf9e034d Catch All Exception except: SystemExit, KeyboardInterrupt, GeneratorException 
CURA-5939
 2018-12-06 13:41:50 +01:00
Aleksei S
84c85439ff The trigger_early_crash did not trigger early crash for testing purposes 
CURA-5939
 2018-12-06 12:00:26 +01:00
ChrisTerBeke
57efca1376
Fix a possible division by zero error 2018-12-05 19:31:58 +01:00
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Daniel Schiavini
163226f940 STAR-322: Using composition rather than inheritance 2018-12-05 12:02:04 +01:00
ChrisTerBeke
d0513e40e1
Remove crappy implementation 2018-12-04 22:21:36 +01:00
ChrisTerBeke
467d347008
Merge branch 'ui_rework_4_0' into STAR-322_cloud-connection 
* ui_rework_4_0:
  Ensure that reset always correctly gets set to basic
  Remove semi-colon
  Simplify preview icon logic
  Always return a string for preview icon
  Update USBPrinting version to 1.0.1
  Fix module importing in USBPrinting
  When toggling auto-slice, force a re-slice
  Fix multi-argument i18n string
  Improve printer status handling
  Make "finishes at" single translatable string
  Improve exposed progress prop
  Simplify logic slightly
  Handle idle, unavailable, and unreachable states
  Improve printer status and progress bar
  Improve date rendering
  Add some typings
  Move isActive and timeRemaining logic from QML to Python
 2018-12-04 21:30:24 +01:00
Daniel Schiavini
8ea4edf67e STAR-322: Fixing job uploads 2018-12-04 17:37:58 +01:00
Lipu Fei
a13fb4a81e Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 17:12:24 +01:00
Daniel Schiavini
54744b46a7 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-04 16:15:19 +01:00
Daniel Schiavini
9046b39b43 STAR-322: Creating a Cloud API client to handle the interaction 2018-12-04 16:14:08 +01:00
ChrisTerBeke
e98f3bff38 Implement test version of showing cloud connected printers in list 2018-12-04 14:09:20 +01:00
Ghostkeeper
82d8410d18
Don't emit enabledChanged signal if it didn't change 
Contributes to issue CURA-5876.
 2018-12-04 13:58:54 +01:00
Ian Paschal
0363c1257c Improve exposed progress prop 
Contributes to CL-1153
 2018-12-04 10:18:09 +01:00
ChrisTerBeke
12b3f0088d Add content type to file upload 2018-12-04 10:07:43 +01:00
ChrisTerBeke
5fdff17782
Add upload messages for UI feedback, needs some refactoring 2018-12-03 22:12:18 +01:00
ChrisTerBeke
24b75d781e Fix merge conflict 2018-12-03 15:58:25 +01:00
Daniel Schiavini
fc26ccd6fa STAR-332: Some improvements to get the job in connect 2018-12-03 14:41:36 +01:00
Ian Paschal
3d80e28174 Add some typings 
Contributes to CL-1153
 2018-12-03 12:15:38 +01:00
Ian Paschal
665e2d3060 Move isActive and timeRemaining logic from QML to Python 
Contributes to CL-1153
 2018-12-03 12:15:25 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
 2018-12-03 11:45:05 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount 
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
 2018-12-03 11:13:26 +01:00
Daniel Schiavini
8066074a2f STAR-332: Fixing warnings 2018-12-03 11:02:49 +01:00