From 76ae8ed22a123e8ee4e2470cb5be123c7c6f3cc0 Mon Sep 17 00:00:00 2001 From: mistangl Date: Thu, 31 Jul 2025 15:11:33 +0200 Subject: [PATCH] Zum Test /home/mistangl/dxf-calculator als Startverzeichnis gesetzt --- bin/getexdraw.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++ bin/ioconverter.sh | 2 +- bin/setenv.sh | 2 +- 3 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 bin/getexdraw.sh diff --git a/bin/getexdraw.sh b/bin/getexdraw.sh new file mode 100644 index 0000000..cc453fa --- /dev/null +++ b/bin/getexdraw.sh @@ -0,0 +1,68 @@ +#!/bin/bash + +usage() { + echo "Usage: $0 " + exit 1 +} + +if [ $# -eq 0 ]; then + usage +fi + +INPUT_FILE="$1" +FILENAME=$(basename "$INPUT_FILE" .dxf) +DIR=$(dirname "$INPUT_FILE") + +# Namen der Zwischenergebnis Dateien +JSON_POS="${FILENAME}_positionsdraw.json" +JSON_TODRAW="${FILENAME}_todraw.json" +# Namen der Ergebnisdateien +ERROR_DOUBLE="${FILENAME}_errors.json" +EXCEL_RES="${FILENAME}_cables.xlsx" +DXF_RES="${FILENAME}_cables.dxf" + +source $HOME/dxf-calculator/kabellaengen/bin/setenv.sh + +echo +echo "=== Fetching Positions ===" +./getpositions.sh --filename "$1" -s -r -w "$JSON_POS" -e "$ERROR_DOUBLE" + +if [ -f "$PROJECT_WORK/$ERROR_DOUBLE" ]; then + echo "-failed- duplicate IDs in given layout" + read -p "Press any key to continue..." + mv "$PROJECT_WORK/$ERROR_DOUBLE" "$PROJECT_BOM_RESULTS" + exit 1 +fi + +if [ ! -f "$PROJECT_WORK/$JSON_POS" ]; then + echo "-failed- getpositions" + read -p "Press any key to continue..." + exit 1 +fi + +echo +echo "=== Creating Graph for Routing ===" +./routing.sh --filename "$JSON_POS" -w "$JSON_TODRAW" + +if [ ! -f "$PROJECT_WORK/$JSON_TODRAW" ]; then + echo "-failed- routing" + read -p "Press any key to continue..." + exit 1 +fi + +echo +echo "=== Writing Output Files ===" +./draw_dxf.sh --filename "$JSON_TODRAW" --new "$DXF_RES" -x "$EXCEL_RES" + +if [ ! -f "$PROJECT_WORK/$EXCEL_RES" ]; then + echo "-failed- draw_dxf" + read -p "Press any key to continue..." + exit 1 +fi + +echo + +mkdir -p "$PROJECT_BOM_RESULTS/$FILENAME" +mv "$PROJECT_WORK/${FILENAME}_"* "$PROJECT_BOM_RESULTS/$FILENAME" +read -p "Press any key to continue..." + diff --git a/bin/ioconverter.sh b/bin/ioconverter.sh index 629f810..9ea2236 100755 --- a/bin/ioconverter.sh +++ b/bin/ioconverter.sh @@ -13,7 +13,7 @@ INPUT_FILE="$1" FILENAME=$(basename "$INPUT_FILE" .dxf) DIR=$(dirname "$INPUT_FILE") -source /opt/dxf-calculator/kabellaengen/bin/setenv.sh +source $HOME/dxf-calculator/kabellaengen/bin/setenv.sh # Namen der Zwischenergebnis Dateien JSON_POS="${FILENAME}_positionsconv.json" diff --git a/bin/setenv.sh b/bin/setenv.sh index 9bccd9d..be928da 100755 --- a/bin/setenv.sh +++ b/bin/setenv.sh @@ -1,6 +1,6 @@ #!/bin/bash -export PROJECT=/opt/dxf-calculator/kabellaengen +export PROJECT=$HOME/dxf-calculator/kabellaengen export PROJECT_BIN="$PROJECT/bin" export PROJECT_CFG="$PROJECT/cfg" export PROJECT_DOC="$PROJECT/doc"