Refactor #6

Open

M4rkus wants to merge 58 commits from Refactor into main

pull from: Refactor

merge into: XilogVectorConvert:main

XilogVectorConvert:main

XilogVectorConvert:move-start-point

XilogVectorConvert:Threading

XilogVectorConvert:pocket_testing

Conversation 0 Commits 58 Files changed 26 +8169 -1676

M4rkus commented 2023-09-18 19:57:58 +02:00

Owner

Copy link

No description provided.

M4rkus added 43 commits 2023-09-18 19:57:59 +02:00

without Threading 345e51b060

single Thread create_points.py 44f374a468

single Thread pocket 4e221edd23

loop triangle multithread b3fa161376

progress bar a3addba0e0

bug fix stop point 7d3975c9ff

last cleanup 6f017a695b

matplotlib bug 681eb2b97e

rewrite readIMG path b9b29cf2fe

rewrite path f17582ac34

path working 59cbe9db0e

linear + draw eb386a282e

linear pocket + draw f4f6174632

pocket without triangle 6a2b15d107

triangulation 614978227f

triangulation pocket (almost) 63119b59ff

triangulation pocket 0832981fbf

translate 88fca13a57

cleanup a28c6e84bb

overlap, rounding edges b8e3164cd3

bug fixing 5ad2fdd145

bug fix abs_tolerance 44d65c0edf

cnc test d2b9d120e8

first gui, first threading f0af5c2c55

user interface ed2006e0a1

drill refactor, ui d14bd36d9b

multiple drills 4c5b07772a

update ui 76eb53c18b

translate bug fixing e0a1709d91

cast conect, ear clipping 4b4ef7cc72

triangulation not fully working 1154284efb

new user interface 461324e61c

ui finished 953adb8fe7

bug fix bool in ui ccb69e01a8

chnge to old triangulation algorythm 92290ceaa5

bug min triangle fixed 8406870641

change triangulation file location ba18824d2f

before change to server side rest api 7547151a1a

rest api 228b01640c

drill & default config ace66239e7

mode endpoint 94f9d54f9b

config update 5c16960d9f

pocket import 3ea4ee9f90

M4rkus added 1 commit 2023-09-20 19:36:41 +02:00

partially finished 531660e717

M4rkus added 1 commit 2023-09-21 23:28:54 +02:00

2nd drill usage 1b9044d9f2

M4rkus added 1 commit 2023-09-25 18:02:35 +02:00

tranlate bug fix a9671315ba

M4rkus added 1 commit 2023-09-25 20:34:13 +02:00

g0 correct 57754fea35

M4rkus added 1 commit 2023-09-27 22:23:10 +02:00

g0 delete if not essential d2944359ca

M4rkus added 1 commit 2023-09-30 18:32:05 +02:00

multiple depths f401865490

M4rkus added 1 commit 2023-10-01 17:10:45 +02:00

c correction 163ea632db

M4rkus added 1 commit 2023-10-02 16:46:27 +02:00

new ui (work in progress) c187a63051

M4rkus added 2 commits 2023-10-02 16:49:48 +02:00

new ui (work in progress) a5e05bd651

Merge remote-tracking branch 'origin/Refactor' into Refactor 8873fb7a5f

M4rkus added 2 commits 2023-10-07 11:28:29 +02:00

90degree triangle bug fixed 780f1aaed6

Merge remote-tracking branch 'origin/Refactor' into Refactor f72dab1c50

M4rkus added 1 commit 2023-10-14 13:32:33 +02:00

90degree triangle bug fixed 37a6b8faea

M4rkus added 1 commit 2023-10-15 10:37:38 +02:00

bug fixes, line direction error 6a92d5c229

M4rkus added 1 commit 2023-10-15 11:42:08 +02:00

object based drills bc65006c4e

This pull request has changes conflicting with the target branch.

• Auto_Trace/split_objects.py
• Simulation/matplotlib.py
• pi.xxl
• Auto_Trace/create_points.py
• Auto_Trace/loop_object.py
• Auto_Trace/pocket.py
• Auto_Trace/triangulate.py
• Edge_Detection/path.py
• Zeichnung.svg
• ablauf.png

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'Refactor' (#6) from Refactor into main

Merge commit body Reviewed-on: https://git.obco.pro/XilogVectorConvert/Vectorize/pulls/6

Merge pull request 'Refactor' (#6) from Refactor into main Reviewed-on: https://git.obco.pro/XilogVectorConvert/Vectorize/pulls/6 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin Refactor:Refactor

git switch Refactor

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff Refactor

git switch Refactor

git rebase main

git switch main

git merge --ff-only Refactor

git switch Refactor

git rebase main

git switch main

git merge --no-ff Refactor

git switch main

git merge --squash Refactor

git switch main

git merge --ff-only Refactor

git switch main

git merge Refactor

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

XilogVectorConvert/Vectorize!6

No description provided.