From ee427949e3d06b6b6bc2585e4b18a03f6f93a21b Mon Sep 17 00:00:00 2001 From: nuknal Date: Thu, 13 Jun 2024 10:18:04 +0800 Subject: [PATCH] docker builder --- .dockerignore | 4 ++++ .gitignore | 1 + build/Dockerfile.build => Dockerfile.build | 12 +++++++++--- build/build-in-docker.sh | 3 +++ pkg/producer/dark_bias.go | 13 +++++++++++++ pkg/producer/scenes.go | 10 ++++++++++ 6 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 .dockerignore rename build/Dockerfile.build => Dockerfile.build (65%) create mode 100644 build/build-in-docker.sh create mode 100644 pkg/producer/dark_bias.go diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..f687deb --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +data/ +log/ +bin/ +deployment/ diff --git a/.gitignore b/.gitignore index 3f9c06d..bc7e2b0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ data bin log deployment +build/go diff --git a/build/Dockerfile.build b/Dockerfile.build similarity index 65% rename from build/Dockerfile.build rename to Dockerfile.build index 1b3fecc..7a1b113 100644 --- a/build/Dockerfile.build +++ b/Dockerfile.build @@ -9,9 +9,15 @@ RUN apt-get update && apt-get install -y \ RUN cd /opt && wget https://go.dev/dl/go1.20.linux-amd64.tar.gz && \ tar -xvf go1.20.linux-amd64.tar.gz && rm go1.20.linux-amd64.tar.gz -ENV GOROOT="/opt/go" -ENV PATH="/opt/go/bin:${PATH}" +ENV GOROOT="/opt/go" \ + PATH="/opt/go/bin:${PATH}" \ + GOPATH="/src/build/go" RUN cd /opt && git clone -b v0.36.1 https://github.com/hybridgroup/gocv.git && cd gocv && \ make install -RUN cd /sjy01/image-proc && go mod download && make linux + +WORKDIR /src +COPY . . +# RUN cd /sjy01/image-proc && go mod download && make linux +# CMD ["/src/build/build.sh"] +RUN cd /src && make linux \ No newline at end of file diff --git a/build/build-in-docker.sh b/build/build-in-docker.sh new file mode 100644 index 0000000..391e1f2 --- /dev/null +++ b/build/build-in-docker.sh @@ -0,0 +1,3 @@ +# !/bin/bash + +cd /src && go mod download && make linux diff --git a/pkg/producer/dark_bias.go b/pkg/producer/dark_bias.go new file mode 100644 index 0000000..815c2c7 --- /dev/null +++ b/pkg/producer/dark_bias.go @@ -0,0 +1,13 @@ +package producer + +const ( + DarkBiasValue = 15675.0/6 +) + +// 暗场偏置校正 固定值15675校正 +func (r *Registrator) DoDarkBiasCorrection() { + r.PanImage.SubtractFloat(DarkBiasValue) + for i := 0; i < len(r.registeredMssImages); i++ { + r.registeredMssImages[i].SubtractFloat(DarkBiasValue) + } +} diff --git a/pkg/producer/scenes.go b/pkg/producer/scenes.go index 20f5166..0a52b7c 100644 --- a/pkg/producer/scenes.go +++ b/pkg/producer/scenes.go @@ -56,6 +56,11 @@ func (r *Registrator) SubScenes() (panScenes []*Scene, mssScenes []*Scene, err e Y: i * hPAN, } + if scene.Height < scene.Width/2 { + log.Info("scene height too small, skip") + continue + } + name := filepath.Base(r.Params.PanTiffFile) name = strings.TrimSuffix(name, ".tiff") scene.SceneId = fmt.Sprintf("%s_%03d", name, i+1) @@ -82,6 +87,11 @@ func (r *Registrator) SubScenes() (panScenes []*Scene, mssScenes []*Scene, err e Y: i * hMSS, } + if scene.Height < scene.Width/2 { + log.Info("scene height too small, skip") + continue + } + for band := 0; band < 4; band++ { mat := r.registeredMssImages[band].Region(image.Rect(0, i*hMSS, 2336, y1)) scene.Mat = append(scene.Mat, mat)