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 3
12148 commits 340 branches 299 tags 734 MiB
Commit graph

2845 commits

Author SHA1 Message Date
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible 
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
 2017-10-20 15:09:45 +02:00
ChrisTerBeke
09ed53b4ec Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER 2017-10-20 12:38:12 +02:00
ChrisTerBeke
9f73f79b2f Update simple mode manager states when manager is created - CURA-4466 2017-10-20 12:37:59 +02:00
ChrisTerBeke
95a2559607 indent 2017-10-20 12:34:35 +02:00
ChrisTerBeke
31a04ed8da Also emit active quality changed when no dialog interaction occured - CURA-4447 2017-10-20 11:37:45 +02:00
ChrisTerBeke
e24242dc3c Merge branch 'master' into CURA-4447_UPDATE_INSTANCE_CONTAINER 2017-10-20 11:34:45 +02:00
ChrisTerBeke
be046117c4 Sidable quality slider handle when switching to user created profile - CURA-4466 2017-10-19 18:00:03 +02:00
ChrisTerBeke
30281f17f3 Add simple mode settings flag for user created profile - CURA-4466 2017-10-19 17:03:31 +02:00
Ghostkeeper
f7e048aee5
Remove unused variable 
Contributes to issue CURA-4243.
 2017-10-19 16:37:03 +02:00
Ghostkeeper
2fc198a7ad
Move manual criterion into base criteria filter 
This code was filtering on certain criteria, and then filtering the results based on an additional metadata field. Let's just move that last field in the original criteria too...

Contributes to issue CURA-4243.
 2017-10-19 15:48:19 +02:00
ChrisTerBeke
70cf86c65b Remove debug print - CURA-4447 2017-10-19 14:40:56 +02:00
ChrisTerBeke
e9336b9b9e Small cleanups for discard or keep behavior - CURA-4447 2017-10-19 14:39:32 +02:00
Lipu Fei
d735921d42 Take into account the keep/discard interaction when emitting signals 
CURA-4248

When user switches to a different profile, the keep/discard dialog can
show up. Don't emit signals immediately if this interaction takes place
because it will trigger an unnecessary slice.
 2017-10-19 08:32:26 +02:00
ChrisTerBeke
f4eb2ee256 Merge pull request #2612 from fieldOfView/fix_splashscreen_sub_version_size 
Fix size of "beta" classifier on splash screen for HiDPI screens
 2017-10-18 16:46:56 +02:00
A.Sasin
85f2a7c385 Added update to for Instance container to re calculate values and validate 
CURA-4447
 2017-10-17 15:01:49 +02:00
ChrisTerBeke
276232dae5 Merge pull request #2613 from Ultimaker/CURA-4333_Notification_icon_for_recommended_mode 
Cura 4333 notification icon for recommended mode
 2017-10-17 13:05:45 +02:00
Lipu Fei
44d5323779 Run crash dialog on Qt thread so the GUI gets updated correctly 
CURA-4195
 2017-10-17 09:38:43 +02:00
Lipu Fei
396d960f4a Fix code style 
CURA-4195
 2017-10-17 09:30:49 +02:00
Diego Prado Gesto
ac2484ea87 CURA-4457 Add parenthesis in conditional statement 2017-10-16 20:21:42 +02:00
Jaime van Kessel
70f0e8752b Add extra --headless flag to commandline 2017-10-16 15:05:51 +02:00
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