GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,769 Commits 295 Branches 268 Tags
Commit Graph

1322 Commits

Author SHA1 Message Date
Tim Kuipers
0e7c34c883 JSON refactor: moved dual category to above meshfix (CURA-1443) 2016-05-30 14:32:15 +02:00
fieldOfView
472012a5b9 Fix debug code introduced in f5fce512380209c1a05687ef83c4d2bf0f8b0bec 2016-05-27 17:46:53 +02:00
fieldOfView
5927aa5578 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-27 17:21:32 +02:00
fieldOfView
6aa00a951f Fix triggering actions from the extensions menu 
Contributes to CURA-1540, CURA-1278
 2016-05-27 17:21:14 +02:00
Ghostkeeper
525f608b24 Remove reference to machine_extruder_count 
This setting is not defined in this definition so it can't find the value of it here. I've re-introduced the maximum_value statically in the Jedi implementations of this setting.

Contributes to issue CURA-1278 and CURA-351.
 2016-05-27 17:18:52 +02:00
fieldOfView
f5fce51238 Fix "Defaults" button on General page 
CURA-1278
 2016-05-27 17:11:54 +02:00
Tim Kuipers
aa2d09aa08 JSON lil fix: superflious comma (CURA-1616) 2016-05-27 12:44:49 +02:00
fieldOfView
64a613f407 Fix "Activate" button on the Manage Printers page 
CURA-1278
 2016-05-27 11:47:50 +02:00
Tim Kuipers
16450ec614 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-26 17:11:52 +02:00
Tim Kuipers
214d385dae fix: moved extruder definition settings to a new file fdmextruder.def.json (CURA-1616) 2016-05-26 17:11:41 +02:00
Jaime van Kessel
c2a25b131e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-26 15:35:51 +02:00
Jaime van Kessel
c814e47b0e SettingView now works with PreferenceVisibility handler 
CURA-1278
 2016-05-26 15:35:28 +02:00
Arjen Hiemstra
4fc1407c00 Update variant profiles to use the right syntax for formulas 
Contributes to CURA-1278
 2016-05-26 15:32:08 +02:00
Arjen Hiemstra
43ec037c55 Do not load ComboBox items asynchronously 
Since there is a bug with Qt 5.5 that will do strange reordering.

Contributes to CURA-1278
 2016-05-26 15:29:56 +02:00
Arjen Hiemstra
8804c2837f Make reset and restore default buttons work properly again 
Contributes to CURA-1278
 2016-05-26 15:28:57 +02:00
Arjen Hiemstra
5975fa1b0d Fix enabled state of setting items 
Contributes to CURA-1278
 2016-05-26 13:29:56 +02:00
fieldOfView
f7f9dc036e Show correct page when opening profile manager 
CURA-1278
 2016-05-26 09:42:44 +02:00
fieldOfView
f0b956c3c6 Add selection "tab" for active extruder 
Only visible for multi-extrusion printers. Doesn't do anything but setting a qml property, but is to be used to change the variant/material per extruder, and to apply a filter to the advanced mode settings.

CURA-340
 2016-05-26 09:42:31 +02:00
fieldOfView
85370dad87 Fix indent 
CURA-340
 2016-05-26 09:42:16 +02:00
fieldOfView
6a77f67c34 Rearrange sidebar top 
CURA-340
 2016-05-26 09:42:04 +02:00
fieldOfView
098cf515df Fix tooltips for simple mode helpers 
CURA-790
 2016-05-26 09:41:49 +02:00
fieldOfView
fe53a43819 Combine support checkbox & support extruder selection & remove main extruder selection 
CURA-790
 2016-05-26 09:41:25 +02:00
Jaime van Kessel
808f117785 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura 2016-05-25 15:44:08 +02:00
Arjen Hiemstra
6305c70820 Remove old version of FDM printer base file 2016-05-25 15:12:56 +02:00
Arjen Hiemstra
386aec32a8 Merge branch 'settings_rework' 
Contributes to CURA-1278

* settings_rework: (224 commits)
  Improve slice trigger documentation
  Import Cura in materials preferences page so we can use the active definition id
  Add layer height to high quality profile so we have something that changes
  Update example XML material to use the right product names
  Filter available materials by the machine definition
  Show the add machine dialog when we do not have an active machine
  Create machine-specific material containers for machine specific overrides in XML material files
  When creating a new container stack, add empty containers for things where we cannot find containers
  Add preferred variant, material and quality to UM2+ definition
  Account for global container stack being None in the backend plugin
  Use the global stack instance variable and account for it potentially being None
  Store the global container stack as an instance property
  Added wildcard to filtering
  Per object settings filter now uses correct bool types (instead of strings)
  Removed stray = sign.
  Fix creating print job name
  Disable asynchronous loading of SettingItem when Qt Version < 5.5
  Document QTbug
  Properly serialise all settings to g-code file
  Document GCodeWriter class
  ...
 2016-05-25 15:12:25 +02:00
