mirror of
https://github.com/jdegenstein/jmwright-CQ-Editor.git
synced 2025-12-20 14:37:04 +01:00
Compare commits
6 Commits
0.30-dev
...
0.30-dev-2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
25d4c2c45c | ||
|
|
e59c6ae7ba | ||
|
|
0c7237fecb | ||
|
|
a83d03c7ef | ||
|
|
1b75bf8fc0 | ||
|
|
21d729d758 |
@@ -12,14 +12,14 @@ jobs:
|
|||||||
build-linux:
|
build-linux:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: mamba-org/provision-with-micromamba@main
|
- uses: mamba-org/setup-micromamba@v1
|
||||||
with:
|
with:
|
||||||
#miniconda-version: "latest"
|
#miniconda-version: "latest"
|
||||||
#auto-update-conda: true
|
#auto-update-conda: true
|
||||||
environment-name: test
|
environment-name: test
|
||||||
environment-file: environment.yml
|
environment-file: environment.yml
|
||||||
extra-specs:
|
create-args: >-
|
||||||
python=3.10
|
python=3.10
|
||||||
- name: pip install cadquery CQ-editor ... etc
|
- name: pip install cadquery CQ-editor ... etc
|
||||||
shell: bash --login {0}
|
shell: bash --login {0}
|
||||||
@@ -48,21 +48,21 @@ jobs:
|
|||||||
micromamba info
|
micromamba info
|
||||||
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
|
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
|
||||||
cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
|
cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
|
||||||
- uses: alehechka/upload-tartifact@v1
|
- uses: alehechka/upload-tartifact@v2
|
||||||
with:
|
with:
|
||||||
name: CQ-editor-Linux-x86_64
|
name: CQ-editor-Linux-x86_64
|
||||||
path: dist
|
path: dist
|
||||||
build-macos:
|
build-macos:
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: mamba-org/provision-with-micromamba@main
|
- uses: mamba-org/setup-micromamba@v1
|
||||||
with:
|
with:
|
||||||
#miniconda-version: "latest"
|
#miniconda-version: "latest"
|
||||||
#auto-update-conda: true
|
#auto-update-conda: true
|
||||||
environment-name: test
|
environment-name: test
|
||||||
environment-file: environment.yml
|
environment-file: environment.yml
|
||||||
extra-specs:
|
create-args: >-
|
||||||
python=3.10
|
python=3.10
|
||||||
- name: pip install cadquery CQ-editor ... etc
|
- name: pip install cadquery CQ-editor ... etc
|
||||||
shell: bash --login {0}
|
shell: bash --login {0}
|
||||||
@@ -94,14 +94,16 @@ jobs:
|
|||||||
build-windows:
|
build-windows:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v3
|
||||||
- uses: mamba-org/provision-with-micromamba@main
|
- uses: mamba-org/setup-micromamba@v1
|
||||||
with:
|
with:
|
||||||
#miniconda-version: "latest"
|
#miniconda-version: "latest"
|
||||||
#auto-update-conda: true
|
#auto-update-conda: true
|
||||||
environment-name: test
|
environment-name: test
|
||||||
environment-file: environment.yml
|
environment-file: environment.yml
|
||||||
extra-specs:
|
init-shell: >-
|
||||||
|
powershell
|
||||||
|
create-args: >-
|
||||||
python=3.10
|
python=3.10
|
||||||
- name: pip install cadquery CQ-editor ... etc
|
- name: pip install cadquery CQ-editor ... etc
|
||||||
shell: powershell
|
shell: powershell
|
||||||
@@ -123,7 +125,7 @@ jobs:
|
|||||||
micromamba info
|
micromamba info
|
||||||
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
|
pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
|
||||||
Copy-Item D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\pyinstaller\CQ-editor.cmd D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\
|
Copy-Item D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\pyinstaller\CQ-editor.cmd D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\
|
||||||
- uses: alehechka/upload-tartifact@v1
|
- uses: alehechka/upload-tartifact@v2
|
||||||
with:
|
with:
|
||||||
name: CQ-editor-Windows
|
name: CQ-editor-Windows
|
||||||
path: dist
|
path: dist
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ CadQuery GUI editor based on PyQT supports Linux, Windows and Mac.
|
|||||||
|
|
||||||
### Release Packages
|
### Release Packages
|
||||||
|
|
||||||
TBD
|
Stable release builds which do not require Anaconda are attached to the [latest release](https://github.com/jdegenstein/jmwright-CQ-editor/releases). Download the zip file for your operating system, extract it, and run the CQ-editor script for your OS (CQ-editor.cmd for Windows, CQ-editor.sh for Linux and MacOS). On Windows you should be able to simply double-click on CQ-editor.cmd. On Linux and MacOS you may need to make the script executable with `chmod +x CQ-editor.sh` and run the script from the command line. On later MacOS versions you may also need `xattr -r -d com.apple.quarantine path/to/CQ-editor-MacOS`. The script contains an environment variable export that may be required to get CQ-editor to launch correctly on MacOS Big Sur, so it is better to use the script than to launch CQ-editor directly.
|
||||||
|
|
||||||
### Development Packages
|
### Development Packages
|
||||||
|
|
||||||
|
|||||||
@@ -252,13 +252,13 @@ class OCCViewer(QWidget,ComponentMixin):
|
|||||||
def front_view(self):
|
def front_view(self):
|
||||||
|
|
||||||
v = self._get_view()
|
v = self._get_view()
|
||||||
v.SetProj(0,1,0)
|
v.SetProj(0,-1,0)
|
||||||
v.SetTwist(0)
|
v.SetTwist(0)
|
||||||
|
|
||||||
def back_view(self):
|
def back_view(self):
|
||||||
|
|
||||||
v = self._get_view()
|
v = self._get_view()
|
||||||
v.SetProj(0,-1,0)
|
v.SetProj(0,1,0)
|
||||||
v.SetTwist(0)
|
v.SetTwist(0)
|
||||||
|
|
||||||
def left_view(self):
|
def left_view(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user