Merge pull request #47 from openbikesensor/scad-generator

Merge Scad generator to get the fixes back to MAIN

Author: gluap

.gitignore

@@ -6,3 +6,6 @@ logo/*
 !logo/OpenBikeSensor
 !logo/template
 !logo/README.md
+customizer/dist/*
+*.egg-info/
+venv/*

DisplayCase/SlideOnDisplay/SpecialVersions/OBS-Display-A-002_HeatSetInsert_Display_Bottom_v0.1.0 v1 oversize.f3d

@@ -0,0 +1,6 @@
+from tiangolo/uvicorn-gunicorn-fastapi
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y openscad make fonts-open-sans
+ADD . /case
+RUN pip3 install -e /case/customizer/
+ENV LOG_LEVEL=info
+ENV MODULE_NAME=obs_case_customizer.app

DisplayCase/SlideOnDisplay/SpecialVersions/OBS-Display-A-002_HeatSetInsert_Display_Bottom_v0.1.0 v1 oversize_bottom.stl

@@ -1,8 +1,11 @@
 OPENSCAD=/usr/bin/openscad
 OPENSCAD_OPTIONS=-q
+STL_SORTER=lib/sort_stl.py
 IMAGE_OPTIONS=--imgsize=1024,768 --colorscheme "Tomorrow Night" --render true -D orient_for_printing=false
 THUMBNAIL_OPTIONS=--imgsize=400,300 --colorscheme "Tomorrow Night" --render true -D fast=true -D orient_for_printing=false
 
+SHELL=bash
+
 SRCS=$(wildcard src/*/*.scad)
 STLS=$(patsubst src/%.scad,export/%.stl,$(SRCS))
 PNGS=$(patsubst src/%.scad,render/%.png,$(SRCS))
@@ -26,6 +29,7 @@ clean:
 export/%.stl: src/%.scad
 	@mkdir -p $(shell dirname $@)
 	$(OPENSCAD) $(OPENSCAD_OPTIONS) -D orient_for_printing=true -o $@ $<
+	$(STL_SORTER) $@
 
 export-all : $(STLS)
 
@@ -50,10 +54,10 @@ render/assembly.gif: assembly.scad $(SRCS)
 # $3: logo part (main|highlight)
 # $4: logo mode (normal|inverted)
 define logo-part-rule
-export/logo/$(1)/$(shell basename $(2))-$(4)-$(3).stl: src/$(2).scad logo/$(1)/$(shell basename $(2)).svg
+export/logo/$(1)/$(shell basename $(2))-$(4)-$(3).stl: src/$(2).scad logo/$(1)/$(shell basename $(2)).svg export/$(2).stl
 	@mkdir -p $$(shell dirname $$@)
-	$$(OPENSCAD) $$(OPENSCAD_OPTIONS) -D orient_for_printing=true -D logo_enabled=true -D 'logo_mode="$(4)"' -D 'logo_part="$(3)"' -D 'logo_name="$(1)"' -o $$@ $$<
-
+	$$(OPENSCAD) $$(OPENSCAD_OPTIONS) -D orient_for_printing=true -D logo_enabled=true -D logo_use_prebuild=true -D 'logo_mode="$(4)"' -D 'logo_part="$(3)"' -D 'logo_name="$(1)"' -o $$@ $$<
+	$$(STL_SORTER) $$@
 logo-$1-$4: export/logo/$(1)/$(shell basename $(2))-$(4)-$(3).stl
 logo-$1: export/logo/$(1)/$(shell basename $(2))-$(4)-$(3).stl
 logos: logo-$1
@@ -78,3 +82,14 @@ endef
 
 $(foreach file,$(FILES_WITH_LOGO), \
 	$(eval $(call logo-template-rule,$(file))))
+
+
+define numbered-cover-rule
+export/Mounting/AttachmentCover_$(1).stl: src/Mounting/AttachmentCover.scad
+	@mkdir -p $$(shell dirname $$@)
+	$(OPENSCAD) $(OPENSCAD_OPTIONS) -D orient_for_printing=true -D attachment_cover_number_text=$(1) -o $$@ $$<
+	$(STL_SORTER) $@
+endef
+
+$(foreach number,$(shell seq 0 1 100), \
+	$(eval $(call numbered-cover-rule,$(number))))

DisplayCase/SlideOnDisplay/SpecialVersions/OBS-Display-A-002_HeatSetInsert_Display_Bottom_v0.1.0 v1 oversize_top.stl

@@ -345,3 +345,19 @@ native format of your CAD software on top.
 
 OpenSCAD is a special case of course: Here submitting `.stl` (for now) and the
 `.scad` file is sufficient. 
+
+
+### Customizer webservice
+
+To run the customizer webservice you run it from the dockerfile:
+
+```
+docker build . -t customizer
+docker run --rm -p 8001:80 customizer 
+```
+
+Whereafter you should be able to access your customizer on your host on port 8001.
+
+Alternatively you can launch the python module directly using uvicorn,
+but that is only recommended for dev setups an d will be described
+in the module readme.

Dockerfile

@@ -0,0 +1,19 @@
+Copyright (c) 2022 The OpenBikeSensor Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -0,0 +1,4 @@
+OpenBikeSensor3DPrintableCase Customizer
+========================================
+
+Run it in Docker yeah

README.md

@@ -0,0 +1,36 @@
+import setuptools
+
+with open("README.md", "r", encoding="utf-8") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+    name="openbikesensor-case-customizer",
+    version="0.0.1",
+    author="gluap",
+    author_email="github@pgoergen.de",
+    description="OpenBikesSensor 3D Printable Case customizer",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/openbikesensor/OpenBikeSensor3dPrintableCase",
+    project_urls={
+        "Bug Tracker": "https://github.com/openbikesensor/OpenBikeSensor3dPrintableCase/issues",
+    },
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+    ],
+    package_dir={"": "src"},
+    packages=setuptools.find_packages(where="src"),
+    python_requires=">=3.6",
+    install_requires=[
+        "fastapi",
+        "python-multipart",
+        "jinja2",
+        "pyyaml",
+        "pydantic",
+        "sse_starlette",
+        "websockets",
+        "uvicorn"
+    ]
+)