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

2385 commits

Author SHA1 Message Date
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0" 
This reverts commit b62c19206f, reversing
changes made to 104926c6ed.

Contributes to issue CURA-4414.
 2017-10-05 10:28:54 +02:00
ChrisTerBeke
b62c19206f Merge branch 'fix_garbled_fonts_macos' into 3.0 2017-10-04 14:09:59 +02:00
ChrisTerBeke
ea9d389f99 CURA-4390 make plugin browser a required plugin 2017-10-04 12:05:02 +02:00
ChrisTerBeke
15d945a207 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-03 17:35:19 +02:00
ChrisTerBeke
b0fa87231c CURA-4390 add new menu item for plugins 2017-10-03 17:33:24 +02:00
Jaime van Kessel
bff3a5bb23 Naming of new machines now uses correct ordering again 
CURA-4408
 2017-10-03 13:16:04 +02:00
Ghostkeeper
1d7792861d
Merge branch '3.0' 
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
 2017-10-02 17:40:24 +02:00
Ghostkeeper
1aa6d2876c
Revert "Use self._camera_active to detect whether we should show the camera" 
This reverts commit bd0b38f688.
 2017-10-02 17:34:57 +02:00
Ghostkeeper
bd0b38f688
Use self._camera_active to detect whether we should show the camera 
Because the camera timer is whether we should request the camera.

Contributes to issue CURA-4376.
 2017-10-02 16:55:19 +02:00
Jaime van Kessel
189fc3fe94 Added missing activeStack changed signal 
This fixes some issues with the recommended view when the first machine is added.

CURA-4403
 2017-10-02 16:37:00 +02:00
Jaime van Kessel
b5ce439c96 Merge branch '3.0' of github.com:Ultimaker/Cura 2017-10-02 13:18:44 +02:00
Diego Prado Gesto
daa0793427 Minor code changes - CURA-4395 2017-10-02 11:15:24 +02:00
Ghostkeeper
812873af15
Don't expand convex hull if offset < 0 
We can only do Minkowski sums now, no subtractions. So if there needs to be a subtraction, don't do anything for now. Previously it would expand with abs(hull_offset), so a negative value would cause expansion rather than contraction.

Contributes to issue #2042.
 2017-10-02 09:50:09 +02:00
Diego Prado Gesto
4d9908364a Now empty message in materials and variants doesn't appear - CURA-4377 2017-09-29 16:28:18 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
A.Sasin
3082038261 Fixed code style and machine default name is retrieved from machine definition 
CURA-4345
 2017-09-29 13:52:00 +02:00
Diego Prado Gesto
1d61740d1a Added some comments to the code and minor changes - CURA-4386 CURA-4379 2017-09-29 11:39:52 +02:00
Ghostkeeper
dbf13b0d1a
Fix calling loggers 
Because UM.Logger is a module, not the Logger class.
 2017-09-29 09:14:43 +02:00
Diego Prado Gesto
afb83fac88 Update the active extruder index when the global container changes. This 
fixes a problem when Cura starts with a single extruder printer but the
user then choose a multiextruder printer - CURA-4386
Also added a quality definition in UM3E extruder with the ids of the UM3
extruders, so that the profiles for UM3 are also valid for UM3E and viceversa - CURA-4389
All are related issues with profiles and multiextruder printers
 2017-09-28 18:02:39 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
Ghostkeeper
92c407580a
Comment out visibility of flow temperature graph 
Apparently it's not allowed to be in there. By being commented out I hope that a future developer won't make the same mistake and add it there to be editable in the interface.
 2017-09-28 15:33:00 +02:00
alekseisasin
2a302a3e27 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-09-28 13:24:13 +02:00
alekseisasin
5402092bb4 During adding a new printer the printer name generated from default name and not from custom name (changed by user) 
CURA-4345
 2017-09-28 13:22:15 +02:00
