GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 03:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,820 Commits 290 Branches 260 Tags
Commit Graph

2371 Commits

Author SHA1 Message Date
Ghostkeeper
9d910be212
Add borders to layer view slider handles 
And all other sliders, of which we have exactly 0.

Contributes to issue CURA-4148.
 2017-08-21 18:28:06 +02:00
Ghostkeeper
db640c6f3d
Merge branch '2.7' 2017-08-21 00:58:15 +02:00
Ghostkeeper
df88772071
Add input checking for incorrect responses from printers 
We should not crash when getting invalid data. Just put a warning in the log there and ignore the message for the rest.
 2017-08-21 00:57:25 +02:00
Ghostkeeper
b917511528
Merge branch '2.7' 2017-08-18 16:58:21 +02:00
Ghostkeeper
b7493ae1a8
Also pull limit_to_extruder settings into per-object setting stack 
Only for settings that are limited by a setting on the stack.

Contributes to issue CURA-4186.
 2017-08-18 16:57:13 +02:00
Ghostkeeper
3c36c3427c
Cache top of stack for efficiency 
Otherwise you need to retrieve this container for every key again. Doesn't matter much, but a bit.

Contributes to issue CURA-4186.
 2017-08-18 15:36:15 +02:00
Ghostkeeper
4a788dfbdd
Reduce indentation by inverting input check 
Reads a bit easier.

Contributes to issue CURA-4186.
 2017-08-18 15:02:49 +02:00
Lipu Fei
f0d5187896 Merge remote-tracking branch '2.7' 2017-08-18 13:43:00 +02:00
Lipu Fei
67cfb064e6 Fix upgrading custom FDM printers from 2.5 
CURA-4188

Custom FDM printers in 2.5 don't have multi-extrusion support but they
do since 2.6. Upgrading from 2.5 to 2.6 will not create the missing
extruder stacks for the old custom FDM printers, which causes a crash.
This fix makes sure that all custom FDM printers will have 8 extruder
stacks during the upgrade so that Cura can still start normally and
those printers will still be usable.
 2017-08-18 13:06:46 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7' 2017-08-18 10:42:14 +02:00
Ghostkeeper
9a00c07c3d
Also upgrade variants 
Variants can be customised as well, you know.
 2017-08-18 09:59:51 +02:00
Ghostkeeper
a44eb0152d
Repair globalPropertyProvider for per-object settings panel 
Otherwise we can't find the correct limit_to_extruder property.

Contributes to issue CURA-4186.
 2017-08-17 20:17:32 +02:00
Lipu Fei
b9397aaa57 Check the content of definition changes container in SliceInfo 
CURA-4107

Now we always create a definition changes container for a stack,
checking if the definition changes is empty in SliceInfo doesn't work.
It should check the content too.
 2017-08-16 12:50:09 +02:00
Lipu Fei
b74c09dec8 Merge branch '2.7' 2017-08-16 11:51:26 +02:00
Jaime van Kessel
33f843b73a Added name of output device 
CURA-4160
 2017-08-16 10:52:13 +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
alekseisasin
3116ff829c Merge pull request #2200 from fieldOfView/fix_monitoritem_size 
Adapt camera image to available space
 2017-08-15 15:04:18 +02:00
alekseisasin
7ad7fb0a3c Merge pull request #2200 from fieldOfView/fix_monitoritem_size 
Adapt camera image to available space
 2017-08-15 14:45:34 +02:00
Lipu Fei
9aa65eab44 Merge branch '2.7' 2017-08-15 14:43:36 +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
3a46a337ff In SliceInfo, use the global stack if it is a single-extrusion machine 
CURA-4167

Single extrusion machines don't have extruder stacks in the current
architecture.
 2017-08-15 14:19:23 +02:00
Ghostkeeper
59058ad77f
Merge branch '2.7' 2017-08-15 11:24:00 +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
Ghostkeeper
6349f1b5e6
Add context for 'Browse plugins' translated text 
So that the translator knows what sort of text this is. It's the menu item in the application menu.

Contributes to issue CURA-4113.
 2017-08-14 14:55:50 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated 
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
 2017-08-14 13:54:11 +02:00
Ghostkeeper
76e0156076
Merge branch '2.7' 2017-08-11 11:18:15 +02:00
Ghostkeeper
b03847447f
Take manufacturer from XML profile if available 
Otherwise we fall back to the manufacturer in the machine definition. If that fails too, we fall back to Unknown (rather than an empty string).

Contributes to issue CURA-4157.
 2017-08-11 11:13:23 +02:00
Lipu Fei
0a76e5c38f Merge branch '2.7' 2017-08-09 16:59:56 +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
98b72fb971 Merge branch '2.7' 2017-08-09 13:16:43 +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
Ghostkeeper
80cbdd03bb
Merge branch '2.7' 2017-08-07 11:06:12 +02:00
Lipu Fei
76e8090dbd Remove duplicated function createDefinitionChangesContainer() 
CURA-4107
 2017-08-07 10:59:24 +02:00
Lipu Fei
7cb8e675cf Remove redundant createDefinitionChangesContainer() in UMOUpgradeSelection 2017-08-04 11:14:56 +02:00
Lipu Fei
b4be6fcb9f Use Label for LayerView legend texts 
CURA-3799
 2017-08-03 16:18:58 +02:00
Ghostkeeper
9837537120
Merge branch '2.7' 2017-08-03 15:55:08 +02:00
Ghostkeeper
d85fd63795
Mention Neotko as the originator of Ironing 
As promised.

Contributes to issue CURA-4114.
 2017-08-03 15:53:32 +02:00
alekseisasin
2990333d1d
Updated the Change log (added 2.6.2 and 2.7.0) 
CURA-4114
 2017-08-03 14:00:55 +02:00
alekseisasin
c4d23437f2 Updated the Change log (added 2.6.2 and 2.7.0) 
CURA-4114
 2017-08-03 13:19:49 +02:00
Lipu Fei
ddee562129
Fix typo in LayerView.qml 
CURA-3799
 2017-08-03 13:06:20 +02:00
alekseisasin
b984b99c30
Translated text overlaps GUI 
CURA-3799
 2017-08-03 13:05:53 +02:00
fieldOfView
d6d4617356 Resize camera image to fit small windows if necessary 2017-08-03 10:56:21 +02:00
Lipu Fei
3ffa274050 Fix typo in LayerView.qml 
CURA-3799
 2017-08-02 10:24:28 +02:00
Lipu Fei
6e06837084 Remove duplicated function createDefinitionChangesContainer() 
CURA-4107
 2017-08-02 08:50:32 +02:00
Lipu Fei
05d7e15d4c Merge remote-tracking branch 'upstream/2.7' 2017-08-02 08:48:15 +02:00
alekseisasin
d6c1a231ac Translated text overlaps GUI 
CURA-3799
 2017-08-01 15:50:55 +02:00