Changeset 1534 for trunk/packages/vizservers

Timestamp:

Jun 26, 2009, 1:24:37 PM (15 years ago)

Author:

gah

Message:

 

File:

• trunk/packages/vizservers/pymolproxy/pymolproxy.c (modified) (8 diffs)

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -136 +136 @@
 #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)
@@ -826 +825 @@
         proxyPtr->flags |= FORCE_UPDATE;
     }
-    Pymol(proxyPtr, "hide everything,%s\nset stick_color,white,%s\n", model,
-          model);
+    Pymol(proxyPtr, "set stick_color,white,%s\n", model);
     Pymol(proxyPtr, "show sticks,%s\nshow spheres,%s\n", model, model);
-
-    if (proxyPtr->flags & SHOW_LABELS) {
-        Pymol(proxyPtr, "show labels,%s\n", model);
-    }
     return proxyPtr->status;
 }
@@ -960 +954 @@
 {
     PymolProxy *proxyPtr = clientData;
-    const char *model = "all";
-    int i, defer = 0, push = 0;
-
-    clear_error(proxyPtr);
-
+    const char *model;
+    int i, defer, push;
+
+    clear_error(proxyPtr);
+    push = defer = FALSE;
+    model = "all";
     for(i = 1; i < argc; i++) {
-                
-        if (strcmp(argv[i],"-defer") == 0)
-            defer = 1;
-        else if (strcmp(argv[i], "-push") == 0 )
-            push = 1;
-        else
+        if (strcmp(argv[i],"-defer") == 0) {
+            defer = TRUE;
+        } else if (strcmp(argv[i], "-push") == 0) {
+            push = TRUE;
+        } else {
             model = argv[i];
-
+        }
     }
     proxyPtr->flags |= INVALIDATE_CACHE; /* Enable */
@@ -991 +985 @@
 {
     PymolProxy *proxyPtr = clientData;
-    int frame = 0;
-    int i, push = 0, defer = 0;
-
-    clear_error(proxyPtr);
-
-    for(i = 1; i < argc; i++) {
-        if ( strcmp(argv[i],"-defer") == 0 )
-            defer = 1;
-        else if (strcmp(argv[i],"-push") == 0 )
-            push = 1;
-        else
+    int i, push, defer, frame;
+
+    clear_error(proxyPtr);
+    frame = 0;
+    push = defer = TRUE;
+    for(i = 1; i < argc; i++) { 
+        if (strcmp(argv[i],"-defer") == 0) {
+            defer = TRUE;
+        } else if (strcmp(argv[i],"-push") == 0) {
+            push = TRUE;
+        } else {
             frame = atoi(argv[i]);
-    }
-                
+        }
+    }
     if (!defer || push) {
         proxyPtr->flags |= UPDATE_PENDING;
@@ -1016 +1010 @@
 
     Pymol(proxyPtr,"frame %d\n", frame);
-        
     return proxyPtr->status;
 }
@@ -1065 +1058 @@
         Pymol(proxyPtr, "label %s\n", model);
     }
-    if (state) {
-        proxyPtr->flags |= SHOW_LABELS;
-    } else {
-        proxyPtr->flags &= ~SHOW_LABELS;
-    }
     return proxyPtr->status;
 }
@@ -1104 +1092 @@
         proxyPtr->flags |= FORCE_UPDATE;
     }
-    Pymol(proxyPtr, "hide everything,%s\nshow lines,%s\n", model, model);
+    Pymol(proxyPtr, "hide spheres,%s\nshow lines,%s\n", model, model);
     return proxyPtr->status;
 }
@@ -1544 +1532 @@
         proxyPtr->flags |= FORCE_UPDATE;
     }
-    Pymol(proxyPtr, "set sphere_quality,2,%s\nhide everything,%s\n", 
+    Pymol(proxyPtr, "set sphere_quality,2,%s\nhide lines,%s\n", 
           model, model);
     Pymol(proxyPtr, "set ambient,.2,%s\nshow spheres,%s\n", model, model);