Diego Prado Gesto
e3edc79a3e modified some code to fix the multiple extrusion issues - CURA-4379 2017-09-28 13:21:03 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ChrisTerBeke
f5310ad2ff Revert "For discard changed window retrieve data from setting "value" property instead of "resolve"" 
This reverts commit a2e0f4d64f.
 2017-09-27 14:16:56 +02:00
Jaime van Kessel
035a851eb0 Merge pull request #2480 from fieldOfView/fix_disable_solid_view 
Make Solid View a required plugin
 2017-09-27 13:03:51 +02:00
Jaime van Kessel
e87f30cf09 Merge branch '3.0' of github.com:Ultimaker/Cura 2017-09-27 13:02:21 +02:00
Jaime van Kessel
2dee054003 Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0 2017-09-27 12:57:42 +02:00
alekseisasin
a2e0f4d64f For discard changed window retrieve data from setting "value" property instead of "resolve" 
CURA-4358
 2017-09-27 11:27:29 +02:00
Diego Prado Gesto
568535e3e2 Adapting the code in case a multiextruder printer will use only one extruder - CURA-4359 2017-09-26 17:49:53 +02:00
fieldOfView
565ed4933b Use pixels instead of points for text in splash-screen 
The current splashscreen implementation uses DPI-independent pixel sizes for everything, but point sizes take the DPI into account. This caused too large text and misalignment in the splash screen on Hi DPI screens on Windows.
 2017-09-26 11:56:14 +02:00
Diego Prado Gesto
b82309fb6a Merge branch 'custom_profiles' into 3.0 2017-09-25 15:52:31 +02:00
Diego Prado Gesto
2ae1700a15 Solved the issue with the slider that was no showing in gray the unavailable profiles - CURA-4327 2017-09-25 14:43:29 +02:00
fieldOfView
7c1de0c0d2 Make Solid View a required plugin. 
There is no plugin with the id "MeshView"
 2017-09-25 11:28:08 +02:00
Diego Prado Gesto
c22928f5d1 Change behavior when there is no suitable item - CURA-4327 2017-09-25 08:43:57 +02:00
Diego Prado Gesto
cf94c8d37d Working on fixing several issues with profiles - CURA-4327 2017-09-22 14:47:20 +02:00
Ghostkeeper
c02c2201e2
Merge branch '3.0' 2017-09-22 12:58:40 +02:00
Ghostkeeper
2020e355a2
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 
Contributes to issue CURA-4357.
 2017-09-22 12:58:20 +02:00
Ghostkeeper
261089eed3
Fix type hinting imports 
Because circular imports. I hate our current import technique...

Contributes to issue CURA-4357.
 2017-09-22 11:53:10 +02:00
Ghostkeeper
3d921c1b4e
Add type hinting of return values 
I thought this might help find some bugs there.

Contributes to issue CURA-4357.
 2017-09-22 11:30:35 +02:00
Diego Prado Gesto
4d113a746c Merge changes 2017-09-22 11:29:29 +02:00
Diego Prado Gesto
37da9f654b Reverted changes done that makes sliders fail - CURA-4327 2017-09-22 11:20:57 +02:00
Ghostkeeper
1596437bbd
getActiveGlobalAndContainerStacks may return None 
Change the code to reflect on this. Mostly this is to fix up the type warnings, because we were already checking for there being no global container stack but that was not thread-safe.

Contributes to issue CURA-4357.
 2017-09-22 11:17:42 +02:00
Ghostkeeper
88155d35e8
Correct signature of activeMachine 
Because there isn't always a global container stack.

Contributes to issue CURA-4357.
 2017-09-22 11:11:34 +02:00
Ghostkeeper
12ccc8abe0
Merge branch '3.0' 2017-09-22 09:55:05 +02:00
ChrisTerBeke
ab8bcc4ae3 small code fixes 2017-09-22 09:51:59 +02:00
Ghostkeeper
1bb11b521e
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-22 09:32:03 +02:00
Mark
d2de039371 dont disappear when click on splashscreen 
CURA-4343
 2017-09-22 09:11:35 +02:00
ChrisTerBeke
fd41f3d17f Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-09-21 17:35:19 +02:00