3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
14654 commits 313 branches 275 tags 718 MiB
Commit graph

14654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
e38228ac24
Remove unused target_container parameter 
It's not compatible with ContainerInterface anyway.

Contributes to issue CURA-5330.
 2018-06-01 14:53:54 +02:00
Ghostkeeper
a6ffbbde8f
Add missing typing 
Contributes to issue CURA-5330.
 2018-06-01 14:53:54 +02:00
Ghostkeeper
e77592d718
Add missing typing for CuraContainerStack 
This was already largely done, but not 100%.

Contributes to issue CURA-5330.
 2018-06-01 14:53:13 +02:00
Ghostkeeper
a98b4fe35c
Fix unknown model 
My IDE didn't indicate this because it is imported fine, but only if MYPY.

Contributes to issue CURA-5330.
 2018-06-01 14:53:13 +02:00
Ghostkeeper
b3f73594bf
Fix types of on_finished callback 
It only has a QNetworkReply argument.

Contributes to issue CURA-5330.
 2018-06-01 14:53:13 +02:00
Ghostkeeper
8ed3bd29cb
Don't return any boolean in _update 
Nothing listens to that return value, and its parent classes say that this must return None.

Contributes to issue CURA-5330.
 2018-06-01 14:53:13 +02:00
Ghostkeeper
a946a8aaed
Add function typing for PrinterOutputDevice 
This causes a lot of typing errors to surface. We'll fix this later though, when we get to it.

Contributes to issue CURA-5330.
 2018-06-01 14:53:13 +02:00
Ghostkeeper
a55cf0678e
Add missing function types 
The class is typed now. There's some bugs though.

Contributes to issue CURA-5330.
 2018-06-01 14:53:12 +02:00
Ghostkeeper
4157636552
Merge branch '3.4' 2018-06-01 14:03:05 +02:00
Ghostkeeper
2fbcc22123
Fix adding printers due to unused 'parent' parameter 
The 'parent' parameter was unused, so I removed it. But I didn't remove all things that called it, apparently. I just removed some. I didn't try the stackbuilder.

Contributes to issue CURA-5330.
 2018-06-01 14:02:32 +02:00
Lipu Fei
e859861517 No need to set parent for ExtruderStack 2018-06-01 13:55:28 +02:00
Lipu Fei
41e94cd2a1 Fix merge problems from 3.4 2018-06-01 13:51:43 +02:00
Lipu Fei
61a3668a4f Merge remote-tracking branch 'origin/3.4' 2018-06-01 13:51:00 +02:00
Mark
a479176c63 The prepare button slices, so it should be a slice button 2018-06-01 13:42:48 +02:00
Mark
a0263676e1 The prepare button slices, so it should be a slice button 2018-06-01 13:36:50 +02:00
Diego Prado Gesto
85560abca3 CURA-5439 Show the keep or discard changes dialog also when the user 
applies a configuration using the Sync button.
 2018-06-01 13:26:14 +02:00
Diego Prado Gesto
0a573408d9 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-01 12:59:10 +02:00
Diego Prado Gesto
a4b46be2c5 CURA-5427 Force the material models to update when the machine changes and so 
when the extruder stack changes.
- What happen was that when the extruder model needed to update, the
material model was not updated correctly and so when changing a material, the
node was incorrect.
 2018-06-01 12:58:08 +02:00
Ian Paschal
cca51cb74b Revert "Revert "CURA-5435 Attempt to fix "wobbly" text"" 
This reverts commit 9b5369a5b1.
 2018-06-01 09:39:04 +02:00
Ian Paschal
9b5369a5b1 Revert "CURA-5435 Attempt to fix "wobbly" text" 
This reverts commit bc1fa5c3f9.
 2018-06-01 09:38:45 +02:00
Ian Paschal
bc1fa5c3f9 CURA-5435 Attempt to fix "wobbly" text 2018-06-01 09:38:37 +02:00
Jaime van Kessel
91a66d1290 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-31 17:21:27 +02:00
Jaime van Kessel
c988e0eccb Also added "none" to the state list of prints_jobs not to be matched with printers 2018-05-31 17:20:53 +02:00
Lipu Fei
bb313c45a9 Set job name to "unnamed" if user types in nothing 
CURA-5367
 2018-05-31 16:25:58 +02:00
