Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow to combine arrows with scalar colormaps #152

Merged
merged 2 commits into from
Jan 25, 2018
Merged

allow to combine arrows with scalar colormaps #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c6633b
draw/image: move range parser to the separate function
godsic Jan 25, 2018
530ef1c
draw, mumax3-convert: allow for combining arrows with scalar colormaps
godsic Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions cmd/mumax3-convert/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ var (
)

var (
colormap []color.RGBA
colormap []draw.ColorMapSpec
)

type task struct {
Expand All @@ -98,7 +98,8 @@ func main() {
log.Fatal("no input files")
}

colormap = parseColors(*flag_color)
colormap = make([]draw.ColorMapSpec, 1, 1)
colormap[0].Cmap = parseColors(*flag_color)

// politely try to make the output directory
if *flag_dir != "" {
Expand Down Expand Up @@ -324,8 +325,13 @@ func preprocess(f *data.Slice) {
if *flag_normpeak {
normpeak(f)
}
colormap[0].Ccomp = -1
if *flag_comp != "" {
*f = *f.Comp(parseComp(*flag_comp))
c := parseComp(*flag_comp)
colormap[0].Ccomp = c
if *flag_arrows == 0 {
*f = *f.Comp(c)
}
}
crop(f)
if *flag_resize != "" {
Expand Down
5 changes: 5 additions & 0 deletions draw/colorscale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ package draw
import "image/color"
import "fmt"

type ColorMapSpec struct {
Cmap []color.RGBA
Ccomp int
}

func ColorMap(min, max, value float32, colormap ...color.RGBA) color.RGBA {
// default colormap: black-white
if len(colormap) < 1 {
Expand Down
7 changes: 3 additions & 4 deletions draw/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
"github.com/mumax/3/data"
"image"
"image/color"
"image/gif"
"image/jpeg"
"image/png"
Expand All @@ -15,7 +14,7 @@ import (
"strings"
)

func RenderFile(fname string, f *data.Slice, min, max string, arrowSize int, colormap ...color.RGBA) error {
func RenderFile(fname string, f *data.Slice, min, max string, arrowSize int, colormap ...ColorMapSpec) error {
out, err := os.Create(fname)
if err != nil {
return err
Expand All @@ -24,7 +23,7 @@ func RenderFile(fname string, f *data.Slice, min, max string, arrowSize int, col
return RenderFormat(out, f, min, max, arrowSize, fname, colormap...)
}

func RenderFormat(out io.Writer, f *data.Slice, min, max string, arrowSize int, format string, colormap ...color.RGBA) error {
func RenderFormat(out io.Writer, f *data.Slice, min, max string, arrowSize int, format string, colormap ...ColorMapSpec) error {
var codecs = map[string]codec{".png": PNG, ".jpg": JPEG100, ".gif": GIF256}
ext := strings.ToLower(path.Ext(format))
enc := codecs[ext]
Expand All @@ -38,7 +37,7 @@ func RenderFormat(out io.Writer, f *data.Slice, min, max string, arrowSize int,
type codec func(io.Writer, image.Image) error

// Render data and encode with arbitrary codec.
func Render(out io.Writer, f *data.Slice, min, max string, arrowSize int, encode codec, colormap ...color.RGBA) error {
func Render(out io.Writer, f *data.Slice, min, max string, arrowSize int, encode codec, colormap ...ColorMapSpec) error {
img := Image(f, min, max, arrowSize, colormap...)
buf := bufio.NewWriter(out)
defer buf.Flush()
Expand Down
55 changes: 35 additions & 20 deletions draw/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,57 @@ import (
)

// Renders an image of slice. fmin, fmax = "auto" or a number to set the min/max color scale.
func Image(f *data.Slice, fmin, fmax string, arrowSize int, colormap ...color.RGBA) *image.RGBA {
func Image(f *data.Slice, fmin, fmax string, arrowSize int, colormap ...ColorMapSpec) *image.RGBA {
img := new(image.RGBA)
On(img, f, fmin, fmax, arrowSize, colormap...)
return img
}

// Render on existing image buffer. Resize it if needed
func On(img *image.RGBA, f *data.Slice, fmin, fmax string, arrowSize int, colormap ...color.RGBA) {
func On(img *image.RGBA, f *data.Slice, fmin, fmax string, arrowSize int, colormap ...ColorMapSpec) {
cm := colormap[0]
dim := f.NComp()
switch dim {
default:
log.Fatalf("unsupported number of components: %v", dim)
case 3:
drawVectors(img, f.Vectors(), arrowSize)
case 1:
min, max := extrema(f.Host()[0])
if fmin != "auto" {
m, err := strconv.ParseFloat(fmin, 32)
if err != nil {
util.Fatal("draw: scale:", err)
if cm.Ccomp >= 0 {
ff := f.Comp(cm.Ccomp)
min, max := parseMinMax(ff, fmin, fmax)
drawFloats(img, ff.Scalars(), min, max, cm.Cmap...)
if arrowSize > 0 {
drawArrows(img, f.Vectors(), arrowSize)
}
min = float32(m)
} else {
drawVectors(img, f.Vectors(), arrowSize)
}
if fmax != "auto" {
m, err := strconv.ParseFloat(fmax, 32)
if err != nil {
util.Fatal("draw: scale:", err)
}
max = float32(m)
case 1:
min, max := parseMinMax(f, fmin, fmax)
drawFloats(img, f.Scalars(), min, max, cm.Cmap...)
}
}

func parseMinMax(f *data.Slice, fmin, fmax string) (min, max float32) {
min, max = extrema(f.Host()[0])
if fmin != "auto" {
m, err := strconv.ParseFloat(fmin, 32)
if err != nil {
util.Fatal("draw: scale:", err)
}
if min == max {
min -= 1
max += 1 // make it gray instead of black
min = float32(m)
}
if fmax != "auto" {
m, err := strconv.ParseFloat(fmax, 32)
if err != nil {
util.Fatal("draw: scale:", err)
}
drawFloats(img, f.Scalars(), min, max, colormap...)
max = float32(m)
}
if min == max {
min -= 1
max += 1 // make it gray instead of black
}
return
}

// Draws rank 4 tensor (3D vector field) as image
Expand Down