Ghostkeeper
3a9c8d16a2
Fix remaining references to instance_container._id
...
These must've slipped through the cracks.
Contributes to issue CURA-4243.
2017-10-30 15:07:46 +01:00
Lipu Fei
0096fe0de3
Fix project loading to handle "Not Supported" quality profiles
...
CURA-4451
2017-10-30 12:54:21 +01:00
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
Ghostkeeper
7745113704
Re-use stack variable
...
We're creating the variable but then requesting the 0th element from the list each time... That can be more logical and more efficient.
Contributes to issue CURA-4243.
2017-10-19 15:32:21 +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
Lipu Fei
245eec9314
Hide settings visibility row if it is not in preferences
...
CURA-4344
Hide the row which shows the number of settings that are visible on the
project file loading dialog if this information is not available.
2017-10-10 11:31:37 +02:00
ChrisTerBeke
91e8e5812b
add back missing function
2017-10-10 09:24:48 +02:00
ChrisTerBeke
641b3c21f7
fix merge conflicts
2017-10-10 09:21:31 +02:00
Lipu Fei
b14ef41056
Increase the minimumHeight of the workspace summary dialog
...
CURA-4428
2017-10-10 08:30:18 +02:00
Diego Prado Gesto
1d70426224
onVisibilityChanged function removed because it's never called - CURA-4405
2017-10-09 16:36:48 +02:00
Lipu Fei
8a25605413
Fix lock issue with workspace dialog
...
CURA-4405
- Add try-except around lock release
- Fix closing the dialog with ESC
2017-10-09 15:17:56 +02:00
Mark
2e957069a8
first hide the dialog then release the lock
...
CURA-4405
2017-10-09 11:58:58 +02:00
Mark
59fbbef43e
first hide the dialog then release the lock
...
CURA-4405
2017-10-09 11:58:00 +02:00
A.Sasin
2288997697
Fixed: while project loading pass call upgrade plugin for preferences
...
CURA-4344
2017-10-06 18:56:17 +02:00
Lipu Fei
185c350a19
Merge remote-tracking branch 'upstream/3.0'
2017-10-05 15:49:18 +02:00
Lipu Fei
8a27b2e97b
Fix typo in WorkspaceDialog.qml
2017-10-05 15:48:38 +02:00
Lipu Fei
0eeded7930
Fix KeyError in WorkspaceDialog
...
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 e07e7bc9e714843cf853f0a255ee5a8432696886.
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 b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.
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
Diego Prado Gesto
104926c6ed
Updating when new definition changes should be created when loading project - CURA-4413
2017-10-04 13:14:07 +02:00
Jaime van Kessel
6dcb542e64
Fixed issue where "create new" of quality changes in combination with machine caused issues
...
CURA-4409
2017-10-03 13:46:38 +02:00
Ghostkeeper
179ea654cc
Merge branch '3.0'
2017-10-03 12:29:27 +02:00
Jaime van Kessel
8c5b5e32ac
Loading multi extruder custom machine over a single extruder doesnt cause issue anymore
...
CURA-4404
2017-10-03 10:26:51 +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
Jaime van Kessel
d48ab89031
Overriding custom FDM printer with 1 extruder doesn't cause issue anymore.
...
It would try to override extruders that weren't thare. This was caused by the previous
change that would always load the extruders, but that should only happen for new machines, not for
overrides.
2017-10-02 15:30:24 +02:00
Jaime van Kessel
9f8691feef
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-09-29 15:22:23 +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
Diego Prado Gesto
402617af1e
Loading extruder stack files also for single extruder printers - CURA-4379
2017-09-29 15:16:14 +02:00
Mark
b4154b8cc0
Merge branch '3.0'
2017-09-28 13:01:10 +02:00
Mark
9a193ad5c5
Changing AGPLv3 to LGPLv3
2017-09-28 13:00:43 +02:00
Ghostkeeper
68b4dfd3c3
Fix spelling mistake
...
Contributes to issue CURA-4341.
2017-09-27 17:29:30 +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
fieldOfView
7394a0c6ef
Fix typo
2017-09-26 11:05:46 +02:00
fieldOfView
c5fd0e6c80
Use screenScaleFactor to consistently adapt sizes to display pixel ratio
2017-09-25 22:07:12 +02:00
alekseisasin
d7ed8244ae
In project loading dialog the CANCLE button did not work
...
CURA-4345
2017-09-25 14:32:02 +02:00
ChrisTerBeke
21ea99d9f2
CURA-4269 small code improvement for z-offset in project loading
2017-09-22 09:34:24 +02:00
ChrisTerBeke
e7e24caf97
CURA-4269 small code improvement for z-offset in project loading
2017-09-22 09:31:11 +02:00
alekseisasin
7c462f5703
After loading a model from a project Y position is ignored
...
CURA-4269
2017-09-21 17:36:12 +02:00
ChrisTerBeke
ddfb5f0b48
fix conflict after revert
2017-09-21 15:09:04 +02:00
Jaime van Kessel
c4f5c970e5
Removed uneeded logging
2017-09-19 16:39:51 +02:00
Jaime van Kessel
e5f3d45385
When project loading needs to create a new machine, also create a new definition changes
...
CURA-4345
2017-09-19 14:02:01 +02:00
ChrisTerBeke
e18b24add2
CURA-4269 use z offset decorator to keep project file positions below bed
2017-09-18 17:24:00 +02:00
ChrisTerBeke
b386bda2c8
more fixes for reverting 11ebdf730389eca66bafc37be7c6a741c5641f46
2017-09-18 15:38:31 +02:00
ChrisTerBeke
3db04c918f
fixes for reverting 11ebdf730389eca66bafc37be7c6a741c5641f46
2017-09-18 15:37:17 +02:00
ChrisTerBeke
4ca5987ca8
CURA-4269 added a flag to determine wether auto drop should be executed or not
2017-09-18 10:50:52 +02:00
ChrisTerBeke
11ebdf7303
CURA-4269 disable auto-drop for first time loaded models from project files
2017-09-14 16:06:51 +02:00
Ghostkeeper
557173e799
Merge branch '2.7'
2017-08-24 15:33:01 +02:00
Lipu Fei
3d44d3c4ca
Add logging and minor fix for project loading
...
CURA-4204
2017-08-23 17:42:40 +02:00
Lipu Fei
3805d2ff9e
Add comments for HACK in project loading
...
CURA-4204
2017-08-23 17:37:59 +02:00
