Commit graph

164 commits

Author SHA1 Message Date
Arjen Hiemstra
afa44ed314 Tweak the initial camera position
As requested by Menno
2015-10-01 14:20:47 +02:00
Arjen Hiemstra
457f2945b0 Bump version 2015-09-29 16:59:26 +02:00
Arjen Hiemstra
c486794f33 Delay showing the Add Machine dialog until after the main window is properly shown
Showing the main window causes the Add Machine window to hide apparently
so instead make sure we show the add machine dialog after showing the
main window.

This also handles the "there is no machine" situation a little more
cleanly.
2015-09-24 19:22:00 +02:00
Arjen Hiemstra
e44297e400 Add a job name property to CuraApplication
This can be used to store the current job name.

Contributes to CURA-183
2015-09-23 18:20:11 +02:00
Jaime van Kessel
b770979be5 Force scene change event upon file load through commandline parameters
Fixes Ultimaker/Cura#409
2015-09-22 13:50:10 +02:00
Jaime van Kessel
b512d57bb5 Bump version 2015-09-19 17:09:01 +02:00
Arjen Hiemstra
0788d4e726 Bump version 2015-09-18 14:02:21 +02:00
Jaime van Kessel
d7923b8100 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-18 13:44:30 +02:00
Jaime van Kessel
90b033e020 Remove print statement 2015-09-18 13:44:21 +02:00
Arjen Hiemstra
6e0d80bf02 Use deepcopy to create duplicates of Nodes
This way we also include decorators and everything.

CURA-188 #start-review
2015-09-18 12:35:34 +02:00
Jaime van Kessel
ad0a36cfef Reload object should now function again
Fixes CURA-147 (A proper solution will need to be found in the future)
2015-09-15 16:34:05 +02:00
Jaime van Kessel
1b7bb76939 Added some clarifying comments 2015-09-14 13:42:36 +02:00
Jaime van Kessel
3f580d97f9 Fixed resetting of object transformations / translations.
Fixes CURA-154
2015-09-14 13:37:10 +02:00
Jaime van Kessel
4d6528e90d Fixes to grouping.
Fixes Ultimaker/Cura#377
2015-09-14 13:25:03 +02:00
Jaime van Kessel
e08aa9f2ec Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-11 13:49:49 +02:00
Jaime van Kessel
d14816bae5 Center of group node is now on correct position.
Fixes Ultimaker/Cura#378
2015-09-11 13:49:16 +02:00
Arjen Hiemstra
2ea0a3c02a Fix strings in crash handler
Contributes to CURA-132
2015-09-10 16:54:20 +02:00
Jaime van Kessel
5d7abb5864 Ungrouping now copies parent transformation onto children.
Fixes Ultimaker/Cura#360
2015-09-10 15:17:42 +02:00
Jaime van Kessel
ade65870c6 Scale is now taken into account for merging.
Fixes Ultimaker/Cura#359
2015-09-10 11:07:03 +02:00
Jaime van Kessel
e2fe27e534 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-09 09:50:35 +02:00
Jaime van Kessel
f1417858c1 Merged objects are no longer moved on platform plate
Fixes Ultimaker/Cura#354
2015-09-09 09:49:53 +02:00
Arjen Hiemstra
09cf161b59 Bump application version 2015-09-08 17:42:36 +02:00
Tamara Hogenhout
79f69f30f5 adds/adapts translation context markers
minor change

Contributes to: issue CURA-116
2015-09-08 15:26:06 +02:00
Tamara Hogenhout
6c7536a167 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-08 13:35:12 +02:00
Tamara Hogenhout
ff855ccf1b adds/adapts translation context markers
all nescessary in folder: Cura/cura

Contributes to: issue CURA-116
2015-09-08 13:34:35 +02:00
Jaime van Kessel
07031b6b65 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-09-08 13:31:26 +02:00
Jaime van Kessel
dfe4b348b4 Fixed push free for one at a time 2015-09-08 13:31:16 +02:00
Tamara Hogenhout
e8c796ee24 adds/adapts translation context markers
all nescessary in folder: Cura/cura

