--- fract/mandelzoom.cgi 2001/02/25 20:12:25 1.4 +++ fract/mandelzoom.cgi 2001/02/26 11:26:15 1.8 @@ -28,24 +28,24 @@ if form.has_key('cx'): cx= atof(form['cx'].value) else: - cx= 0 + cx= 0.0 if form.has_key('cy'): cy= atof(form['cy'].value) else: - cy= 0 + cy= 0.0 if form.has_key('diag'): diag= atof(form['diag'].value) else: - diag= math.sqrt(8) + diag= math.sqrt(32) # sqrt(4**2 + 4**2) debug= form.has_key('debug') if form.has_key('iter'): maxiter= atoi(form['iter'].value) else: - maxiter= 240 + maxiter= 270 # If type!=image, then output an HTML page, not an image if not (form.has_key('type') and form['type'].value == "image"): @@ -53,10 +53,10 @@ -Mandel Set Zoomer +Mandelbrot Set Zoomer -

Mandel Set Zoomer

+

Mandelbrot Set Zoomer

@@ -68,28 +68,35 @@ ds="&debug=on" else: ds="" + if form.has_key('image.x') and form.has_key('image.y'): + # Adjust cx and cy + ix= atof(form['image.x'].value) + iy= atof(form['image.y'].value) + owidth= atof(form['owidth'].value) + oheight= atof(form['oheight'].value) + diagp= math.sqrt(owidth**2 + oheight**2) + scale= diagp/diag + cx= (ix/scale) + (cx - (owidth / (scale*2))) + cy= ((oheight-iy)/scale) + (cy - (oheight / (scale*2))) if form.has_key('zoom'): - zoom=atoi(form['zoom'].value) + zoom=atof(form['zoom'].value) diag=diag/zoom else: # If no zoom provided, don't actually zoom - zoom= 2 + zoom= 2.0 print 'SRC="mandelzoom.cgi?type=image&width=%s&height=%s&iter=%s%s&diag=%s&cx=%s&cy=%s"' % (str(width), str(height), str(maxiter), ds, str(diag), str(cx), str(cy)), print 'ALIGN=BOTTOM HEIGHT="%s"' % (str(height)), print 'WIDTH="%s">

' % (str(width)) print 'Zoom: ' @@ -105,18 +112,32 @@ else: print '>' print '' - for key in form.keys(): - if key not in ["zoom", "type", "debug", "image.x", "image.y", "iter", "height", "width"]: - print '' % (key, form[key].value) - #for var in [("diag", diag), ("cx", cx), ("cy", cy)]: - + for var in (("diag", diag), ("cx", cx), ("cy", cy), ("owidth", width), + ("oheight", height)): + print '' % var print '' - print """

+ print """

+After changing any settings, don't forget to change the "Zoom" setting +to "Pan" if you don't want to zoom when applying them. """ sys.exit(0) -c1, c2 = (-2+2j), (2-2j) # Corner coordinates +# Figure out c1 and c2 from width, height, diag, cx, and cy. +# Diagonal in pixels +diagp= math.sqrt(width**2 + height**2) +# Scale between pixels and coordinates +scale= diagp/diag +x= (width/2.0)/scale +y= (height/2.0)/scale + +c1= cx - x + (cy - y) * (0+1j) +c2= cx + x + (cy + y) * (0+1j) + +#print width, height, diag, cx, cy, diagp, scale, x, y, c1, c2 +#sys.exit(0) + +#c1, c2 = (-2+2j), (2-2j) # Corner coordinates # Force c1 to be upper left and c2 to be lower right c1, c2= complex(min(c1.real, c2.real), max(c1.imag, c2.imag)), \