Commit adf2d7cc authored by santiaago's avatar santiaago
Browse files

refactor background and foreground extraction 

now package extract has function ExtraColors.
parent 863d5044

controllers/isogrids/diagonals.go

+2 −19
Original line number Diff line number Diff line 
package isogrids



import (

	"image/color"

	"net/http"



	"github.com/taironas/tinygraphs/colors"
@@ -14,15 +13,7 @@ import ( 
// builds a full diagonal grid.

func Diagonals(w http.ResponseWriter, r *http.Request) {



	colorMap := colors.MapOfColorThemes()

	var err error

	var bg, fg color.RGBA

	if bg, err = extract.Background(r); err != nil {

		bg = colorMap["base"][0]

	}

	if fg, err = extract.Foreground(r); err != nil {

		fg = colorMap["base"][1]

	}

	bg, fg := extract.ExtraColors(r, colors.MapOfColorThemes())

	size := extract.Size(r)

	write.ImageSVG(w)

	isogrids.Diagonals(w, "", bg, fg, size)
@@ -32,15 +23,7 @@ func Diagonals(w http.ResponseWriter, r *http.Request) { 
// builds a half diagonal (each diagonal goes to the middle of the square) grid.

func HalfDiagonals(w http.ResponseWriter, r *http.Request) {



	colorMap := colors.MapOfColorThemes()

	var err error

	var bg, fg color.RGBA

	if bg, err = extract.Background(r); err != nil {

		bg = colorMap["base"][0]

	}

	if fg, err = extract.Foreground(r); err != nil {

		fg = colorMap["base"][1]

	}

	bg, fg := extract.ExtraColors(r, colors.MapOfColorThemes())

	size := extract.Size(r)

	write.ImageSVG(w)

	isogrids.HalfDiagonals(w, "", bg, fg, size)

controllers/isogrids/hexa.go

+2 −8
Original line number Diff line number Diff line
@@ -29,17 +29,11 @@ func Hexa(w http.ResponseWriter, r *http.Request) { 
	io.WriteString(h, key)

	key = fmt.Sprintf("%x", h.Sum(nil)[:])



	theme := extract.Theme(r)

	numColors := extract.NumColors(r)

	lines := int(extract.Hexalines(r))

	var bg, fg color.RGBA

	if bg, err = extract.Background(r); err != nil {

		bg = colorMap["base"][0]

	}

	if fg, err = extract.Foreground(r); err != nil {

		fg = colorMap["base"][1]

	}

	bg, fg := extract.ExtraColors(r, colorMap)



	theme := extract.Theme(r)

	if val, ok := colorMap[theme]; ok {

		bg = val[0]

		fg = val[1]

controllers/isogrids/isogrids.go

+2 −9
Original line number Diff line number Diff line
@@ -31,17 +31,10 @@ func Isogrids(w http.ResponseWriter, r *http.Request) { 


	colorMap := colors.MapOfColorThemes()

	size := extract.Size(r)

	theme := extract.Theme(r)

	numColors := extract.NumColors(r)

	bg, fg := extract.ExtraColors(r, colorMap)



	var bg, fg color.RGBA

	if bg, err = extract.Background(r); err != nil {

		bg = colorMap["base"][0]

	}

	if fg, err = extract.Foreground(r); err != nil {

		fg = colorMap["base"][1]

	}



	theme := extract.Theme(r)

	if val, ok := colorMap[theme]; ok {

		bg = val[0]

		fg = val[1]

controllers/isogrids/labs.go

+1 −10
Original line number Diff line number Diff line 
package isogrids



import (

	"image/color"

	"net/http"



	"github.com/taironas/tinygraphs/colors"
@@ -14,15 +13,7 @@ import ( 
// builds a 10x10 grid that alternate black and white colors.

func GridBW(w http.ResponseWriter, r *http.Request) {



	colorMap := colors.MapOfColorThemes()

	var err error

	var bg, fg color.RGBA

	if bg, err = extract.Background(r); err != nil {

		bg = colorMap["base"][0]

	}

	if fg, err = extract.Foreground(r); err != nil {

		fg = colorMap["base"][1]

	}

	bg, fg := extract.ExtraColors(r, colors.MapOfColorThemes())

	size := extract.Size(r)

	write.ImageSVG(w)

	isogrids.BlackWhite(w, "", bg, fg, size)

controllers/isogrids/random.go

+2 −10
Original line number Diff line number Diff line
@@ -14,21 +14,13 @@ import ( 
// Generates a random isogrid image.

func Random(w http.ResponseWriter, r *http.Request) {



	var err error



	colorMap := colors.MapOfColorThemes()

	size := extract.Size(r)

	theme := extract.Theme(r)

	numColors := extract.NumColors(r)



	var bg, fg color.RGBA

	if bg, err = extract.Background(r); err != nil {

		bg = colorMap["base"][0]

	}

	if fg, err = extract.Foreground(r); err != nil {

		fg = colorMap["base"][1]

	}

	bg, fg := extract.ExtraColors(r, colorMap)



	theme := extract.Theme(r)

	if val, ok := colorMap[theme]; ok {

		bg = val[0]

		fg = val[1]