GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,175 Commits 291 Branches 260 Tags
Commit Graph

1342 Commits

Author SHA1 Message Date
Simon Edwards
9641a25f31 Fixed up the convex hull 'shadow' creation and deletion after the merge. 
Contributes to CURA-1504
 2016-06-22 14:48:15 +02:00
Simon Edwards
fd42a43270 Merge branch 'master' into simple_convex_hull 
Conflicts:
	cura/BuildVolume.py
	cura/ConvexHullDecorator.py
	cura/ConvexHullJob.py
	cura/CuraApplication.py
 2016-06-21 14:47:10 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages 
CURA-1385
 2016-06-20 13:46:05 +02:00
Jaime van Kessel
6f7affa2bf Machine actions can now be triggered from QML 
CURA-1385
 2016-06-17 17:22:49 +02:00
Jaime van Kessel
af3e4e3a15 Machine actions can now be used as a plugin type for Cura 
CURA-1385
 2016-06-17 15:45:10 +02:00
Jaime van Kessel
3a46bb8d8a Added CameraImageProvider & camera handling 
CURA-1036 and CURA-338
 2016-06-16 09:34:43 +02:00
Thomas Karl Pietrowski
6a89062b0a Differencing between Platform from UM.* and UM.Scene.* 2016-06-15 16:03:18 +02:00
Thomas Karl Pietrowski
c1cf78f662 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' into master-using-platform 2016-06-12 10:53:36 +02:00
Thomas Karl Pietrowski
b047db36fd Using isLinux() for Linux detection 
Of course there are more places where we can replace these checks.
 2016-06-11 13:43:50 +02:00
Jaime van Kessel
9626cddf34 Extruder trains are now correctly saved 2016-06-10 16:53:59 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Tim Kuipers
149af8af28 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 12:29:06 +02:00
Tim Kuipers
12a7b99cf7 fix: merge b3cfa62 went wrong, no slicing happened (CURA-1558) 2016-06-09 15:43:18 +02:00
Simon Edwards
c03588c6e5 Profile export now goes via the plugin system, and does the same filename checks as before. 
Contributed to CURA-1667 Profile import/export
 2016-06-09 14:14:48 +02:00
Tim Kuipers
b3cfa62775 Merge branch 'feature_settings_restricted_to_settingsbases' 2016-06-09 13:11:30 +02:00
fieldOfView
485ae53660 Show quality profile and user profile settings side-by-side on Profiles manager 
Introduces ContainerSettingsModel, which can combine the settings of instances from multiple containers into one model.

Towards CURA-1668
 2016-06-08 16:35:10 +02:00
Ghostkeeper
59c8a4e66d
Fix validation of extruder-type settings 
Based on how ints are validated, since the data is the same.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-08 14:16:13 +02:00
Tim Kuipers
56b00ad425 JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560) 
removed:settable_globally: true
settable_per_meshgroup: true
settable_per_extruder: true when settable_per_mesh was also true
 2016-06-08 11:54:25 +02:00
Tim Kuipers
2e2437d163 feat: use settable_per_[mesh|extruder|meshgroup|globally] instead of global_only (CURA-1560) 2016-06-08 10:50:40 +02:00
Ghostkeeper
8b1c363932
Load current machine's extruders upon creation, start and switch of machines 
This requires some trickery of initialising the extruder manager before the machine manager is initialised, so that it properly listens to global container stack changes.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 10:40:10 +02:00
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item 
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager 
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
fieldOfView
b88f2847ef Fix saving machine instances to the cura profile 
CURA-340, see c79b7bdd7a
 2016-06-06 08:39:38 +02:00
Jaime van Kessel
b63c308694 Changed order of loading containers so extruder stacks don't fail anymore 
CURA-340
 2016-06-05 12:45:02 +02:00
Jaime van Kessel
eeb1882c2f Merge pull request #765 from thopiekar/master-buildtype-in-splashscreen 
Fixing a typo
 2016-06-05 11:38:20 +02:00
Jaime van Kessel
c79b7bdd7a Machine manager now creates ExtruderTrainStacks 
CURA-340
 2016-06-05 11:34:29 +02:00
Thomas Karl Pietrowski
d6acb78bd4 Fixing a typo 
Had that change locally here, but for a reason I forgot to commit that
fix. Oops..
 2016-06-05 09:59:57 +01:00