fieldOfView
f349221fa6 Make simple mode extruder selection work with settings_rework 
CURA-1278 & CURA-790
 2016-05-25 14:56:05 +02:00
fieldOfView
2683907121 Show Ultimaker Original and Ultimaker Original + in Add Machine wizard 
CURA-1278
 2016-05-25 13:57:16 +02:00
Arjen Hiemstra
9bb4917ae7 Import Cura in materials preferences page so we can use the active definition id 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
ab0d34d9ac Add layer height to high quality profile so we have something that changes 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
81d0b34f20 Update example XML material to use the right product names 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
b2a8810d04 Filter available materials by the machine definition 
Since we now have some machine-specific materials
 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
2654033fae Show the add machine dialog when we do not have an active machine 2016-05-25 11:31:48 +02:00
Arjen Hiemstra
24210246ee Add preferred variant, material and quality to UM2+ definition 2016-05-25 11:31:19 +02:00
Ghostkeeper
c80455c6bc
Fix creating print job name 
Also fixed up the code style of that bit.

Perhaps this should've been done in Python, but that is for later.

Contributes to issue CURA-1278.
 2016-05-24 15:04:08 +02:00
Arjen Hiemstra
332321b991 Disable asynchronous loading of SettingItem when Qt Version < 5.5 2016-05-24 11:50:39 +02:00
Ghostkeeper
b1d5cad898
Document QTbug 
Took a while to find!

Contributes to issue CURA-1278.
 2016-05-24 11:43:57 +02:00
Arjen Hiemstra
a1115649cf Rename all variant profiles to .inst.cfg and correctly mark them as type variant 
Still some issues with formulas causing errors, but it is getting closer
 2016-05-23 18:21:23 +02:00
Arjen Hiemstra
f90be96bc6 Add back the Profiles page 2016-05-23 18:21:23 +02:00
Arjen Hiemstra
8284ab9de5 Insert printers and materials pages at the right location 2016-05-23 18:21:23 +02:00
Ghostkeeper
c996bcb191 Remove extruder drive upgrade option 
It was originally included with the thought that there would be different firmware for this, but there isn't. So this setting is not needed.

Contributes to issue CURA-1278.
 2016-05-23 17:19:18 +02:00
Arjen Hiemstra
f68a9ae90f Fix materials page so it displays the proper data 
Also, make sure the code is reasonably clean
 2016-05-23 14:43:56 +02:00
Arjen Hiemstra
c23980437d Fix naming of quality profiles 2016-05-23 14:43:56 +02:00
fieldOfView
0969356cb6 Fix bq_hephestos_2 json definition 2016-05-23 14:22:21 +02:00
fieldOfView
4877c35f06 Fix layout of SettingTextField items 
CURA-1278
 2016-05-23 13:35:52 +02:00
Arjen Hiemstra
e0c7ed8561 Add a plugin that loads XML materials and an example material 2016-05-23 02:19:39 +02:00
Arjen Hiemstra
b452cf7ba4 Add a materials management page 
Based off Aldo's work which is in a different branch
 2016-05-23 02:19:11 +02:00
Ghostkeeper
8e3d6cf2b5
Repair x and y nozzle offsets 
The setting name is different. This probably wasn't updated for a while.

Contributes to issue CURA-1278.
 2016-05-20 13:34:47 +02:00
Ghostkeeper
7656f5a19b
Make definition of machine_extruder_drive_upgrade 
This setting is specific to UMO, so I'm defining it in the UMO definition.

Contributes to issue CURA-1278.
 2016-05-20 13:30:19 +02:00
Ghostkeeper
6fe70fc7e9
Add definition for machine_use_extruder_offset_to_offset_coords 
While this was only used by Ultimaker printers, it is not specific to Ultimaker's printers so I'm putting the definition in FDMPrinter.

Contributes to issue CURA-1278.
 2016-05-20 13:28:05 +02:00
Ghostkeeper
9dc70fba02
Add missing category-metadata 
Forgot to add this, apparently.

Contributes to issue CURA-1278.
 2016-05-20 12:42:18 +02:00