Contributes to: issue CURA-116
2015-09-08 12:29:05 +02:00
Jaime van Kessel
f3eefd7be1 Delete all now correctly handles grouped objects
fixes CURA-111
2015-09-08 11:56:05 +02:00
Jaime van Kessel
56e8b01f22 Fixed resetting to center of groups
Fixes #CURA-112
2015-09-08 11:48:08 +02:00
Jaime van Kessel
ee513b0b83 Fixed resetting transformation / position of groups.
Contributes to #CURA-112
2015-09-08 11:34:05 +02:00
Jaime van Kessel
5d74633119 The convex hud for the head is now correctly reset when switching between print modes 2015-09-04 14:00:20 +02:00
Jaime van Kessel
7463979bcc Updated version string 2015-09-04 11:10:14 +02:00
Jaime van Kessel
ecf5fd4b7d Fixed issue for convex null job when there is no active profile 2015-09-04 10:40:46 +02:00
Jaime van Kessel
6d184ea281 One at a time now has the correct push free behaviour 2015-09-03 16:38:58 +02:00
Jaime van Kessel
45f213cd82 Head shape is now also shown in hull 2015-09-03 16:34:25 +02:00
Arjen Hiemstra
57632f895e Fix one at a time iterator to not check things like the platform 2015-09-03 16:08:41 +02:00
Jaime van Kessel
476533b416 Merge pull request #310 from fieldOfView/fix_buildvolume_brokenprofile
Fix crash when a profile cannot be loaded
2015-09-02 15:03:05 +02:00
Jaime van Kessel
a9208ccf3f Fixes namechanges caused by api change 2015-09-02 13:50:04 +02:00
Arjen Hiemstra
ac2184ef71 Use profile for getting setting values 2015-09-02 12:21:03 +02:00
Jaime van Kessel
63ddfccd52 updated cura application to new API 2015-09-02 11:23:09 +02:00
Jaime van Kessel
b16933d68f Fix of crash caused by merge 2015-09-02 11:10:05 +02:00
Arjen Hiemstra
57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (49 commits)
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar
  split magic_mesh)surface_mode into Normal, Surface, Both
  Added preference to disable automatic scale
  Removed unused import
  Added changeLog plugin
  Added missing )
  Merging of mine and Jaimes work
  Removed font from rectangle
  JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
  Code style & switch to translation catalog
  15.10 re-alignment of the toolbar
  15.10 New Icons
  15.10 restyling of the savebutton Area
  Added message asking about sending data to server
  Added exception handling for checking overlap.
  Fixed default button for general and view page
  Fixed double ID in qml
  Removed unused import
  ...
2015-09-01 15:44:19 +02:00
Arjen Hiemstra
5aa95f1258 Use the active machine instance for Build Volume 2015-09-01 15:06:03 +02:00
Arjen Hiemstra
510f5978f0 Remove most of the PrintInformation code and fix the material amount to use profile 2015-09-01 15:05:31 +02:00
Arjen Hiemstra
f618b54d69 Connect to MachineManager's addMachineRequested so we can show the add printer dialog 2015-09-01 15:03:59 +02:00
Arjen Hiemstra
47e96a9e2a Fix ConvexHull{Decorator,Job} to work with the new profile structure 2015-09-01 15:03:29 +02:00
fieldOfView
b3cb24f76a Fix crash when a profile cannot be loaded, which caused the width & height of the buildvolume to be set to None 2015-09-01 15:03:22 +02:00
Jaime van Kessel
dd7e450d1c Added preference to disable automatic scale
Ultimaker/Cura#142 #CURA-89
2015-08-28 16:42:11 +02:00
Jaime van Kessel
709ec79918 Removed unused import 2015-08-28 16:31:47 +02:00