GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,114 Commits 294 Branches 267 Tags
Commit Graph

105 Commits

Author SHA1 Message Date
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
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
d14816bae5 Center of group node is now on correct position. 
Fixes Ultimaker/Cura#378
 2015-09-11 13:49:16 +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
7463979bcc Updated version string 2015-09-04 11:10:14 +02:00
Jaime van Kessel
a9208ccf3f Fixes namechanges caused by api change 2015-09-02 13:50:04 +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
f618b54d69 Connect to MachineManager's addMachineRequested so we can show the add printer dialog 2015-09-01 15:03:59 +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
Arjen Hiemstra
4d4192d6d6 Ignore some active machine changes since we need to port code 2015-08-27 09:35:05 +02:00
Arjen Hiemstra
5637c9ad94 Remove active machine preference from CuraApplication, it is now handled by MachineManager 2015-08-27 09:34:22 +02:00
Jaime van Kessel
fdd8a7bb6c Removed unused import 2015-08-26 15:30:26 +02:00
Jaime van Kessel
f92b4d72c7 Added getPrintInformation to curaApp 2015-08-25 14:16:35 +02:00
Jaime van Kessel
ed24f5e451 Duplication now takes sunk into bottom into account. 
Fixes Ultimaker/Cura#286
 2015-08-24 14:37:20 +02:00
Jaime van Kessel
45aef7903b Duplicate object now also copies rotation. 
Fixes Ultimaker/Cura#281
 2015-08-24 13:26:34 +02:00
Arjen Hiemstra
f081bf4026 Use the right resource path for locating Qml resources 2015-08-21 18:29:13 +02:00
Arjen Hiemstra
9888a6eb42 Fix a merge error 2015-08-21 18:28:53 +02:00
Arjen Hiemstra
f099c30dfd Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings 
* 'master' of github.com:ultimaker/Cura: (98 commits)
  15.10 Restyling of the message stack
  Fixed machine head polygons
  Removed unused settings from fdmprinter
  Added action for togling fullscreen
  Fixed usage of wrong checkbox in viewpage
  Added preference to disable automatic push free
  Added preference to disable auto center when selecting object
  Cleanup
  15.10 Restyling toolbar, viewmode button
  Update README.md
  Update README.md
  Added rudementary 3 point bed leveling
  15.10 New font for Cura
  15.10 Changes the styling for the open file button
  15.10 Changes the label names for the different action buttons
  Fixed typo
  Endstop now stops listening upon destruction
  15.10 Re-alignment of the messagestack
  Cleaned up code a bit
  Added heated bed check
  ...
 2015-08-21 13:29:30 +02:00
Tamara Hogenhout
3cb3cce31c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-21 10:55:44 +02:00
Tamara Hogenhout
720577ff8e 15.10 Restyling of the message stack 
specifically the progressbar, styling of the messages and colors

Contributes to: issue CURA-60
 2015-08-21 10:54:39 +02:00
Jaime van Kessel
f68fdb01b4 Added preference to disable auto center when selecting object 2015-08-20 10:55:13 +02:00
Arjen Hiemstra
a425036c4c Merge branch '15.06' 
* 15.06:
  Fix poor visibility of MessageStack against grid
  Fix USB printer detection and reconnect after firmware update on MacOSX
  Correct the icon for the Cura .desktop file
  Bump version
  support defaults to ZigZag instead of Lines
  Fix the platform activity check
 2015-08-18 17:59:16 +02:00
Jaime van Kessel
49e39d637c Added cutoff distance 2015-08-13 11:25:34 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +02:00
Arjen Hiemstra
ae79139cc4 Handle Open File events on Mac OSX 2015-08-11 16:48:50 +02:00
Jaime van Kessel
2119d76ab2 Changes to meshreading, which now returns node instead of mesh 2015-08-11 11:35:25 +02:00
Arjen Hiemstra
f60dc01e66 Disable machine detection code for the moment as it needs to be ported 2015-08-05 21:12:21 +02:00
Arjen Hiemstra
1947d773a3 Update all usage of activeMachine to the new API 2015-08-05 20:12:29 +02:00
Arjen Hiemstra
842689d88e Update all uses of the Resources API with the changed API 2015-08-05 17:26:52 +02:00