3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 00:37:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
2244 commits 302 branches 270 tags 770 MiB
Commit graph

503 commits

Author SHA1 Message Date
Ghostkeeper
0684cee681 Merge branch '2.1' 
Conflicts:
	resources/machines/fdmprinter.json
	resources/machines/innovo-inventor.json
	resources/profiles/general/High+Quality.cfg
	resources/profiles/general/Low+Quality.cfg
	resources/profiles/general/Normal+Quality.cfg
	resources/profiles/general/Ulti+Quality.cfg
	resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
 2016-04-04 18:49:09 +02:00
Jaime van Kessel
3ed7d60adb Increased size of the label for layerview a bit more. 
CURA-1273
 2016-04-04 14:42:42 +02:00
Jaime van Kessel
819c9568b1 Backend now correctly handles machine instance change 
CURA-1323
 2016-04-04 10:29:42 +02:00
Jaime van Kessel
4ad88f3498 Layerview number is now correctly displayed 
CURA-1273y
 2016-04-01 14:50:47 +02:00
Jaime van Kessel
ca70b275d8 Revert "Changed wait for subprocess to poll" 
This reverts commit e463c93f77.
 2016-04-01 13:58:11 +02:00
Jaime van Kessel
e463c93f77 Changed wait for subprocess to poll 
The wait is a suspect in a MAC issue. CURA-1300
 2016-03-31 17:35:57 +02:00
Jaime van Kessel
6237767ba5 Fixed error message when using locked SD 
CURA-1187
 2016-03-29 11:52:14 +02:00
Jaime van Kessel
d3a6f63d1f 3MF no longer fails when there is no transformation matrix 2016-03-24 16:41:25 +01:00
Jaime van Kessel
c1af2c4ae0 3mf reader now uses correct coordinate frame 2016-03-24 09:46:28 +01:00
Jaime van Kessel
3663f8ca20 Backend now logs return codes of processes 
CURA-1133
 2016-03-23 15:11:56 +01:00
Ghostkeeper
a89e128f72
Add period after description 
This is in line with most other descriptions.

Contributes to issue CURA-1190.
 2016-03-22 17:02:42 +01:00
Ghostkeeper
a60f63c71b Add internationalisation for ChangeLog plug-in 
Some of these strings were not translated.

Contributes to issue CURA-1190.
 2016-03-22 15:38:01 +01:00
Ghostkeeper
a056ddc885
Add period at end of plug-in description 
For consistency. All other plug-ins have this (no really, now).

Contributes to issue CURA-1190.
 2016-03-22 15:10:57 +01:00
Ghostkeeper
b457af1081
Add period at end of plug-in description 
All other plug-in descriptions have that too. So for consistency.

Contributes to issue CURA-1190.
 2016-03-22 15:07:05 +01:00
Ghostkeeper
b67ba04222
Fix key in metadata 
The description key was broken (typo).

Contributes to issue CURA-1190.
 2016-03-22 15:05:22 +01:00
Ghostkeeper
47e856c927
Add period at end for consistency 
Other plugin descriptions also have a period at the end.

Contributes to issue CURA-1190.
 2016-03-22 13:35:28 +01:00
Jaime van Kessel
8f9210af6b Socket is now re-created regardless of process state 
The previous fix for this could cause an infinate slice loop on windows. CURA-1133
 2016-03-22 11:29:16 +01:00
Jaime van Kessel
dce4fa9479 Added forced re-creation of socket 
CURA-1133
 2016-03-21 16:32:10 +01:00
Jaime van Kessel
174f150ead Error now also causes terminate to be called 
CURA-1133
 2016-03-21 15:44:27 +01:00
Jaime van Kessel
3ecd746f21 Added even more logging 
CURA-1133
 2016-03-21 15:36:07 +01:00
Jaime van Kessel
46bf7e440e Added more logging & removed duplicate slicing canceled signals 
CURA-1133
 2016-03-18 12:00:10 +01:00
fieldOfView
a78e1a62d4 Fix ctypes imports in WindowsRemovableDrivePlugin 
See 9684ca80d7
 2016-03-17 20:34:18 +01:00
fieldOfView
6017d9176d Remove exception logging in USBPrinterManager because it caused an error every 5 seconds. 
CURA-1198
 2016-03-17 16:59:41 +01:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1' 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
 2016-03-17 15:24:00 +01:00
