262 Commits

Author SHA1 Message Date
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
Lipu Fei
d662770b22 Fix setting new material for stacks
CURA-4204

When a new material is created during project file loading, the material
for each stack is set according to the parent material ID, but actually
the child material should be used. This fix uses a hack to find the
corresponding child material for a stack so when a user chooses to
create a new material during project file loading, the material can be
correctly set.
2017-08-23 16:27:28 +02:00
Lipu Fei
4ad62daf61 Generate new unique names for new machines from the project files
CURA-4144

Generate a new name for the machine loaded from a project file instead
of using new ID as the new name.
2017-08-16 08:30:13 +02:00
alekseisasin
dc629f7c91 Solved incorrect printer name after loading a project from file
CURA-4144
2017-08-15 23:48:35 +02:00
Lipu Fei
da8b55cf62 Make sure stacks will have non-empty definitionChanges in project loading
CURA-4107

In old Cura, there is no definitionChanges container, so loading a
project file from an old version will result in stacks with empty
defnitionChanges. This will cause an unnecessary auto-slice problem when
we switch between the extruder tabs for the first time. This action will
trigger a piece code in MachineAction which creates a definitionChanges
container for the active stack if it is empty. This eventually triggers
a propertyChanged signal and results in an unncessary auto-slicing.
2017-08-15 14:38:49 +02:00
Lipu Fei
3ebaacfa11 Use the extruder count in the global stack in project loading
CURA-4167

Custom FDM printers have multiple extruder stacks by default but not all
of them may be used. The actual number of extruders depends on what's
defined in the global stack. Because in the current architecture,
single-extrusion machines don't have extruder stacks, in project
loading, the extruder count in the global stack should be used so these
cases can be handled properly.
2017-08-15 14:19:23 +02:00
Lipu Fei
026244fb53 Add comments for conflict detection
CURA-4143
2017-08-15 10:49:11 +02:00
Lipu Fei
9ff6ae010a Use findInstanceContainers() for definition_changes
CURA-4167
2017-08-15 10:44:23 +02:00
Lipu Fei
66b26bafd4 Show quality name in project loading summary
CURA-4142

In case the quality changes container is not there, show the quality
name of the quality profile.
2017-08-09 13:27:00 +02:00
Lipu Fei
ccabbd8ca0 Mark definition changes container found instead of conflict
CURA-4143

Reverts 65554b60e19507635c79048dc73862e6b25ec0ec
2017-08-09 13:12:06 +02:00
Lipu Fei
65554b60e1 Mark definition_changes conflict if it is not found
CURA-4143
2017-08-09 13:06:18 +02:00
Jaime van Kessel
021425ee06 Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura 2017-07-26 16:49:28 +02:00
Lipu Fei
686ca803ee Set correct machine name when creating a new machine from a project
CURA-4074
2017-07-26 15:08:15 +02:00
Lipu Fei
15a6b5626d Remove useless code
CURA-4053
2017-07-21 11:32:11 +02:00
Lipu Fei
141cfe776e Fix handling old stack without definition_changes and add doc
CURA-4053
2017-07-21 11:28:47 +02:00
Jaime van Kessel
326c4cc4a4 Removed code duplication
CURA-4053
2017-07-21 10:15:20 +02:00
Lipu Fei
22c1a118a8 Fix conflict detection when there is no definition_changes
CURA-4053

An old project file doesn't have the definition_changes container in the
stacks. When this is the case, Cura should also check if the definition
changes container in an existing stack is empty or not for project file
loading conflict detection.
2017-07-20 10:28:09 +02:00
Lipu Fei
356b3cf0ca Remove unnecessary code
CURA-4053
2017-07-19 16:44:04 +02:00
Lipu Fei
9288f408e5 Correctly detect old project files for conflicts
CURA-4053

- In Cura 2.5, there is no definition_changes in the stack. This is now
  taken into account when doing conflicts detection.
- In Cura 2.5, we have empty containers named as "empty_variant" and
  such. Those are now properly handled in conflict detection.
2017-07-19 16:39:04 +02:00