17 Commits

Author SHA1 Message Date
Jaime van Kessel
a7135a0f5f Added machine type to load menu
CURA-1263
2016-12-16 10:38:30 +01:00
Jaime van Kessel
2be773c9a3 Added num user settings to workspace loading
CURA-1263
2016-12-16 10:26:30 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Jaime van Kessel
36d743384c Initial work for adding a save dialog for project saving
CURA-1263
2016-12-08 11:56:42 +01:00
Jaime van Kessel
a0813b3af3 Added warning when trying to load project with objects on buildplate
CURA-1263
2016-12-02 15:30:21 +01:00
Jaime van Kessel
5d1ba828bc Closing load project screen cancels loading of workspace
CURA-1263
2016-12-02 15:15:34 +01:00
Jaime van Kessel
f782a76324 Material labels are now also displayed in the open project dialog
CURA-1263
2016-12-02 14:54:42 +01:00
Jaime van Kessel
c236f7d266 Total number of settings is now calculated for open project dialog
CURA-1263
2016-12-02 13:31:31 +01:00
Jaime van Kessel
04d268b1fb Machine name is now also displayed in open project dialog
CURA-1263
2016-12-02 13:27:39 +01:00
Jaime van Kessel
b3f1f6b4db Project load dialog now also gives information about the quality & quality changes
CURA-1263
2016-12-02 13:01:01 +01:00
Jaime van Kessel
6bb1b7ec80 Number of settings & mode are now displayed in open Project
CURA-1263
2016-12-02 11:54:28 +01:00
Jaime van Kessel
fa174763cf The 3mf workspace reader no longer locks application if it is accedently called from main
CURA-1263
2016-11-22 14:57:44 +01:00
Jaime van Kessel
b175e6876f Added material conflict option
This is still desabled by default due to some architecture issues (so this is temporarily left as it is)

CURA-1263
2016-11-16 14:45:34 +01:00
Jaime van Kessel
b59be4c88b Moved result checking to the Dialog
CURA-1263
2016-11-16 13:15:15 +01:00
Jaime van Kessel
100e1f4f40 Conflict in quality changes is now handled less naive
Instead of only checking ID, we also check values of the QC

CURA-1263
2016-11-16 13:10:42 +01:00
Jaime van Kessel
f0eb5e0da3 User can now select what strategy to use per conflict
CURA-1263
2016-11-15 15:10:10 +01:00
Jaime van Kessel
cbcc48ff33 Pre-read now checks for conflicts and asks the user what strategy for resolvement to use
CURA-1263
2016-11-11 17:17:23 +01:00