Merge branch 'master' of github.com:jmwright/cadquery-freecad-module into cqgi
This commit is contained in:
commit
fc5d11f2ef
|
@ -12,7 +12,7 @@ if open.__module__ == '__builtin__':
|
||||||
pythonopen = open
|
pythonopen = open
|
||||||
|
|
||||||
|
|
||||||
def AutoExecute(self):
|
def AutoExecute():
|
||||||
"""We should be able to pass the Gui.Commands.CadQueryExecuteScript function directly to the file_reloaded
|
"""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
|
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."""
|
function is passed to file_reloaded signal and in turn calls the CadQueryExecuteScript.Activated function."""
|
||||||
|
|
|
@ -36,6 +36,7 @@ The module should show up in the 'Workbenches' drop down the next time you start
|
||||||
### Linux
|
### Linux
|
||||||
* /usr/lib/freecad/Mod
|
* /usr/lib/freecad/Mod
|
||||||
* /usr/local/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.
|
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
|
### Windows
|
||||||
* C:\Program Files\FreeCAD 0.14\Mod
|
* C:\Program Files\FreeCAD 0.14\Mod
|
||||||
* C:\Program Files (x86)\FreeCAD 0.14\Mod
|
* C:\Program Files (x86)\FreeCAD 0.14\Mod
|
||||||
|
* C:\Users\[your_user_name]\Application Data\FreeCAD\Mod
|
||||||
|
|
||||||
### Mac
|
### Mac
|
||||||
* /Applications/FreeCAD.app/Contents/Mod
|
* /Applications/FreeCAD.app/Contents/Mod
|
||||||
* /Applications/FreeCAD.app/Mod
|
* /Applications/FreeCAD.app/Mod
|
||||||
* /Users/<user>/Library/Preferences/FreeCAD/Mod
|
* /Users/[your_user_name]/Library/Preferences/FreeCAD/Mod
|
||||||
|
* ~/Library/Preferences/FreeCAD/Mod
|
||||||
|
|
||||||
## It's Installed, Now What?
|
## It's Installed, Now What?
|
||||||
For getting started information and troubleshooting steps, please see the [wiki](https://github.com/jmwright/cadquery-freecad-module/wiki)
|
For getting started information and troubleshooting steps, please see the [wiki](https://github.com/jmwright/cadquery-freecad-module/wiki)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user