Changeset 3889

Timestamp:

Apr 11, 2019 9:54:43 PM (4 years ago)

Author:

vondreele

Message:

contour map complete but not faded

File:

• trunk/GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIplot.py

@@ -7480 +7480 @@
 
     # PlotStructure initialization here
-    global mcsaXYZ,mcsaTypes,mcsaBonds
+    global mcsaXYZ,mcsaTypes,mcsaBonds,txID
     global cell, Vol, Amat, Bmat, A4mat, B4mat
+    txID = 0
     ForthirdPI = 4.0*math.pi/3.0
     generalData = data['General']
@@ -8222 +8223 @@
         GL.glShadeModel(GL.GL_SMOOTH)
                 
-    def RenderViewPlane(plane,color,Z,width,height):
-        fade = list(color) + [.5,]
+    def RenderViewPlane(plane,Z,width,height):
+        global txID
         GL.glShadeModel(GL.GL_FLAT)
-        ID = GL.glGenTextures(1)
-        GL.glBindTexture(GL.GL_TEXTURE_2D, ID)
+        newTX = False
+        if not txID:
+            txID = GL.glGenTextures(1)
+            newTX = True
+        GL.glBindTexture(GL.GL_TEXTURE_2D, txID)
         GL.glPixelStorei(GL.GL_UNPACK_ALIGNMENT,1)
         GL.glBlendFunc(GL.GL_SRC_ALPHA,GL.GL_ONE_MINUS_SRC_ALPHA)
@@ -8237 +8241 @@
         GL.glFrontFace(GL.GL_CW)
         GL.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE, GL.GL_REPLACE)
-        GL.glBindTexture(GL.GL_TEXTURE_2D, ID)
+#        GL.glTexEnvf(GL.GL_TEXTURE_ENV, GL.GL_ALPHA_SCALE, 1.0)
         GL.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_BASE_LEVEL, 0)
         GL.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAX_LEVEL, 0)
-        GL.glTexImage2D(GL.GL_TEXTURE_2D,0,GL.GL_RGBA,width,height,0,GL.GL_RGBA,GL.GL_UNSIGNED_BYTE,Z)
+        if newTX:
+            GL.glTexImage2D(GL.GL_TEXTURE_2D,0,GL.GL_RGBA,width,height,0,GL.GL_RGBA,GL.GL_UNSIGNED_BYTE,Z)
+        else:
+            GL.glTexSubImage2D(GL.GL_TEXTURE_2D,0,0,0,width,height,GL.GL_RGBA,GL.GL_UNSIGNED_BYTE,Z)
         GL.glBegin(GL.GL_POLYGON)
         for vertex,evertex in zip(plane,eBox):
@@ -8246 +8253 @@
             GL.glVertex3fv(vertex)
         GL.glEnd()
-#        GL.glDrawPixels(width,height,GL.GL_RGBA,GL.GL_UNSIGNED_BYTE,Z)
         GL.glPopMatrix()
         GL.glDisable(GL.GL_TEXTURE_2D)
@@ -8688 +8694 @@
                 SXYZ = np.reshape(np.inner(SXYZ,invModel[:3,:3].T)+VP[nxs,nxs,:],(-1,3))
                 Z = np.reshape(G2mth.getRhos(SXYZ,rho),(npts,npts))
+                plt.cla()
                 plt.contour(Z,colors='k',linewidths=1)
                 plt.axis("off")
@@ -8695 +8702 @@
                 img, (width, height) = agg.print_to_buffer()
                 Zimg = np.frombuffer(img, np.uint8).reshape((height, width, 4))
-                RenderViewPlane(msize*eplane,Wt,Zimg,width,height)
+                RenderViewPlane(msize*eplane,Zimg,width,height)
                 
 #        print time.time()-time0