GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 06:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 289 Branches 260 Tags
Commit Graph

1219 Commits

Author SHA1 Message Date
Simon Edwards
e1d7a9faec Properly support the extrauder trains. 
CURA-2953 Version upgrade 2.3 to 2.4
 2016-12-06 17:03:35 +01:00
Ghostkeeper
f6422769b5
Merge branch 'feature_z_seam_location' 2016-11-30 16:34:50 +01:00
Simon Edwards
5ff891496f Merge pull request #1038 from Ultimaker/feature_config_dir_lock 
Moved lockfile functions to better place. CURA-2449 CURA-2589
 2016-11-29 16:30:34 +01:00
Jack Ha
4d9416aae8 Merge branch 'master' into feature_config_dir_lock 2016-11-29 16:12:56 +01:00
Ghostkeeper
87587ffd40
Fix reloading meshes 
Not tested with 3MF, but for normal cases this should hotfix it.
 2016-11-28 14:11:44 +01:00
Tim Kuipers
2c1028e137 JSON feat: z seam position (CURA-1461) 2016-11-25 16:28:45 +01:00
fieldOfView
21bcb0e434 Create a definition_changes container instead of a second variant 2016-11-23 22:53:03 +01:00
Jaime van Kessel
c00775c488 Bounding box will no longer sing first part of batman theme 
CURA-2963
 2016-11-23 16:36:09 +01:00
Jack Ha
124e2b47ea Fix display issue layer view reset positions, center point in select all. CURA-2925 CURA-3012 2016-11-23 11:56:27 +01:00
Jack Ha
aa718fc013 Merge branch 'master' into feature_config_dir_lock 2016-11-22 14:46:00 +01:00
Jaime van Kessel
f3bb45da50 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-22 13:13:57 +01:00
Jaime van Kessel
174990ba9d Set the depends_on property for resolve to value 
CURA-2900
 2016-11-22 13:13:30 +01:00
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +01:00
Jack Ha
4a249dea62 Merge now works for all combinations of transforms. CURA-2932 2016-11-22 11:06:00 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking). 
CURA-2917
 2016-11-21 21:36:08 +01:00
Jack Ha
3c1194e847 Aligh zero positions of objects when merging, not center. CURA-2932 2016-11-21 13:54:53 +01:00
Jaime van Kessel
aceff72c34 PerObject tool is now disabled when switching to a group as well 
CURA-2287
 2016-11-21 11:49:50 +01:00
Jaime van Kessel
312bd2a963 Resetting now simply resets everything to 0 if there is no bounding box 
For the current usage, this won't change anything, but it's more future proof

CURA-2925
 2016-11-18 13:28:14 +01:00
Jaime van Kessel
d2a50cada1 Only reset transformation/ position if there is a bounding box. 
If a node has no bounding box, it's because it has no data to change.

CURA-2925
 2016-11-18 12:56:07 +01:00
Jaime van Kessel
a71bb63318 Resetting transformation now works again for ungrouped nodes 
CURA-2925
 2016-11-18 12:50:51 +01:00
Jaime van Kessel
042141413a Fixed mergeSelected 
My previous fix was wrong; It only worked on what I wanted to fix (and broke the normal behavior). The current fix should fix both issues (merging works & merging groups works)

CURA-2932
 2016-11-16 17:22:06 +01:00
Jack Ha
a68d96fb60 Per model settings panel is now closed when the tool gets disabled. CURA-2287 2016-11-16 09:42:04 +01:00
Jack Ha
6bb82eeefe Fix problem registering Actions.qml which resulted in empty menu items. 2016-11-15 11:42:08 +01:00
fieldOfView
6752a18435 Add dialog to set number of copies when duplicating models 2016-11-07 14:02:19 +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
Jaime van Kessel
e7df64da8b Fixed merging for already grouped objects 2016-11-07 11:19:03 +01:00
Jaime van Kessel
8b4cdedd89 Fixed loading files from command line 2016-11-03 15:07:38 +01:00
Ghostkeeper
37d1c0be36
Add validator for machine names 
Currently this validator can't be used in QML due to a PyQt bug. I plan to call the validator manually upon receiving a signal that the text changed in a text box.

Contributes to issue CURA-2692.
 2016-10-27 21:55:58 +02:00
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff 
CURA-2826
 2016-10-27 14:26:43 +02:00
Arjen Hiemstra
be0e48664a Remove manually specified utf-8 encoding 
Since SaveFile now defaults to UTF-8
 2016-10-24 14:28:20 +02:00
Tim Kuipers
c7c3d24974 fix: adhesion_extruder_nr moved category also for default visibility (CURA-2707) 2016-10-19 13:14:22 +02:00
Tim Kuipers
8cebaedd0c JSOn refactor: moved support extruder settings to support catgegory (CURA-2707) 2016-10-19 13:14:06 +02:00
Jack Ha
8aec11e7c3 Merge branch 'master' into feature_config_dir_lock 2016-10-19 12:43:50 +02:00
Jack Ha
aefa21c76b Moved functions to better place. CURA-2449 CURA-2589 2016-10-11 13:05:24 +02:00
fieldOfView
879ab529f2 Fix deleting grouped object using the context-menu 
CURA-2573
 2016-10-10 17:48:00 +02:00
Jack Ha
83caa334a2 Also wait for lock file in saveSettings. CURA-2449 2016-10-10 09:09:31 +02:00
Jack Ha
8b0d6e974a Added lock file writing and checking. CURA-2449 2016-10-09 11:54:34 +02:00
Simon Edwards
963fac7806 Filter the list of quality changes taking into account the quality(-type) profile they depend on. 
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
 2016-10-05 09:32:18 +02:00
Simon Edwards
5d1b77c551 Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 2 of 2. 
Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-10-03 15:19:32 +02:00
Simon Edwards
2742a4ef65 Show the correct list of qualities and quality change profiles. 
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
 2016-09-29 12:34:46 +02:00
Simon Edwards
a7c58c33f7 Fixed up the profiles menu to handle multiple extruders better. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-28 15:15:18 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
fieldOfView
10af3ee5ab More defensive coding to prevent division by zero 
CURA-2443
 2016-09-22 15:16:39 +02:00
Jaime van Kessel
4e3384e640 Merging with groups no longer causes devision by zero 
CURA-2443
 2016-09-22 14:33:01 +02:00
Jaime van Kessel
7a85430f70 Merging no longer crashes if node has no meshdata 
CURA-2443
 2016-09-22 14:25:00 +02:00
Tim Kuipers
d8b1486637 doc: better documentation of limit_to_extruder and resolve properties in the JSON (CURA-2308) 2016-09-21 17:54:47 +02:00
Ghostkeeper
c1a593c3d8
Create new user profile upon upgrading machine instance 
This defines a new configuration type: 'user', for the user profile.

Contributes to issue CURA-844.
 2016-09-21 17:34:22 +02:00
Ghostkeeper
9501f9b17c
Make VersionUpgradeManager a singleton 
This way we can access the manager from anywhere, without adding a getter to CuraApplication or something.

Contributes to issue CURA-844.
 2016-09-21 17:34:22 +02:00
Jaime van Kessel
50f7c41ae4 Added SettingsInheritanceManager 
CURA-2361
 2016-09-16 09:38:52 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00