GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-16 10:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
36,330 Commits 287 Branches 260 Tags
Commit Graph

144 Commits

Author SHA1 Message Date
Simon Edwards
454a5969c2 Removed debug. 
CURA-3418 Cura build on Win 64 fails due to $PYTHONPATH
 2017-02-28 10:25:44 +01:00
Simon Edwards
f5f02ead88 Added some debug. 
CURA-3418 Cura build on Win 64 fails due to $PYTHONPATH
 2017-02-27 17:13:12 +01:00
Simon Edwards
8602d984a9 Stop $PYTHONPATH from messing up the search path for DLLs. 
CURA-3418 Cura build on Win 64 fails due to $PYTHONPATH
 2017-02-27 13:38:05 +01:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Simon Edwards
412e299f0c Cleaned up and bug fixed the command loop. 
CURA-3335 Single instance Cura and model reloading
 2017-02-07 13:33:37 +01:00
Simon Edwards
0e306df1bc Initial basic version of this feature. 
CURA-3335
 2017-02-02 15:59:09 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. 
CURA-2917
 2016-12-12 16:05:35 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking). 
CURA-2917
 2016-11-21 21:36:08 +01:00
Thomas Karl Pietrowski
31436cbdf5 Removing debug print in Nvidia fix 2016-08-07 08:49:51 +02:00
Thomas Karl Pietrowski
6b2935379f Adding "LinuxMint" 
Moving the Nvidia fix just broke another PR here on GitHub. This is the original commit:
8b750cb27c
Thanks to @Nihlus

Why we are still listing all the distributions? - Still it isn't clear whether this problem is a "Debian"-specific bug or not.
 2016-08-07 08:03:51 +02:00
Thomas Karl Pietrowski
35c520a787 Merge pull request #836 from Ultimaker/master-updates-for-Linux 
Updating NVidia workaround
 2016-08-07 07:59:34 +02:00
Jaime van Kessel
0e098e38eb More fixes for changed setting object location 2016-07-04 13:10:29 +02:00
Thomas Karl Pietrowski
7f5f22d472 Moving Nvidia workaround to cura_app.py 
* also added "debian" into the list of distributions
 2016-07-01 19:37:24 +02:00
Thomas Karl Pietrowski
536e0f489a Merge branch 'master' of https://github.com/Ultimaker/Cura into master-using-platform 2016-06-15 14:59:34 +02:00
Simon Edwards
175b5429b4 Refactor the profile and Cura specific import/export code, put the cura stuff in Cura itself. 
Contributes to CURA-1667 Profile import/export
 2016-06-14 11:44:38 +02:00
Thomas Karl Pietrowski
f11ef0c0c0 Using UM.Platform for Windows detection 
The diff says everything.
 2016-06-11 13:42:09 +02:00
Thomas Karl Pietrowski
0d8292df49 Using platform.system() for Windows detection 
This is just cosmetics. It works the same as system.platform, but looks
better. Additionally "win32" might be misleading, as it sounds like we
are checking for Windows 32bit here.
 2016-06-11 12:50:28 +02:00
Thomas Karl Pietrowski
b61b0a7ee2 Removing unneeded import of os' 2016-06-10 10:52:12 +02:00
Thomas-Karl Pietrowski
7d2b329e78 Just a stupid mistake 
.reverse() does not return anything (None)
 2016-04-21 20:23:07 +02:00
Thomas-Karl Pietrowski
3a61cf3152 Little typo 2016-04-21 19:41:10 +02:00
Thomas-Karl Pietrowski
1a52454165 This should be fine now.. 2016-04-21 19:09:15 +02:00
Thomas-Karl Pietrowski
61069e9a71 Making the fix working with a list of PATHS seperated by os.pathsep 
Needs testing but should work. (fingers crossed)
 2016-04-21 17:34:33 +02:00
Thomas-Karl Pietrowski
286673e812 Making WORKAROUND a true marker 2016-04-19 20:18:07 +02:00
Thomas-Karl Pietrowski
98c84798c6 Making sure we got the realpath when using an absolute path 2016-04-19 20:17:20 +02:00
Thomas-Karl Pietrowski
8c0d7aea8a Merge branch 'pythonpath-fix-reworked' of https://github.com/thopiekar/Cura into pythonpath-fix-reworked 2016-04-19 19:39:04 +02:00
Thomas-Karl Pietrowski
102e13b152 Doing the check the other way round.. 2016-04-19 19:35:31 +02:00
Thomas Karl Pietrowski
e040029a41 Just a little typo 2016-04-19 19:18:05 +02:00
Thomas-Karl Pietrowski
839bc1fec8 Making PR #708 more concrete 
Now a check is made whether PYTHONPATH is set at all. So 'normal' installations will pass that section.
After that sys.path is checked whether the last element is PYTHONPATH.
If it is PYTHONPATH will be moved before entry at sys.path[1], because sys.path[0] is os.curdir. Inserting PYTHONPATH in front of it might be unsave.
 2016-04-19 19:11:14 +02:00
Thomas-Karl Pietrowski
a8e13f13ba Add missing import of 'os' 2016-04-19 18:56:58 +02:00
Youness Alaoui
df8207747a Force PYTHONPATH to be in the top of the sys.path list. 
This fixes https://github.com/Ultimaker/Cura/issues/704
 2016-04-18 14:42:29 -04: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
Arjen Hiemstra
041fa2b359 Import Arcus before importing Cura (and PyQt5) 
Workaround an issue on certain Linux systems that causes a race
condition between Arcus and PyQt5.

Contributes to CURA-434
 2016-02-10 13:55:52 +01:00
Arjen Hiemstra
9267b517d6 Fix coding style issues 2015-11-27 16:53:32 +01:00
Arjen Hiemstra
1140c853d1 Try to use Protobuf CPP implementation if it is available 
The C++ implementation is far faster so should always be
used if available. If not, we log a warning since it makes
a big difference.
 2015-11-04 16:42:07 +01:00
Arjen Hiemstra
ba86352642 Fix issues with crash handler and log file creation on Windows 2015-10-05 18:32:44 +02:00
Arjen Hiemstra
23e36b51e6 Fix stdout/stderr output location so we do not output to UM but to cura 
Fixes #452
 2015-10-01 16:43:29 +02:00
Arjen Hiemstra
5adee69b75 Fix Windows build 2015-09-29 09:24:22 -07:00
Arjen Hiemstra
9b119e996a Capture stdout and stderr on Windows to prevent py2exe messages 
CURA-215 #done
 2015-09-29 16:58:04 +02:00
Arjen Hiemstra
803b4fde8d Handle all uncaught exceptions through CrashHandler and gracefully fail if we have no QCoreApplication 2015-08-04 10:31:25 +02:00
Arjen Hiemstra
8130bae4c0 Add a crash handler to catch uncaught exceptions 
This should catch any uncaught exceptions and avoid the Py2Exe message
about Cura.log

Fixes #133
 2015-07-13 16:54:40 +02:00
Arjen Hiemstra
830dc45cce Make cura_app executable 
Contributes to Ultimaker/Uranium#42
 2015-05-27 16:31:01 +02:00
Arjen Hiemstra
96e0faf937 Rename cura.py to cura_app.py to prevent conflicts with "cura" directory 
Contributes to Ultimaker/Uranium#41
 2015-05-21 15:13:06 +02:00