保留可配置入口,未启用

pkg/config/config.go

@@ -1,8 +1,35 @@
 package config
 
-type CoRegistrationConfig struct {
-	CRBlockNW        int    `yaml:"cr_block_nw" mapstructure:"cr_block_nw"`
-	CRBlockNH        int    `yaml:"cr_block_nh" mapstructure:"cr_block_nh"`
-	CRResampleMethod string `yaml:"cr_resample_method" mapstructure:"cr_resample_method"`
-	FUSBandOrder     string `yaml:"fu_band_order" mapstructure:"fu_band_order"`
+type Config struct {
+	CRConfig CoRegistrationConfig `yaml:"cr_config" mapstructure:"cr_config"`
+}
+
+type CoRegistrationConfig struct {
+	MssBands             int    `yaml:"mss_bands" mapstructure:"mss_bands"`
+	PixelBytes           int    `yaml:"pixel_bytes" mapstructure:"pixel_bytes"`
+	MssWidth             int    `yaml:"mss_width" mapstructure:"mss_width"`
+	PanWidth             int    `yaml:"pan_width" mapstructure:"pan_width"`
+	CRBlockNW            int    `yaml:"cr_block_nw" mapstructure:"cr_block_nw"`
+	CRBlockNH            int    `yaml:"cr_block_nh" mapstructure:"cr_block_nh"`
+	OverlappedBlockLines int    `yaml:"overlapped_block_lines" mapstructure:"overlapped_block_lines"`
+	CRResampleMethod     string `yaml:"cr_resample_method" mapstructure:"cr_resample_method"`
+	FUSBandOrder         string `yaml:"fu_band_order" mapstructure:"fu_band_order"`
+}
+
+var GCONFIG Config
+
+func init() {
+	GCONFIG = Config{
+		CRConfig: CoRegistrationConfig{
+			MssBands:             4,
+			PixelBytes:           2,
+			PanWidth:             9344,
+			MssWidth:             2336,
+			OverlappedBlockLines: 3000,
+			CRBlockNW:            8,
+			CRBlockNH:            4,
+			CRResampleMethod:     "down_sample_pan",
+			FUSBandOrder:         "RGB",
+		},
+	}
 }

pkg/config/viper.go

@@ -0,0 +1,44 @@
+package config
+
+import (
+	"fmt"
+	"strings"
+
+	"log"
+
+	"github.com/fsnotify/fsnotify"
+	"github.com/spf13/viper"
+)
+
+var viperInst *viper.Viper
+
+func InitViper(cfg string) *viper.Viper {
+	v := viper.New()
+	v.AutomaticEnv()
+	v.SetEnvPrefix("sjy01_ip")
+	v.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
+
+	v.SetConfigFile(cfg)
+	v.SetConfigType("yaml")
+	err := v.ReadInConfig()
+	if err != nil {
+		log.Println(fmt.Errorf("fatal error config file: %s", err.Error()))
+		return nil
+	}
+
+	v.WatchConfig()
+
+	v.OnConfigChange(func(e fsnotify.Event) {
+		if err := v.Unmarshal(&GCONFIG); err != nil {
+			fmt.Println(err)
+		}
+
+		log.Println("config file changed", e.Name, err)
+	})
+
+	if err := v.Unmarshal(&GCONFIG); err != nil {
+		fmt.Println(err)
+	}
+
+	return v
+}

pkg/producer/gdal_pansharpen.go

@@ -83,9 +83,8 @@ func PansharpenIHS(panImage, mssImage gocv.Mat) gocv.Mat {
 	return fused16U
 }
 
-func GDALPansharpen(panTiff, mssTiff string) (string, error) {
-	fusedTIff := strings.Replace(mssTiff, "MSS", "FUS", -1)
-	os.MkdirAll(filepath.Dir(fusedTIff), 0755)
+func GDALPansharpen(panTiff, mssTiff, fusedTiff string) error {
+	os.MkdirAll(filepath.Dir(fusedTiff), 0755)
 	// pansharpenCmd := exec.Command("gdal_pansharpen.py", "-w 0.6 -w 0.1 -w 0.3 -w 0 -b 3 -b 2 -b 1", panTiff, mssTiff, fusedTIff, "-r cubic", "-of GTiff")
 	pansharpenCmd := exec.Command("gdal_pansharpen.py",
 		"-w", "0.4", "-w", "0.2", "-w", "0.4", "-w", "0",
@@ -93,11 +92,11 @@ func GDALPansharpen(panTiff, mssTiff string) (string, error) {
 		"-r", "cubic", "-of", "GTiff",
 		panTiff,
 		mssTiff,
-		fusedTIff)
+		fusedTiff)
 	log.Println("Run Command: ", pansharpenCmd.String())
 	pansharpenCmd.Stdout = os.Stdout
 	pansharpenCmd.Stderr = os.Stderr
-	return fusedTIff, pansharpenCmd.Run()
+	return pansharpenCmd.Run()
 }
 
 func GDALTranslate(srcTiff, dstJPG string) error {

pkg/producer/image_registration.go

@@ -325,7 +325,7 @@ func (r *Registrator) calcDeltaCoeffs() error {
 	return nil
 }
 
-func (r *Registrator) DoCoRegestration() error {
+func (r *Registrator) DoCoRegistration() error {
 	for band := 0; band < MssBands; band++ {
 		if len(r.deltaXCoeffs[band]) < 2 || len(r.deltaYCoeffs[band]) < 3 {
 			log.Error("delta coefficients not calculated, skip co-registration")

pkg/producer/jpg.go

@@ -131,12 +131,6 @@ func calculateAverageBrightness(img gocv.Mat) float64 {
 	defer gray.Close()
 	gocv.CvtColor(img, &gray, gocv.ColorBGRToGray)
 	return gray.Mean().Val1
-	// mean := gocv.NewMat()
-	// dstStdDev := gocv.NewMat()
-	// defer mean.Close()
-	// defer dstStdDev.Close()
-	// gocv.MeanStdDev(gray, &mean, &dstStdDev)
-	// return float64(mean.GetFloatAt(0, 0))
 }
 
 // determineGammaValue determines an appropriate gamma value based on the average brightness

pkg/producer/params.go

@@ -5,7 +5,7 @@ type Params struct {
 	MssRawFile           string
 	AuxRawFile           string
 	SaveRegisteredMssRaw bool
-	PansharpenIHS        bool
+	DoPansharpen         bool
 	OutputDir            string
 	PanTiffFile          string
 	MssTiffFile          string

pkg/producer/scenes.go

@@ -131,13 +131,8 @@ func (r *Registrator) SaveScenesToTiff(panScenes []*Scene, mssScenes []*Scene) e
 
 func (r *Registrator) DoScenePansharpen(panScenes []*Scene, mssScenes []*Scene) error {
 	for i := 0; i < len(panScenes); i++ {
-		// rgbirImg, _ := r.MergeMSSToBGRNIR(mssScenes[i].Mat)
-		// ihsImage := PansharpenIHS(panScenes[i].Mat[0], rgbirImg)
-		// path := strings.TrimSuffix(r.Params.MssTiffFile, ".tiff")
-		// filename := fmt.Sprintf("%s_%03d_FUS.tiff", path, i+1)
-
-		// SaveBGRToGDALGTiff(ihsImage, 3, 1.25, filename)
-		fusedTiff, err := GDALPansharpen(panScenes[i].Tiff, mssScenes[i].Tiff)
+		fusedTiff := strings.Replace(mssScenes[i].Tiff, "MSS", "FUS", -1)
+		err := GDALPansharpen(panScenes[i].Tiff, mssScenes[i].Tiff, fusedTiff)
 		if err != nil {
 			return err
 		}