Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -39,4 +39,11 @@ bindata.go
 dist/
 
 #test
-test/wrksp/.meta/
+test/wrksp/.meta/
+
+# idea
+*.idea
+
+# outputs
+*.exe
+*-RC*

Makefile

@@ -7,7 +7,7 @@ VERSION = $(shell date +%Y%m%d)
 BUILD = $(shell  date +%Y%m%d%H%M)
 
 TAG = v5.1.0
-RC = RC3
+RC = RC4
 
 LDFLAGS = -ldflags "-w -s -extldflags -static -X main.version=${TAG} -X main.build=${BUILD}"
 

lib/iso/iso.go

@@ -26,6 +26,20 @@ type Labels struct {
 	Channel16     Channel16
 	Channel17     Channel17
 	Channel18     Channel18
+	Channel19     Channel19
+	Channel20     Channel20
+	Channel21     Channel21
+	Channel22     Channel22
+	Channel23     Channel23
+	Channel24     Channel24
+	Channel25     Channel25
+	Channel26     Channel26
+	Channel27     Channel27
+	Channel28     Channel28
+	Channel29     Channel29
+	Channel30     Channel30
+	Channel31     Channel31
+	Channel32     Channel32
 }
 
 // LabeledSpectra is a list of spectra lables
@@ -174,3 +188,101 @@ type Channel18 struct {
 	Mz         float64
 	Intensity  float64
 }
+
+type Channel19 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel20 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel21 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel22 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel23 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel24 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel25 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel26 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel27 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel28 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel29 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel30 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel31 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}
+
+type Channel32 struct {
+	Name       string
+	CustomName string
+	Mz         float64
+	Intensity  float64
+}

lib/qua/bqt.go

@@ -325,7 +325,7 @@ func savetoDisk(list List, temp, uid string) {
 		}
 	}
 
-	header = fmt.Sprintf("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s",
+	header = fmt.Sprintf("%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s",
 		header,
 		list[headerIndex].Labels.Channel1.CustomName,
 		list[headerIndex].Labels.Channel2.CustomName,
@@ -345,6 +345,20 @@ func savetoDisk(list List, temp, uid string) {
 		list[headerIndex].Labels.Channel16.CustomName,
 		list[headerIndex].Labels.Channel17.CustomName,
 		list[headerIndex].Labels.Channel18.CustomName,
+		list[headerIndex].Labels.Channel19.CustomName,
+		list[headerIndex].Labels.Channel20.CustomName,
+		list[headerIndex].Labels.Channel21.CustomName,
+		list[headerIndex].Labels.Channel22.CustomName,
+		list[headerIndex].Labels.Channel23.CustomName,
+		list[headerIndex].Labels.Channel24.CustomName,
+		list[headerIndex].Labels.Channel25.CustomName,
+		list[headerIndex].Labels.Channel26.CustomName,
+		list[headerIndex].Labels.Channel27.CustomName,
+		list[headerIndex].Labels.Channel28.CustomName,
+		list[headerIndex].Labels.Channel29.CustomName,
+		list[headerIndex].Labels.Channel30.CustomName,
+		list[headerIndex].Labels.Channel31.CustomName,
+		list[headerIndex].Labels.Channel32.CustomName,
 	)
 
 	header += "\n"
@@ -395,7 +409,7 @@ func savetoDisk(list List, temp, uid string) {
 				}
 			}
 
-			line += fmt.Sprintf("%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f",
+			line += fmt.Sprintf("%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f\t%.4f",
 				list[i].Labels.Channel1.Intensity,
 				list[i].Labels.Channel2.Intensity,
 				list[i].Labels.Channel3.Intensity,
@@ -414,6 +428,20 @@ func savetoDisk(list List, temp, uid string) {
 				list[i].Labels.Channel16.Intensity,
 				list[i].Labels.Channel17.Intensity,
 				list[i].Labels.Channel18.Intensity,
+				list[i].Labels.Channel19.Intensity,
+				list[i].Labels.Channel20.Intensity,
+				list[i].Labels.Channel21.Intensity,
+				list[i].Labels.Channel22.Intensity,
+				list[i].Labels.Channel23.Intensity,
+				list[i].Labels.Channel24.Intensity,
+				list[i].Labels.Channel25.Intensity,
+				list[i].Labels.Channel26.Intensity,
+				list[i].Labels.Channel27.Intensity,
+				list[i].Labels.Channel28.Intensity,
+				list[i].Labels.Channel29.Intensity,
+				list[i].Labels.Channel30.Intensity,
+				list[i].Labels.Channel31.Intensity,
+				list[i].Labels.Channel32.Intensity,
 			)
 
 			line += "\n"