Jaime van Kessel
2df91d8e0b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 14:44:37 +01:00
Jaime van Kessel
89256b5423 Added explicit home bed before rest of bed leveling 
CURA-1102
 2016-03-17 14:44:09 +01:00
Ghostkeeper
4507560e30
Codestyle: Whitespace around operators 
A space on both sides around binary operators. A space after the comma.

Contributes to issue CURA-1102.
 2016-03-17 11:53:11 +01:00
Jaime van Kessel
9a6615213c Bed should no longer be damaged when leveling 
CURA-1102
 2016-03-16 15:18:11 +01:00
Jaime van Kessel
7c22fe1eb5 Removable drive plugin is now forced to use machine preference for output type 
Fixes CURA-1165
 2016-03-15 16:43:14 +01:00
Jaime van Kessel
4fb9a6a699 Per object settings now also uses visible depth 
CURA-1160
 2016-03-15 16:15:13 +01:00
Thomas-Karl Pietrowski
6a4e2019dc Removing unused imports 2016-03-15 12:57:03 +01:00
Thomas-Karl Pietrowski
148c13ac31 Removing unused imports, fixing a indent and adding more logging 
* Added the logging here, because it was called "except Exception as e:", so "e" seems to be something relevant.
 2016-03-15 12:55:08 +01:00
Thomas-Karl Pietrowski
8197e84927 Using PyDev compatible tag 2016-03-15 12:54:41 +01:00
Thomas-Karl Pietrowski
9684ca80d7 Removing unused imports, reorder them and replace windll with ctypes.windll (the same) 2016-03-15 12:53:29 +01:00
Jaime van Kessel
b863d239b0 Added more logging to engine connection 
Should make it easier to debug future issues. CURA-1133
 2016-03-15 12:53:22 +01:00
Thomas-Karl Pietrowski
6cd1171051 Removing unused imports 2016-03-15 12:53:07 +01:00
Thomas-Karl Pietrowski
0b93328aeb Using PyDev compatible tags 2016-03-15 12:52:29 +01:00
Thomas-Karl Pietrowski
e99099fd89 Cleanup in plugins/ImageReader/ImageReader.py 
* Removing unused import
* Marking two variables as @UnusedVariable
* Replacing i with _ in for-loop
 2016-03-15 12:50:46 +01:00
Thomas-Karl Pietrowski
c986fa0268 Removing unused imports 2016-03-15 12:50:29 +01:00
Thomas-Karl Pietrowski
5d00c3120d Use save variable names here 2016-03-15 12:35:33 +01:00
Thomas-Karl Pietrowski
8b95865843 Import of Logger missing here 2016-03-15 12:34:43 +01:00
Thomas-Karl Pietrowski
74627345a2 Corrections in plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py 
* Remove unused import
* Replace dict with dictionary in comment
* Use object_position instead of i
* Use current_object instead of object which is a built-in class
 2016-03-15 12:32:40 +01:00
Thomas-Karl Pietrowski
d1f5985fee Removing unused imports 2016-03-15 12:25:51 +01:00
Thomas-Karl Pietrowski
0081c44ba7 Marking unused variable 
Maybe work in progress here...
 2016-03-15 12:25:10 +01:00
Ghostkeeper
e4effc1236 Merge pull request #665 from thopiekar/master-code-fixes 
Fixing small issues in the code
 2016-03-15 10:57:50 +01:00
Thomas-Karl Pietrowski
7bc99c8c19 Removing unneeded imports and marking unused variable 
Not sure whether there is a WIP on the unused variable
 2016-03-14 17:18:45 +01:00
Thomas-Karl Pietrowski
6993e9e695 Renaming locals to copied_locals 
"locals" is something that comes with Python. Better renaming it.
 2016-03-14 17:16:23 +01:00
Thomas-Karl Pietrowski
429e54bc8a Removing unused import 2016-03-14 17:15:57 +01:00
Thomas-Karl Pietrowski
5a5664e164 RemovableDriveOutputDevice: Use device.getId() 
Should fix unmounting on OSX. Found this solution in Linux*.py.

Untested and fingers crossed...
 2016-03-14 17:07:02 +01:00
Thomas-Karl Pietrowski
3b8000035d Remove unneeded imports 2016-03-14 17:06:44 +01:00