Changeset 1337

Timestamp:

Mar 18, 2009 8:16:52 AM (15 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers

Files:

• nanovis/RpAVTranslate.cpp (modified) (2 diffs)
• pymolproxy/pymolproxy.c (modified) (7 diffs)

trunk/packages/vizservers/nanovis/RpAVTranslate.cpp

@@ -180 +180 @@
     }
 
+#ifdef notdef
     // use img_convert instead of sws_scale because img_convert
     // is lgpl nad sws_scale is gpl
@@ -185 +186 @@
                 (AVPicture *)_rgb_picture, PIX_FMT_RGB24,
                 _width, _height);
-
+#endif
     writeVideoFrame(status);
 

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -133 +133 @@
 #define BUFFER_SHORT_READ       -3
 
-#define ATOM_SCALE_PENDING      (1<<0)
-#define BOND_THICKNESS_PENDING  (1<<1)
-#define ROTATE_PENDING          (1<<2)
-#define PAN_PENDING             (1<<3)
-#define ZOOM_PENDING            (1<<4)
-#define UPDATE_PENDING          (1<<5)
-#define FORCE_UPDATE            (1<<6)
-#define CAN_UPDATE              (1<<7)
-#define SHOW_LABELS             (1<<8)
-#define INVALIDATE_CACHE        (1<<9)
+#define FORCE_UPDATE            (1<<0)
+#define CAN_UPDATE              (1<<1)
+#define SHOW_LABELS             (1<<2)
+#define INVALIDATE_CACHE        (1<<3)
+#define ATOM_SCALE_PENDING      (1<<4)
+#define BOND_THICKNESS_PENDING  (1<<5)
+#define ROTATE_PENDING          (1<<6)
+#define PAN_PENDING             (1<<7)
+#define ZOOM_PENDING            (1<<8)
+#define UPDATE_PENDING          (1<<9)
+#define VIEWPORT_PENDING        (1<<10)
 
 typedef struct {
@@ -164 +165 @@
     int error;
     int status;
+    int width, height;          /* Size of viewport. */
     float xAngle, yAngle, zAngle;  /* Euler angles of pending rotation.  */
     float atomScale;            /* Atom scale of pending re-scale. */
@@ -533 +535 @@
     imgPtr = malloc(sizeof(Image) + dataLength);
     if (imgPtr == NULL) {
-        fprintf(stderr, "can't allocate image of %d bytes", 
-                sizeof(Image) + dataLength);
+        fprintf(stderr, "can't allocate image of %lu bytes", 
+                (unsigned long)(sizeof(Image) + dataLength));
         abort();
     }
@@ -671 +673 @@
         }
         return  proxyPtr->status;
+    }
+}
+
+static void
+SetViewport(PymolProxy *proxyPtr)
+{
+    if (proxyPtr->flags & VIEWPORT_PENDING) {
+        Pymol(proxyPtr, "viewport %d,%d\n", proxyPtr->width, proxyPtr->height);
+        proxyPtr->flags &= ~VIEWPORT_PENDING;
     }
 }
@@ -1262 +1273 @@
 {
     char buffer[800];
-    size_t nBytes=0;
+    int nBytes=0;
     PymolProxy *proxyPtr = clientData;
     size_t length;
@@ -1556 +1567 @@
         proxyPtr->flags |= FORCE_UPDATE;
     }
-    Pymol(proxyPtr, "viewport %d,%d\n", width, height);
+    proxyPtr->width = width;
+    proxyPtr->height = height;
+    proxyPtr->flags |= VIEWPORT_PENDING;
 
     //usleep(205000); // .2s delay for pymol to update its geometry *HACK ALERT*
@@ -1962 +1975 @@
 
         /* Handle all the pending setting changes now. */
+        if (proxyPtr->flags & VIEWPORT_PENDING) {
+            SetViewport(proxyPtr);
+        }
         if (proxyPtr->flags & ROTATE_PENDING) {
             SetRotation(proxyPtr);