5624 Commits

Author SHA1 Message Date
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
fcd4fb86f5 removed debug prints
CURA-1263
2016-11-15 15:12:04 +01:00
Jaime van Kessel
bbf5c73dae Quality_changes user option is now set correctly
CURA-1263
2016-11-15 15:11:32 +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
47d0e95e53 Loading single extrusion machine from file no longer gives exception
CURA-1263
2016-11-14 17:55:30 +01:00
Jaime van Kessel
dffb54d901 Removed abundant whitespace 2016-11-14 17:54:38 +01:00
Jaime van Kessel
bade9e1bff Resolve strategy is now always set
CURA-1263
2016-11-14 17:50:54 +01:00
Jaime van Kessel
8640b2b787 Saving an empty buildplate as a workspace is now possible
CURA-1263
2016-11-14 17:45:30 +01:00
Jaime van Kessel
1db2d06e06 Fixed "new" resolve if only the machine was double.
CURA-1263
2016-11-14 17:15:29 +01:00
Jaime van Kessel
3245c2fe32 Extruder stacks are no longer renamed when loading from workspace
CURA-1263
2016-11-14 17:08:43 +01:00
Jaime van Kessel
2e4b430cf8 User changes are now also updated correctly when resolving to new machine in workspace loading
CURA-1263
2016-11-14 17:04:58 +01:00
Jaime van Kessel
b8746aee30 Added hack so the new extruders are added to extruder manager
CURA-1263
2016-11-14 15:59:14 +01:00
Jaime van Kessel
c919883178 Extruder stacks now properly get global stack set as next
CURA-1263
2016-11-14 15:50:07 +01:00
Jaime van Kessel
4dc14a72ab Added conversion table for old to new ID's
CURA-1263
2016-11-14 15:32:08 +01:00
Jaime van Kessel
0d4f28b310 MachineStacks & user containers are now also renamed if so required
CURA-1263
2016-11-14 15:16:17 +01:00
Jaime van Kessel
990736b5c6 Implemented quality_changes resolve strategy
This enables the creation of a new quality_changes profile if the user chose to do this

CURA-1263
2016-11-14 14:51:10 +01:00
Jaime van Kessel
377752397f Made it possible for machine & quality changes to have different resolve strategies
CURA-1263
2016-11-14 13:48:49 +01:00
Jaime van Kessel
8ae0cfd848 Loading workspace now activates the machine and notifies everyone that it was changed
CURA-1263
2016-11-14 13:30:28 +01:00
Jaime van Kessel
d5229992df Override resolve strategy is now handled
CURA-1263
2016-11-14 12:37:26 +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
Jaime van Kessel
99e753d3be Added loading of preferences form workspace
CURA-1263
2016-11-11 13:31:36 +01:00
Jaime van Kessel
413d788c0c Fixed copypaste mistake
CURA-1263
2016-11-11 10:46:54 +01:00
Jaime van Kessel
4a2f07c363 Definitions & materials are now loaded from workspace
CURA-1263
2016-11-11 10:39:54 +01:00
Jaime van Kessel
b92ca508bb Stacks are now loaded from workspace file
CURA-1263
2016-11-10 15:42:20 +01:00
Jaime van Kessel
611572c324 Extruder stack is now saved (instead of the material being saved as the stack)
CURA-1263
2016-11-10 14:11:33 +01:00
Jaime van Kessel
1f21957cb4 Fixed issue with per-object settings in 3mf reader
CURA-1263 and CURA-382
2016-11-10 11:46:13 +01:00
Jaime van Kessel
d477630cce Updated documentation
CURA-1263
2016-11-10 11:34:12 +01:00
Jaime van Kessel
3ab283bfed Saving workspace now works when there are no meshes to save
CURA-1263
2016-11-10 11:29:47 +01:00
Jaime van Kessel
61d1199abf The entire machine is now saved to 3mf file when saving workspace
CURA-1263
2016-11-10 11:27:25 +01:00
Jaime van Kessel
54040d4c99 Moved 3mf writer here from Uranium
CURA-1263
2016-11-10 10:39:20 +01:00
Jaime van Kessel
f57a17577f Added workspace save option to menu
CURA-1263
2016-11-09 14:14:22 +01:00
Jaime van Kessel
304696c809 OutputDevices now take file_handler into account
CURA-1263
2016-11-09 14:03:57 +01:00
Jaime van Kessel
e30038435c Added pre-read check for 3mf Reader
CURA-1263
2016-11-08 17:36:41 +01:00
Jaime van Kessel
164f378dd4 Added supported Extensions to workspace reader
CURA-1263
2016-11-08 17:26:01 +01:00
Jaime van Kessel
a859c9883c Added loadWorkspace option to menu
CURA-1263
2016-11-08 15:33:31 +01:00
Jaime van Kessel
efc9719ff0 Added stub workspace reader
CURA-1263
2016-11-08 10:00:00 +01:00
Jaime van Kessel
5b89f5e8ee Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 17:06:32 +01:00
Jaime van Kessel
42b8df86d3 Information text is now translated
CURA-2808
2016-11-07 16:54:28 +01:00
Tim Kuipers
75f0452b1f JSON fix: dont enable center_mesh by default (CURA-566) 2016-11-07 15:03:59 +01:00
Tim Kuipers
d20d97d4c1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 13:25:56 +01:00
Tim Kuipers
9b1a41c74c bugfix: comment fail
sorry!!

             .-.
            o   \     .-.
               .----.'   \
             .'o)  / `.   o
            /         |
            \_)       /-.
              '_.`    \  \
               `.      |  \
                |       \ |
            .--/`-.     / /
          .'.-/`-. `.  .\|
         /.' /`._ `-    '-.
    ____(|__/`-..`-   '-._ \
   |`------.'-._ `      ||\ \
   || #   /-.   `   /   || \|
   ||   #/   `--'  /  /_::_|)__
   `|____|-._.-`  /  ||`--------`
         \-.___.` | / || #      |
          \       | | ||   #  # |
          /`.___.'\ |.`|________|
          | /`.__.'|'.`
        __/ \    __/ \
       /__.-.)  /__.-.)
2016-11-07 13:24:28 +01:00
Jaime van Kessel
1610f50da0 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 13:15:14 +01:00
Jaime van Kessel
826c3edd50 Added per object setting retrieval for 3MF
CURA-1263
2016-11-07 13:14:45 +01:00
Tim Kuipers
e51f9ba678 fix: exclude command line settings from being viewed in the frontend (CURA-566) 2016-11-07 11:54:47 +01:00
Tim Kuipers
5490d9cce9 JSON fix: introduce command line settigns in machine json file (CURA-566) 2016-11-07 11:54:47 +01:00
Ghostkeeper
a4bf4b3502 Merge branch 'feature_wall_wipe' 2016-11-07 11:36:30 +01:00
Ghostkeeper
41595f8025 Merge branch 'feature_wall_wipe' of github.com:Ultimaker/Cura into feature_wall_wipe 2016-11-07 11:34:24 +01:00
Ghostkeeper
5c3310a01e
Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 11:33:28 +01:00
Jaime van Kessel
e7df64da8b Fixed merging for already grouped objects 2016-11-07 11:19:03 +01:00