GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-15 01:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,043 Commits 290 Branches 260 Tags
Commit Graph

653 Commits

Author SHA1 Message Date
Tim Kuipers
21ad4713a7 Merge branch '2.1' 2016-06-08 15:35:45 +02:00
Ghostkeeper
af484b03d8
Fix typo in variable name 2016-06-08 11:29:24 +02:00
Jaime van Kessel
9a14a3e8b7 Per object settings no longer watches "state" property 
CURA-1278
 2016-06-07 15:46:37 +02:00
Arjen Hiemstra
ca1b199c7e Fix PerObjectSettings to use the right objects when instantiating setting items 
Contributes to CURA-1592
 2016-06-07 13:19:37 +02:00
Ghostkeeper
c50d0a97da
Load extruder combobox synchronously 
Asynchronously causes Qt 5.4 to give a segfault.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-05 16:18:07 +02:00
Arjen Hiemstra
a81cab5eac Merge branch '2.1' 2016-06-04 19:11:59 +02:00
Jaime van Kessel
95a0c69662 Bit of code refactoring to prevent duplication 
CURA-1288
 2016-06-02 17:25:34 +02:00
Jaime van Kessel
1ae69b25fa Added documentation 2016-06-02 16:07:09 +02:00
Jaime van Kessel
2ed518c47e Removed no longer used code 
CURA-1278
 2016-06-02 16:02:47 +02:00
Jaime van Kessel
edd5eecc3d Per object settings no longer show depth identation, revert/inherit buttons 
CURA-1278
 2016-06-02 15:53:00 +02:00
Jaime van Kessel
c994cb6bef Slicing no longer occurs when a perObject setting is in error state 
CURA-1288
 2016-06-02 14:19:39 +02:00
Jaime van Kessel
ca218d7a1f Removed too generic exception handling 
CURA-1278
 2016-06-02 13:52:11 +02:00
Jaime van Kessel
1af6e63b35 Removed unused model 2016-06-02 13:41:46 +02:00
Arjen Hiemstra
070e791b94 Add a preference to change LayerView top layers between 1 and 5 
Fixes CURA-1643
 2016-06-02 11:23:18 +02:00
Arjen Hiemstra
5873f1d4d0 Limit layer processing to 99% to indicate more stuff needs to happen 
Fixes CURA-1644
 2016-06-02 11:22:39 +02:00
Arjen Hiemstra
eaea940aa2 Add support for some additional properties to XmlMaterialProfile 
Contributes to CURA-339
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
90ac1c1380 Add support for hotend-specfic overrides to XmlMaterialProfile 
Contributes to CURA-339
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
f491405eb1 Use a copy of the metadata for Xml materials 
Contributes to CURA-339
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
e0fab7aa11 Add some logging and documentation to XmlMaterialProfile 
Contributes to CURA-339
 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
49e5b1938a Reduce number of top layer to increase processing speed 2016-06-01 15:45:54 +02:00
Jaime van Kessel
29ed8c2f5b Increased width of per-object settings panel 
CURA-1278
 2016-05-31 11:33:02 +02:00
Jaime van Kessel
152f362562 Hide button is now in correct location 
CURA-1278
 2016-05-31 11:12:22 +02:00
Jaime van Kessel
72d7bd5769 Added hide button to per object settings 
CURA-1278
 2016-05-31 11:06:26 +02:00
Jaime van Kessel
5289d5b4ac Codestyle 
CURA-1278
 2016-05-31 11:02:22 +02:00
Ghostkeeper
7e33b76fe2 Increment version number 
Contributes to issue CURA-1583.
 2016-05-30 16:18:54 +02:00
Arjen Hiemstra
581b9ce11f Update AutoSave plugin to work with the new settings API 
Contributes to CURA-1615
 2016-05-30 15:29:10 +02:00
Arjen Hiemstra
79892daa5e Bump API version of plugins that do not need extra porting 
Contributes to CURA-1615
 2016-05-30 15:29:10 +02:00
