3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
17030 commits 340 branches 299 tags 734 MiB
Commit graph

4475 commits

Author SHA1 Message Date
fieldOfView
ad8af82a58 Fix size of "beta" classifier on splash screen for HiDPI (windows) screens 2017-10-16 14:51:59 +02:00
A.Sasin
65eac37f30 Merge branch 'send_crashes' 
CURA-4195
 2017-10-16 13:48:26 +02:00
A.Sasin
b32f3f9f77 Adjusted Crash report message title 
CURA-4195
 2017-10-16 13:42:29 +02:00
Lipu Fei
fae65d7b83 Minor fixes for customized profile in simple mode 
CURA-4333

- Update comments
- Disable the quality slider when there is a customized profile
 2017-10-16 13:26:28 +02:00
Lipu Fei
9b8dc9bf55 Move simple-mode settings customization check into a separate file 
CURA-4333

Simple-mode is a special mode so it makes more sense to put those code
in a separate file instead of in the more generic MachineManager.
 2017-10-16 13:18:11 +02:00
Lipu Fei
94a624e105 Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-16 11:37:55 +02:00
Ghostkeeper
58562d59a0
Remove unused import 2017-10-16 11:17:50 +02:00
Ghostkeeper
dea230ed6a
Make generated extruder options translateable 
These do appear in the actual interface.
 2017-10-16 11:13:55 +02:00
A.Sasin
61cdfcd3e8 Added coments and simplified "user" metadata check 
CURA-4333
 2017-10-13 16:59:29 +02:00
A.Sasin
7f5aed7ead User pyqtProperty instead of puqtSlot 
CURA-4333
 2017-10-13 16:34:49 +02:00
Diego Prado Gesto
74c37dfc65 CURA-4195 Add strings for I18N 2017-10-13 16:32:01 +02:00
Mark
c2515ca7a9 Merge branch '3.0' 2017-10-13 16:21:54 +02:00
Diego Prado Gesto
3ea9c3856c CURA-4450 Updating UI after removing printer 
When removing a printer, the new one was activated but not signals were
emitted so the UI didn't update correctly. Now the printer is added and
signals are emitted.
 2017-10-13 13:06:48 +02:00
Diego Prado Gesto
4c4de2cf1a Merge branch 'CURA-4358_buildplate' into 3.0 2017-10-13 10:51:05 +02:00
Diego Prado Gesto
de260683cf CURA-4195 - Add module name to the crash report 2017-10-13 10:43:58 +02:00
A.Sasin
16bd4430e4 Added a pyQtProperty to validate user settings (Might be wrong approach) 
CURA-4333
 2017-10-12 21:23:17 +02:00
Lipu Fei
39891551e3 Fix custom profile handling for quality slider 
CURA-4333
 2017-10-12 12:42:18 +02:00
A.Sasin
a7e0d5147e Merge branch 'master' of github.com:Ultimaker/cura 2017-10-12 10:40:50 +02:00
Lipu Fei
b59b245bff Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-12 10:20:35 +02:00
A.Sasin
b318dc7087 Added notification icon in recomended mode. The notification icon is only 
active if one of custom settings is changed
CURA-4333
 2017-10-12 08:57:26 +02:00
Lipu Fei
052ea7d90a Force use and update the job name with the loaded project file 
CURA-4348

- If no project is loaded beforehand and then a model file is loaded,
  the job name should be determined with the current machine name and
  the first loaded model name.
- If a project is loaded, the job name should be the same as the project
  name, and it should not change until another project is loaded.
 2017-10-12 07:59:43 +02:00
Diego Prado Gesto
71e8de13a8 Fix retrieving setting values with "extruderValues()" and "resolveOrValue()" 
CURA-4358

Using the context for override the extruderValues() and resolveOrValue()
functions, for getting the correct values. Also indicate in the context
to skip the first container in the stacks (user container)
 2017-10-11 11:05:01 +02:00
ChrisTerBeke
bc59d421de Add message when model could not be loaded because of small size - CURA-4431 2017-10-10 16:44:25 +02:00
ChrisTerBeke
30c9ccfb7f Merge branch '3.0' 2017-10-10 16:31:29 +02:00
ChrisTerBeke
216dcd33e0 Make sure we do not have a crash when model is very small - CURA-4431 2017-10-10 16:27:14 +02:00
ChrisTerBeke
301485dc53 Revert "Fixed: Very small objects less then 0.1mm creates critical issues" 
This reverts commit 7f88741395.
 2017-10-10 16:22:54 +02:00
A.Sasin
7f88741395 Fixed: Very small objects less then 0.1mm creates critical issues 
CURA-4431
 2017-10-10 15:47:18 +02:00
Diego Prado Gesto
72ff384c48 Parsing traceback to get more information about the crash - CURA-4195 2017-10-10 14:35:44 +02:00
ChrisTerBeke
641b3c21f7 fix merge conflicts 2017-10-10 09:21:31 +02:00
Diego Prado Gesto
cf1f0ffaf1 Adding info to be sent as JSON and send when button is pressed - CURA-4195 2017-10-09 16:05:37 +02:00
Lipu Fei
1c5d352b88 Fix the case when active_extruder is None 2017-10-09 14:35:30 +02:00
Lipu Fei
852e59f310 Fix retrieving default values with "extruderValue()" 
CURA-4358

Use evaluation context to override the default extruderValue()
function with getDefaultExtruderValue() so it can get the correct
default values from each extruder.
 2017-10-09 12:24:08 +02:00
Diego Prado Gesto
e2edbd11b6 Changed Crash Report layout and new information included - CURA-4195 2017-10-09 11:50:30 +02:00
Ghostkeeper
bc419370d0
Merge branch '3.0' 2017-10-06 16:02:13 +02:00
Lipu Fei
c76b35ce3a Update splash screen 
CURA-4416
 2017-10-06 11:11:44 +02:00
Lipu Fei
185c350a19 Merge remote-tracking branch 'upstream/3.0' 2017-10-05 15:49:18 +02:00
Diego Prado Gesto
80ae45ac13 Add some comments to better understand the code - CURA-4404 2017-10-05 15:45:14 +02:00
Lipu Fei
d89f027458 Fix extruder stacks list handling in profile models 
CURA-4404
 2017-10-05 14:11:16 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"" 
This reverts commit e07e7bc9e7.

Contributes to issue CURA-4414.
 2017-10-05 10:58:49 +02:00
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