492 Commits

Author SHA1 Message Date
Ghostkeeper
ccda155882
Add setting_version every time we create InstanceContainer
Except when we fill the instancecontainer via deserialising. Because then we want to retain the original version number.

Contributes to issue CURA-3427.
2017-05-15 10:39:53 +02:00
Lipu Fei
598751817a Fix resolve strategy "new" for user instance container
CURA-3756
2017-05-12 16:52:37 +02:00
Lipu Fei
3996230ff9 Load GlobalStack before ExtruderStacks for project loading
CURA-3756
2017-05-12 15:52:16 +02:00
Lipu Fei
fe11819ce9 Handle "new" resolve strategy for definition&quality changes
CURA-3756
2017-05-12 14:34:41 +02:00
Lipu Fei
9ea0f48341 Check definition changes conflicts in preRead()
CURA-3756
2017-05-12 14:34:41 +02:00
Lipu Fei
8a94f94258 WIP: use .userChanges property to replace user containers in project loading
CURA-3756
2017-05-11 14:54:00 +02:00
Lipu Fei
3baec9b742 WIP: set dirty after overriding a user container with deserialize()
CURA-3756
2017-05-11 14:53:04 +02:00
Lipu Fei
bb0e711577 WIP: fix material container renaming in project loading
CURA-3756
2017-05-11 14:20:11 +02:00
Lipu Fei
f436da8674 WIP: fix project loading and container renaming
CURA-3756
2017-05-11 14:20:11 +02:00
Jack Ha
79561f44b1 Fix project load, new non existing machine. CURA-3756 2017-05-10 16:16:57 +02:00
Jack Ha
d9f0e1fd4b WIP project loading - at least it mostly works again. CURA-3756 2017-05-10 15:37:22 +02:00
Lipu Fei
77864f4237 WIP: Fix definition_changes handling in 3mf reader
CURA-3756
2017-05-10 13:07:45 +02:00
Lipu Fei
577fc0f082 Fix WorkspaceDialog to include resolve for definition_changes
CURA-3756
2017-05-10 13:07:45 +02:00
Jack Ha
b688178a2e Fix one part of project load - update existing. CURA-3756 2017-05-10 10:56:19 +02:00
Lipu Fei
c60fefc927 Add non-existing instance containers when opening a project file
CURA-3756
2017-05-09 14:58:18 +02:00
Lipu Fei
acde348c6d Use ConfigParser hack to replace connect_signals=False hack
CURA-3756
2017-05-09 13:07:42 +02:00
Jack Ha
0d76ce72b0 Add comments CURA-3756 2017-05-09 13:07:42 +02:00
Lipu Fei
711b493ebf Fix code style 2017-05-09 13:07:42 +02:00
Lipu Fei
3e6d4b9230 document why no signals connecting in project file pre-read
CURA-3756
2017-05-09 13:07:41 +02:00
Lipu Fei
9c747733c4 Project Reader: Use ".<ext>" for profile type detection
CURA-3756
2017-05-09 13:07:41 +02:00
Ghostkeeper
61f7b6aa68 Add spaces around binary operator
According to our code style.

Contributes to issue CURA-3756.
2017-05-09 13:07:41 +02:00
Lipu Fei
53141303d2 WIP: Fix project loading
CURA-3756
2017-05-09 13:07:41 +02:00
Jack Ha
1a01d1b193 Change permissions back to 644 2017-04-05 10:19:12 +02:00
Jack Ha
2d6df1ae4a Fix workspacedialog booboo typo. 2017-04-05 10:18:36 +02:00
Lipu Fei
6b9d3e8041 Merge pull request #1636 from fieldOfView/fix_recent_dialogs
Fix issues with Workspace and Profile Changes dialogs
2017-04-04 14:35:12 +02:00
fieldOfView
fd09a1959b Simplify margins and make them DPI aware 2017-04-02 15:54:06 +02:00
fieldOfView
ed8954c1db Replace font.pixelSize with DPI-aware font.pointSize
This also uses the same pointSize as eg the PreferencesPage.qml uses
2017-04-02 15:31:35 +02:00
fieldOfView
2e1dd46ea4 Replace hardcoded color with system-theme color 2017-04-02 14:38:11 +02:00
fieldOfView
d536bbd6b9 Fix Hi DPI issues with Workspace and Profile Changes dialogs 2017-04-02 12:38:41 +02:00
fieldOfView
adf2ac10b0 Fix check for succesfully imported 3MFReader & 3MFWriter modules 2017-03-30 13:56:19 +02:00
fieldOfView
2b761b87ac Fail gracefully when libSavitar is not found
By catching the ImportError, this prevents the logs being clogged with exceptions in start and when the plugins preference page is touched.
2017-03-25 09:56:02 +01:00
Jack Ha
6858db5e17 Merge branch '2.5' 2017-03-20 15:17:29 +01:00
Jack Ha
48c6c523ec Only 3mf nodes with mesh data are getting the sliceable object decorator. CURA-3559 2017-03-20 14:43:46 +01:00
Jack Ha
a56b7cd98d Merge branch '2.5' 2017-03-20 13:42:11 +01:00
Jack Ha
b21a87b25b Fix not slicing refreshing after deleting last object from loaded project file. CURA-3559 2017-03-20 13:41:47 +01:00
Lipu Fei
e00c68344a CURA-3495 open project/models in one dialog 2017-03-16 13:37:06 +01:00
Jaime van Kessel
d93b137c95 No longer add nodes that don't have children or MeshData
CURA-3493
2017-03-10 15:48:29 +01:00
Ghostkeeper
d1fada78e6
Merge branch '3mf_speedup' 2017-03-06 17:03:42 +01:00
Jaime van Kessel
bae7af1ea0 Dots in the ID no longer confuse workspace reader
CURA-3450
2017-03-02 17:06:10 +01:00
fieldOfView
9229027001 Refactor properties that start with 'get' to avoid confusion between slots & properties
Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.
2017-02-17 13:35:01 +01:00
Jaime van Kessel
b6118a764e Updated documentation
CURA-3215
2017-02-06 14:13:20 +01:00
Jaime van Kessel
a3326a8313 3mf reader now uses libSavitar for loading
This greatly decreases (~factor 10) the time required to load 3mf files

CURA-3215
2017-02-02 15:54:44 +01:00
Simon Edwards
eb43806d7a Merge branch 'master' into python_type_hinting 2017-01-27 15:37:30 +01:00
Jaime van Kessel
d9541a08b8 3mf reader now uses fast normal calculation
CURA-3215
2017-01-26 17:27:41 +01:00
Jaime van Kessel
b284e8508a Added extra checks to prevent unneeded signal emits 2017-01-24 13:29:33 +01:00
Simon Edwards
1b43e4981e Fixes for all of the plugins. Added a script to invoke mypy. (I'm stiiiick of .bat files. They are just broken.) 2017-01-17 16:57:37 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
16a748e0d6 Merge pull request #1326 from Ultimaker/big_flame_graph
Support for the Big Flame Graph profiler
2017-01-12 14:25:18 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
Youness Alaoui
9e85d6c894 Fix GCodeReader-feature related _readMeshfinished to match changes upstream.
The job.getResult() now returns a list of nodes now, so we need to loop
over those nodes instead of taking it as a single node value.
2016-12-23 15:53:17 -05:00