Thomas-Karl Pietrowski
8197e84927
Using PyDev compatible tag
2016-03-15 12:54:41 +01:00
Jaime van Kessel
cff34fa441
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-15 12:53:53 +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
Thomas-Karl Pietrowski
9fc573a7f9
Merge remote-tracking branch 'upstream/master' into master-code-fixes
2016-03-15 12:20:15 +01:00
Thomas-Karl Pietrowski
eee1be94ab
Removing unused imports and rename built-in varibales/functions into save one
...
* The new names for the variables might be misleading...
2016-03-15 12:18:44 +01:00
Thomas-Karl Pietrowski
5ae63f2de1
Removing unused imports
2016-03-15 12:17:59 +01:00
Thomas-Karl Pietrowski
95d9700c0e
Removing unused import and marking other as (probably) used imports
2016-03-15 12:16:14 +01:00
Thomas-Karl Pietrowski
7be6340dd5
Cleanups in cura/CuraApplication.py
...
* Removed unused imports
* Replaced i with _ in for-loop (removes message about unused variable)
* As we have "Exception as e" use e in debug message
2016-03-15 12:14:18 +01:00
Thomas-Karl Pietrowski
bbf931450a
Marking another unused variable
2016-03-15 12:09:49 +01:00
Tim Kuipers
34814cd657
JSON: updated conical support minimal width to 5mm: more chance it will stay up straight
2016-03-15 11:10:20 +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
Tim Kuipers
1608f06c6c
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-03-15 10:00:50 +01:00
Tim Kuipers
69997587e9
JSON: introduced Outer Wall Inset (CURA-1098)
2016-03-15 10:00:41 +01:00
fieldOfView
9c2f9e3aac
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-03-14 17:42:57 +01:00
fieldOfView
4e803a0815
Fix errors starting Cura with no machine selected
...
Contributes to CURA-855
2016-03-14 17:42:29 +01:00
Thomas-Karl Pietrowski
115d5dceae
Removing more unneeded imports
2016-03-14 17:26:21 +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
Thomas-Karl Pietrowski
19ccfdfbd7
RemovableDriveOutputDevice: Same for OSX
...
See 0b0bc80805
2016-03-14 17:04:51 +01:00
Thomas-Karl Pietrowski
0b0bc80805
RemovableDriveOutputDevice: Making output of uname command useful
2016-03-14 17:03:08 +01:00
Thomas-Karl Pietrowski
9ccd903fc9
Fixing typo
2016-03-14 16:57:58 +01:00
Thomas-Karl Pietrowski
60d1f34b17
Removing unused import
2016-03-14 16:57:21 +01:00
Thomas-Karl Pietrowski
48d06fea50
Fixing typo
2016-03-14 16:50:28 +01:00
Thomas-Karl Pietrowski
2e8d653fa5
webbrowser is not used here anymore
2016-03-14 16:38:21 +01:00
Thomas-Karl Pietrowski
ca65547f05
Remove unused imports
2016-03-14 16:06:10 +01:00
fieldOfView
eb8a1bea8d
Add styling for disabled controls
...
Contributes to CURA-573
2016-03-14 15:58:25 +01:00
Thomas-Karl Pietrowski
f2da1db984
We only use os.path here
2016-03-14 15:50:59 +01:00
Thomas-Karl Pietrowski
3893cd06bd
platform gets imported twice
2016-03-14 15:49:47 +01:00
Thomas-Karl Pietrowski
2a104bc6da
Remove unused imports and replace object with entry
...
"object" is also a built-in function of python
2016-03-14 15:47:17 +01:00
Thomas-Karl Pietrowski
cbc7f0c1de
Remove unneeded line
...
This variable gets redefined later...
2016-03-14 15:45:02 +01:00
Thomas-Karl Pietrowski
27da5c56c0
Marking unused variable
2016-03-14 15:43:57 +01:00
Ghostkeeper
16f059d31c
Merge pull request #664 from thopiekar/master-usb-printing
...
USBPrinting: Cleanups to USBPrinterManager
2016-03-14 15:39:04 +01:00
Thomas-Karl Pietrowski
af280b782e
Rename name to printer_name
...
"name" is a built-in function
2016-03-14 15:39:01 +01:00
Thomas-Karl Pietrowski
3b58d1e2a5
Removing unused import of "os"
2016-03-14 15:38:05 +01:00
Thomas-Karl Pietrowski
a00f0ece18
Adding #@UnusedImport to ignore this import
2016-03-14 15:34:42 +01:00
Thomas-Karl Pietrowski
27423205b0
Rename type into hook_type
...
"type" itself if a built-in function. Using this name could be unsave.
2016-03-14 15:32:51 +01:00
Thomas-Karl Pietrowski
6adfbf4b90
Removing import of "os"
...
"os" is only needed for Windows as far as I can see it. However, it gets reimported for Windows, as you can see in line 22.
2016-03-14 15:30:15 +01:00