From 0147c11e739f33974859d9d98815203c82a044cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20S=C3=A1nchez=20de=20Le=C3=B3n=20Peque?= Date: Fri, 21 Jul 2017 17:11:05 +0200 Subject: [PATCH 1/3] Suggest a user-wide installation path in README This avoids requiring root permissions for installation. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 02619c4..5784777 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ The module should show up in the 'Workbenches' drop down the next time you start ### Linux * /usr/lib/freecad/Mod * /usr/local/lib/freecad/Mod +* ~/.FreeCAD/Mod If you are running Ubuntu Linux, be sure to run the following line in a terminal before using this module. ``` @@ -45,11 +46,13 @@ sudo apt-get install python-pyside.qtnetwork ### Windows * C:\Program Files\FreeCAD 0.14\Mod * C:\Program Files (x86)\FreeCAD 0.14\Mod +* C:\Users\your_user_name\Application Data\FreeCAD\Mod ### Mac * /Applications/FreeCAD.app/Contents/Mod * /Applications/FreeCAD.app/Mod * /Users//Library/Preferences/FreeCAD/Mod +* ~/Library/Preferences/FreeCAD/Mod ## It's Installed, Now What? For getting started information and troubleshooting steps, please see the [wiki](https://github.com/jmwright/cadquery-freecad-module/wiki) From c775ad299d22c8e6ffcc61448b662bcd2377d59a Mon Sep 17 00:00:00 2001 From: Jeremy Wright Date: Fri, 1 Sep 2017 23:06:57 -0400 Subject: [PATCH 2/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5784777..e9a8c11 100644 --- a/README.md +++ b/README.md @@ -46,12 +46,12 @@ sudo apt-get install python-pyside.qtnetwork ### Windows * C:\Program Files\FreeCAD 0.14\Mod * C:\Program Files (x86)\FreeCAD 0.14\Mod -* C:\Users\your_user_name\Application Data\FreeCAD\Mod +* C:\Users\[your_user_name]\Application Data\FreeCAD\Mod ### Mac * /Applications/FreeCAD.app/Contents/Mod * /Applications/FreeCAD.app/Mod -* /Users//Library/Preferences/FreeCAD/Mod +* /Users/[your_user_name]/Library/Preferences/FreeCAD/Mod * ~/Library/Preferences/FreeCAD/Mod ## It's Installed, Now What? From 67140219009694f7c2b397ca7b5677c09960e2b4 Mon Sep 17 00:00:00 2001 From: Jeremy Mack Wright Date: Wed, 27 Sep 2017 20:57:24 -0400 Subject: [PATCH 3/3] Fixed the auto execute feature for those using external editors. --- Gui/ImportCQ.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gui/ImportCQ.py b/Gui/ImportCQ.py index 00625c9..303f0f3 100644 --- a/Gui/ImportCQ.py +++ b/Gui/ImportCQ.py @@ -12,7 +12,7 @@ if open.__module__ == '__builtin__': pythonopen = open -def AutoExecute(self): +def AutoExecute(): """We should be able to pass the Gui.Commands.CadQueryExecuteScript function directly to the file_reloaded connect function, but that causes a segfault in FreeCAD. This function is a work-around for that. This function is passed to file_reloaded signal and in turn calls the CadQueryExecuteScript.Activated function."""