lordwelch/PresentationApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
lordwelch 2016-03-15 10:21:59 -07:00
parent 0be1344a82
commit ac2b345e28
2 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imgprovider.go
View File

@ -6,11 +6,6 @@ import (
"strconv" "strconv"
) )
<<<<<<< Updated upstream
/*var imgproviderstr = `import QtQuick 2.4
Image {
source: "image://images/`*/
var imgready = false var imgready = false
func imgProvider(id string, width, height int) image.Image { func imgProvider(id string, width, height int) image.Image {
@ -22,9 +17,4 @@ func imgProvider(id string, width, height int) image.Image {
var img1 image.Image = image.NewRGBA(image.Rect(0, 0, 340, 480)) var img1 image.Image = image.NewRGBA(image.Rect(0, 0, 340, 480))
return img1 return img1
} }
=======
func imgProvider(id string, width, height int) image.Image {
i, _ := strconv.Atoi(id)
return slides[i].getImage(width, height)
>>>>>>> Stashed changes
} }

27
main.go
View File

@ -37,7 +37,7 @@ var (
err error err error
monitors []*glfw.Monitor monitors []*glfw.Monitor
projMonitor *glfw.Monitor projMonitor *glfw.Monitor
mw1 *imagick.MagickWand //mw1 *imagick.MagickWand
tex1 uint32 tex1 uint32
) )
@ -56,13 +56,6 @@ func run() error {
var mainQml qml.Object var mainQml qml.Object
imagick.Initialize() imagick.Initialize()
mw1 = imagick.NewMagickWand()
err = mw1.ReadImage("logo:")
if err != nil {
panic(err)
}
engine := qml.NewEngine() engine := qml.NewEngine()
engine.AddImageProvider("images", imgProvider) engine.AddImageProvider("images", imgProvider)
@ -96,15 +89,13 @@ func run() error {
window.Wait() window.Wait()
mw1.Destroy()
imagick.Terminate() imagick.Terminate()
return nil return nil
} }
func setupScene() { func setupScene() {
gl.ClearColor(0.1, 0.5, 0.9, 0.0) gl.ClearColor(0, 0, 0, 0)
mw1 = resizeImage(mw1, x0, y0, true, true)
tex1 = newTexture(*slides[0].getImage(x0, y0)) tex1 = newTexture(*slides[0].getImage(x0, y0))
@ -277,7 +268,6 @@ func setSignals() {
func (cl cell) getImage(x, y int) (img *image.RGBA) { func (cl cell) getImage(x, y int) (img *image.RGBA) {
mw := cl.img.GetImage() mw := cl.img.GetImage()
//mw := imagick.NewMagickWandFromImage(cl.img)
if (x == 0) || (y == 0) { if (x == 0) || (y == 0) {
x = int(mw.GetImageWidth()) x = int(mw.GetImageWidth())
y = int(mw.GetImageHeight()) y = int(mw.GetImageHeight())
@ -288,10 +278,10 @@ func (cl cell) getImage(x, y int) (img *image.RGBA) {
if img.Stride != img.Rect.Size().X*4 { if img.Stride != img.Rect.Size().X*4 {
panic("unsupported stride") panic("unsupported stride")
} }
// TPix, _ :=
Tpix, _ := mw.ExportImagePixels(0, 0, uint(x), uint(y), "RGBA", imagick.PIXEL_CHAR) Tpix, _ := mw.ExportImagePixels(0, 0, uint(x), uint(y), "RGBA", imagick.PIXEL_CHAR)
img.Pix = Tpix.([]uint8) img.Pix = Tpix.([]uint8)
defer mw.Destroy() mw.Destroy()
return return
} }
@ -301,7 +291,6 @@ func (cl *cell) setSignal() {
textEdit.Set("cell", cl.index) textEdit.Set("cell", cl.index)
textEdit.Set("x", cl.qmlcell.Int("x")) textEdit.Set("x", cl.qmlcell.Int("x"))
textEdit.Set("y", cl.qmlcell.Int("y")) textEdit.Set("y", cl.qmlcell.Int("y"))
textEdit.Set("width", cl.qmlcell.Int("width"))
textEdit.Set("height", cl.qmlcell.Int("height")) textEdit.Set("height", cl.qmlcell.Int("height"))
textEdit.Set("z", 100) textEdit.Set("z", 100)
textEdit.Set("opacity", 100) textEdit.Set("opacity", 100)
@ -343,8 +332,8 @@ func (sl *slide) addCell( /*cl *cell*/ ) {
func (cl *cell) remove() { func (cl *cell) remove() {
cl.text = "" cl.text = ""
cl.qmlimg.Destroy() cl.qmlimg.Destroy()
cl.img.Destroy()
cl.qmlcell.Destroy() cl.qmlcell.Destroy()
cl.img.Destroy()
window.ObjectByName("gridRect").Set("count", window.ObjectByName("gridRect").Int("count")-1) window.ObjectByName("gridRect").Set("count", window.ObjectByName("gridRect").Int("count")-1)
slides.remove(cl.index) slides.remove(cl.index)
cl.index = -1 cl.index = -1
@ -352,12 +341,6 @@ func (cl *cell) remove() {
} }
func (sl *slide) remove(i int) { func (sl *slide) remove(i int) {
//*sl = append((*sl)[:i], (*sl)[i+1:]...)
/*copy((*sl)[i:], (*sl)[i+1:])
(*sl)[len(*sl)-1] = nil // or the zero value of T
*sl = (*sl)[:len((*sl))-1]*/
// or, more simply:
*sl, (*sl)[len((*sl))-1] = append((*sl)[:i], (*sl)[i+1:]...), nil *sl, (*sl)[len((*sl))-1] = append((*sl)[:i], (*sl)[i+1:]...), nil
} }