Jaime van Kessel
cb0df43f4b Merge branch 'master-buildtype-in-splashscreen' of git://github.com/thopiekar/Cura into thopiekar-master-buildtype-in-splashscreen 2016-06-05 10:28:33 +02:00
Thomas Karl Pietrowski
c62ab6e937 Adding a field of the build type to the spashscreen. 
For example, if the community distributes Cura in a different way, they
can set CURA_BUILDTYPE via 'cmake -DCURA_BUILDTYPE=' and whenever Cura
is launched " (PPA)" will be appended. Of course, this could be done by
appending " (PPA)" to CURA_VERSION, but in case of my Ubuntu/Debian
packaging it will only need one modification in debian/changelog to
change the version. During build (debian/rules) this version will be
read from debian/changelog.
Changing the version number across different files, is a waste of time.

Finally, we can use that field in the future to indicate debug or other
other special builds.
 2016-06-04 13:55:35 +02:00
Jaime van Kessel
171adde6be Fixed broken signal when file was loaded 2016-06-03 10:15:01 +02:00
fieldOfView
d7148844ac Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-02 17:44:29 +02:00
fieldOfView
0dec0aafcf Fix exception when loading an object 
CURA-1619
 2016-06-02 17:44:06 +02:00
Arjen Hiemstra
4cd224aeb2 Add empty variant, material and quality containers 
Since we need these for making container switching work.

Contributes to CURA-1612
 2016-06-02 17:21:49 +02:00
fieldOfView
184247ced6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-02 16:38:41 +02:00
fieldOfView
bb18bf6a30 Fix creating a jobname after loading a file 
Moves jobname creation out of qml and into python.
CURA-1619
 2016-06-02 16:38:06 +02:00
Ghostkeeper
84fc7948ce
Expose ExtrudersModel to QML 
It is required by the drop-down for extruder settings.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 16:09:10 +02:00
Ghostkeeper
45d01bf371
Remove unused import 
This was no longer needed since ExtruderManager is now a singleton. It's no longer in CuraApplication.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:13 +02:00
Ghostkeeper
f18eeba793
Add extruder setting type 
This is a new data type. It behaves and saves just like an integer, but it's actually just an index of the extruder to use.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
06f7f90bb0
Make ExtruderManager into a singleton 
This way we don't need to load it in CuraApplication but we can just load it whenever it is first needed. ExtruderManager should be robust against initialising it at any point in Cura's runtime.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 14:17:12 +02:00
Ghostkeeper
95e633f16c
Load extruder manager on start-up 
This will consequently also load all extruder stacks of the current machine whenever the current machine changes.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-02 11:17:52 +02:00
Arjen Hiemstra
f21e48adbb Register all QML files in Cura's QML directory as part of the Cura module 
Jaime asked for it.
 2016-05-31 18:07:33 +02:00
Arjen Hiemstra
bdc8fdf508 Turn CuraApplication::_onExit into public api as saveSettings 
Since we need it for the autosave plugin

Contributes to CURA-1615
 2016-05-30 15:29:10 +02:00
Tim Kuipers
b8df3825f6 JSON fix: remove visible property (and add visibility defaults (CURA-1443) 
for acceleration and jerk settings
 2016-05-30 14:54:33 +02:00
Ghostkeeper
41425fd36e
Replace symbols in default visible settings before usage 
These characters are just for visualisation in the code. They should never be used during the normal operation of the program, nor should they be saved to the file. So just replace them immediately.

Contributes to issue CURA-1278.
 2016-05-27 14:39:53 +02:00
Ghostkeeper
8bd06ee8ec Merge branch 'master' of github.com:Ultimaker/Cura 2016-05-27 14:09:38 +02:00
Jaime van Kessel
990d05815b Added qml files to import path 2016-05-27 14:00:38 +02:00
Ghostkeeper
3311fa8033
Add resource type for extruder definitions 
The definition is derived with inheritance, just like the printers. Therefore I decided to call this 'ExtruderStack' in line with how the resource type for the printer is named.

Contributes to issue CURA-1278.
 2016-05-27 10:23:28 +02:00
fieldOfView
6bc61a6352 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-26 18:07:00 +02:00
fieldOfView
c01e7144d1 Consistently change the spelling of bounding box 
bounding box, bounding_box, boundingBox
 2016-05-26 18:06:40 +02:00
Arjen Hiemstra
7ce4e23677 Add all categories to default visible list 
Since otherwise none of the children will be visible

Contributes to CURA-1278
Fixes CURA-1614
 2016-05-26 15:52:36 +02:00