Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more visuals and cell execution #452

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
bd886de
Show more objects by default
adam-urbanczyk May 31, 2024
da95450
Better instance check
adam-urbanczyk Jun 2, 2024
d651f7e
Istance check workaround
adam-urbanczyk Jun 2, 2024
94fa99f
Add/fix tests
adam-urbanczyk Jun 2, 2024
9b36d71
Merge branch 'master' into show-more
adam-urbanczyk Jun 2, 2024
e8a2607
Support showing Vector, Location, Plane and List[...]
adam-urbanczyk Sep 20, 2024
2dc8d92
Fixes realted to new object support
adam-urbanczyk Sep 20, 2024
4f3e7cc
Merge branch 'master' into show-more
adam-urbanczyk Sep 20, 2024
e40c487
Add run cell and show
adam-urbanczyk Sep 20, 2024
d9ef957
Overwrite cq.vis.show when executing
adam-urbanczyk Oct 3, 2024
17c3991
Use abspath() iso absolute()
adam-urbanczyk Oct 3, 2024
086e465
Apply black
adam-urbanczyk Oct 3, 2024
ece5963
Better name retrival
adam-urbanczyk Oct 3, 2024
d404c4a
Add type validation to show and fix Vector support
adam-urbanczyk Oct 3, 2024
3b0f366
Start adding some annotations
adam-urbanczyk Oct 3, 2024
204a54a
Disable reload and fix is_cq_obj
adam-urbanczyk Oct 5, 2024
69c3775
Fix TopoDS_Shape support
adam-urbanczyk Oct 6, 2024
afbbfc3
fix tests
adam-urbanczyk Oct 6, 2024
75ecbe9
Update traceback/debug test
adam-urbanczyk Oct 6, 2024
5c9b64b
Fix test_debug
adam-urbanczyk Oct 6, 2024
8650627
Fix stash and selection
adam-urbanczyk Oct 6, 2024
1108dfe
Fix inspector
adam-urbanczyk Oct 6, 2024
9f4f286
Use Path.absolute
adam-urbanczyk Oct 6, 2024
a041fb7
Print a bt on segfault
adam-urbanczyk Oct 7, 2024
3d4a482
Disable test_render on linux for now
adam-urbanczyk Oct 8, 2024
d2f5e56
Merge branch 'show-more' of https://github.com/CadQuery/CQ-editor int…
adam-urbanczyk Oct 8, 2024
494e4d5
Disable another test for now
adam-urbanczyk Oct 8, 2024
1b6769c
Change context menu order
adam-urbanczyk Oct 10, 2024
7eccb49
Fix selection handling
adam-urbanczyk Oct 10, 2024
db7a26a
Final black pass
adam-urbanczyk Oct 10, 2024
3153c84
Blacken tests
adam-urbanczyk Oct 10, 2024
8f420e0
Debugging test_render
adam-urbanczyk Oct 14, 2024
93646b2
Advance
adam-urbanczyk Oct 14, 2024
7ce9b60
Advance
adam-urbanczyk Oct 14, 2024
93aacb4
Advance
adam-urbanczyk Oct 14, 2024
14fccc6
Advance
adam-urbanczyk Oct 14, 2024
d3a7933
Advance
adam-urbanczyk Oct 14, 2024
cc801ce
Advance
adam-urbanczyk Oct 14, 2024
0841d1c
Advance
adam-urbanczyk Oct 14, 2024
7e8b000
Backtrack
adam-urbanczyk Oct 15, 2024
f4b5057
Change to miniforge
adam-urbanczyk Oct 15, 2024
ec59f00
Enable faulthandler
adam-urbanczyk Oct 16, 2024
9872e85
Debug
adam-urbanczyk Oct 16, 2024
6e5f28b
Debug
adam-urbanczyk Oct 16, 2024
ac496bc
Add ssh key
adam-urbanczyk Oct 16, 2024
ca3f94f
Explicit block
adam-urbanczyk Oct 16, 2024
ce20122
Change key
adam-urbanczyk Oct 16, 2024
dfc5527
Try another key
adam-urbanczyk Oct 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ environment:
CODECOV_TOKEN:
secure: ZggK9wgDeFdTp0pu0MEV+SY4i/i1Ls0xrEC2MxSQOQ0JQV+TkpzJJzI4au7L8TpD
MINICONDA_DIRNAME: C:\FreshMiniconda
APPVEYOR_SSH_KEY: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuakRkp1nBMgt2ctzpDtMXYe9fH7LzGStxhpS+QFBE29gaVI1AnXGJwIa5ODyPq7bY7xCmYAHTYyUdHkCOytcF4oezqLpMTH1bZkD7pLbnZjCIs4ISB3RiHhbLsupzxQwEULG9Hj2PMfZ05lH9TGbROKzh+2Po+ubP8Xjf8aIOhkEZunDIFnrEPxFk8i5AacZlGLGncD1Pe/K//qsJyXxcyU887kntV0FX4+WjpW85NDuLROaEbWYsq98bVOvbe3cSf1Rbi/Uflp0GGWy9FUJwzZ4S76BtObThoHKbLDVUGtgBttbaXAAgYDBGKMDncWg7UeFHwPSA44cUfBys7CuX rsa-key-20241016
APPVEYOR_SSH_BLOCK: true