Arjen Hiemstra
93873a2ce8 Also trigger a reslice when the containerstack's containers change 
Contributes to CURA-1278
 2016-05-30 14:02:51 +02:00
Arjen Hiemstra
8039184c18 Move setting error checking to StartSliceJob and allow the job to return a proper response 
Now the job can determine if we can continue with slicing or not and if
not, why not.

This also means we can now show a message when we cannot find any
slicable objects.

Contributes to CURA-1278
 2016-05-30 13:03:06 +02:00
Arjen Hiemstra
cd2b853fff Remove "slicing" message since it is now displayed in the sidebar 
Now removed for good

Contributes to CURA-1278
 2016-05-30 13:01:25 +02:00
Arjen Hiemstra
0b3b718e87 Make CuraEngineBackend respond to changes to the global container stack 
This way we can properly connect to propertyChanged signals and trigger
a reslice.

Contributes to CURA-1278
 2016-05-30 12:23:28 +02:00
Arjen Hiemstra
c63eb3871c Account for the changes to BackendState in Uranium 
Contributes to CURA-1278
 2016-05-30 12:22:12 +02:00
Jaime van Kessel
89c1136d7f Per object settings can now be added & changed 
CURA-1278
 2016-05-27 15:28:54 +02:00
Jaime van Kessel
a9efa3e612 Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 11:27:16 +02:00
Jaime van Kessel
c914446060 Initial changes for perobject stuff 
CURA-1278
 2016-05-27 11:26:41 +02:00
Ghostkeeper
e02e2bde8d
Remove semicolon at the end of the line 2016-05-26 16:35:34 +02:00
Arjen Hiemstra
d5fa6d884f Fix XML material profiles so the global properties are properly set 
Contributes to CURA-339
 2016-05-26 13:32:14 +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
Jaime van Kessel
1256f4a752 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-25 12:04:12 +02:00
Ghostkeeper
6522aae915
Improve slice trigger documentation 
Contributes to issue CURA-1278.
 2016-05-25 11:53:35 +02:00
Jaime van Kessel
5ba3f3ebad Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-25 11:50:22 +02:00
Arjen Hiemstra
e29cc5e699 Create machine-specific material containers for machine specific overrides in XML material files 2016-05-25 11:31:19 +02:00
Arjen Hiemstra
396f023bdf Account for global container stack being None in the backend plugin 2016-05-25 11:31:19 +02:00
Jaime van Kessel
81cdb3fd8c Added wildcard to filtering 
CURA-1278
 2016-05-25 11:28:58 +02:00
Jaime van Kessel
5f54d611cf Per object settings filter now uses correct bool types (instead of strings) 
CURA-1278
 2016-05-25 11:16:57 +02:00
Jaime van Kessel
fd3788ba7c Removed stray = sign. 
CURA-1278 CURA-1592
 2016-05-25 11:06:48 +02:00
Ghostkeeper
d602c0754f
Properly serialise all settings to g-code file 
This makes for ugly g-code files, true, but at least the functionality of saving settings is useful now: It's traceable. Could've implemented this somewhere else too, but this is fine for now.

Contributes to issue CURA-1278.
 2016-05-24 03:00:16 +02:00
Ghostkeeper
8b5c4b0361
Document GCodeWriter class 
Contributes to issue CURA-1278.
 2016-05-24 02:28:56 +02:00
Ghostkeeper
673f63cf51
Remove unused import 
The deep copy is no longer needed. Also updated copyright year.

Contributes to issue CURA-1278.
 2016-05-24 02:26:02 +02:00
Ghostkeeper
59b8d5c169
Fix saving g-code to file 
The settings that are serialised at the end of the g-code are now the serialised global container stack. That's fairly useless since the serialised version of a container stack just lists the IDs of the containers in the stack, not the settings themselves. One of these containers is likely a current_profile container and that's all the information you'll get from that serialisation.

Contributes to issue CURA-1278.
 2016-05-24 02:24:11 +02:00