Lipu Fei
30cbdfed69 Make sure that file extensions are always lowered 
CURA-5367
 2018-05-31 15:37:48 +02:00
Mark
3fefdad14b Round margins 
CURA-5435
 2018-05-31 15:22:49 +02:00
Mark
a8173344a3 Hidden materials 2018-05-31 14:45:57 +02:00
Lipu Fei
c288bbb6d1
Merge pull request #3785 from Ultimaker/WIP_improve_initialization 
CURA-5164 Make application initialization and start up more clear
 2018-05-31 14:31:40 +02:00
Lipu Fei
b3ef1bfd51 Simplify UserAgreement 2018-05-31 14:29:56 +02:00
Lipu Fei
eb949472e8 Merge remote-tracking branch 'origin/master' into WIP_improve_initialization 2018-05-31 13:47:27 +02:00
Lipu Fei
7d8472e588 Merge remote-tracking branch 'origin/3.4' 2018-05-31 12:25:33 +02:00
Lipu Fei
a468fc2cc4 Only load loading.gif when needed 
Toolbox crashes on Mac OS X due to reaching the max limit of file
handlers. This seems to be caused by the loading the "loading.gif"
animation image. Probably because many widgets are created and each of
them has an animation image, and Qt (5.8?) seems to load everything at
the same time.
 2018-05-31 12:21:53 +02:00
Jaime van Kessel
416f695610 Canceling sending job to cluster no longer results in "still sending print" message. 
Previously it would always show this, requiring a restart of Cura before print could be sent. CL-913
 2018-05-31 11:52:36 +02:00
Ruben D
33e49bebbe
Don't connect when aborting while the signal is not yet connected 
Do this using try-except so that it is thread safe.
 2018-05-31 10:59:17 +02:00
Ian Paschal
00fe180085 Hide Toolbox Showcase & Materials for 3.4 2018-05-30 16:29:55 +02:00
Ian Paschal
d68b44791b
Merge pull request #3479 from smartavionics/mb-wall-min-flow 
Added wall_min_flow and wall_min_flow_retract settings.
 2018-05-30 13:44:21 +02:00
Ghostkeeper
86d4f0583c
Make showing of support density image dependent on support pattern 
Because that's what it's actually depending on.

Contributes to issue CURA-4513.
 2018-05-30 13:37:25 +02:00
Jack Ha
7728ef02ed Merge branch '3.4' 2018-05-30 11:01:30 +02:00
Jack Ha
b5ab25ed55 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-05-30 10:58:27 +02:00
Jack Ha
ed0a0dd765 Fix multiply object in a rare case that an object is just too big 2018-05-30 10:58:19 +02:00
Ghostkeeper
913661d666
Merge branch '3.4' 2018-05-30 10:36:10 +02:00
Ghostkeeper
6ea5924c95
Remove Try Multiple Line Thicknesses setting 
This setting is now always enabled, hard-coded in the engine.
 2018-05-30 10:35:50 +02:00
Jack Ha
b43806fd4b Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-05-30 09:45:11 +02:00
Jack Ha
3395610b67 CURA-5357 fix boo boo, rename variable 2018-05-30 09:44:59 +02:00
Jack Ha
a616e92367 CURA-5357 fix boo boo, rename variable 2018-05-30 09:44:33 +02:00
Lipu Fei
f1bb0e58e7 Do not use CuraVersion data if strings are empty 
CURA-5357
 2018-05-30 09:20:02 +02:00
Lipu Fei
fae9bc838b Update CURA_* setups in CuraVersion.py.in and CMakeLists.txt 
CURA-5357
 2018-05-30 09:18:45 +02:00
Lipu Fei
9223122fc8 Add CuraCloudAPIRoot into CuraVersion.py.in and CMakeLists.txt 
CURA-5357
 2018-05-30 09:13:27 +02:00
Jack Ha
16b8d3f137 Merge branch '3.4' 2018-05-30 09:12:28 +02:00
Ian Paschal
13b3e4afa5 CURA-5357 Drag & dribble multiple packages like a plugable trickle, yo 
Also improved interfacing with `CuraVersion.py`
 2018-05-30 09:11:49 +02:00