install:
- sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE != "macOS"* ]]; then sudo apt update; sudo apt -y --force-yes install libglu1-mesa xvfb libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev; fi
- sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE != "macOS"* ]]; then curl -fsSL -o miniconda.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh; fi
- sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE == "macOS"* ]]; then curl -fsSL -o miniconda.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-MacOSX-x86_64.sh; fi
- sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE != "macOS"* ]]; then curl -fsSL -o miniconda.sh https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh; fi
- sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE == "macOS"* ]]; then curl -fsSL -o miniconda.sh https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-x86_64.sh; fi
- sh: bash miniconda.sh -b -p $HOME/miniconda
- sh: source $HOME/miniconda/bin/activate
- cmd: curl -fsSL -o miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe
- cmd: curl -fsSL -o miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe
- cmd: miniconda.exe /S /InstallationType=JustMe /D=%MINICONDA_DIRNAME%
- cmd: set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
- cmd: activate
Expand All @@ -38,19 +40,22 @@ before_test:
test_script:
- sh: export PYTHONPATH=$(pwd)
- cmd: set PYTHONPATH=%cd%
- sh: export APPVEYOR_SSH_BLOCK=true
- sh: echo $APPVEYOR_SSH_KEY
- sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
- sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE != "macOS"* ]]; then xvfb-run -s '-screen 0 1920x1080x24 +iglx' pytest -v --cov=cq_editor; fi
- sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE == "macOS"* ]]; then pytest -v --cov=cq_editor; fi
- cmd: pytest -v --cov=cq_editor

on_success:
- codecov

#on_failure:
# - qtdiag
# - ls /cores/core.*
# - lldb --core `ls /cores/core.*` --batch --one-line "bt"
on_failure:
- qtdiag
- ls /cores/core.*
- lldb --core `ls /cores/core.*` --batch --one-line "bt"

on_finish:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
# - sh: export APPVEYOR_SSH_BLOCK=true
# - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
- sh: export APPVEYOR_SSH_BLOCK=true
- sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
10 changes: 5 additions & 5 deletions cq_editor/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@

from PyQt5.QtWidgets import QApplication

NAME = 'CQ-editor'
NAME = "CQ-editor"

#need to initialize QApp here, otherewise svg icons do not work on windows
app = QApplication(sys.argv,
applicationName=NAME)
# need to initialize QApp here, otherewise svg icons do not work on windows
app = QApplication(sys.argv, applicationName=NAME)

from .main_window import MainWindow


def main():

parser = argparse.ArgumentParser(description=NAME)
parser.add_argument('filename',nargs='?',default=None)
parser.add_argument("filename", nargs="?", default=None)

args = parser.parse_args(app.arguments()[1:])

Expand Down
Loading
Loading