Changeset 3782 for trunk/gui/src/RpPdbToVtk.c

Timestamp:

Jul 12, 2013 11:57:45 AM (11 years ago)

Author:

gah

Message:

fix multiple barchart results, fix PDB reader, dynamically create tabs for vtkviewer

File:

• trunk/gui/src/RpPdbToVtk.c (modified) (7 diffs)

trunk/gui/src/RpPdbToVtk.c

@@ -32 +32 @@
 
 static INLINE char *
-GetLine(char **stringPtr, const char *endPtr) 
+GetLine(char **stringPtr, const char *endPtr, int *lengthPtr) 
 {
     char *line, *p;
@@ -40 +40 @@
         if (*p == '\n') {
             *stringPtr = p + 1;
+            *lengthPtr = p - line;
             return line;
         }
@@ -298 +299 @@
 
     symbolIndex = elemIndex = -1;
-
+    elemName = SkipSpaces(elemName);
     for (p = symbolNames; *p != NULL; p++) {
         if (strcasecmp(elemName, *p) == 0) {
@@ -305 +306 @@
         }
     }
+    symbolName = SkipSpaces(symbolName);
     for (p = symbolNames; *p != NULL; p++) {
         if (strcasecmp(symbolName, *p) == 0) {
@@ -360 +362 @@
     objPtr = NULL;
     for (p = string, pend = p + length; p < pend; /*empty*/) {
-        char *line;
+        char *line, *q;
         char c;
-
-        line = GetLine(&p, pend);
+        int lineLength;
+
+        line = GetLine(&p, pend, &lineLength);
         if (line >= pend) {
             break;                      /* EOF */
@@ -381 +384 @@
             int atom;
 
+            if (lineLength < 47) {
+                Tcl_AppendResult(interp, "short ATOM line \"", line, "\"", 
+                        (char *)NULL);
+                goto error;
+            }           
             strncpy(buf, line + 6, 5);
             buf[5] = '\0';
@@ -427 +435 @@
             }
             Tcl_ListObjAppendElement(interp, pointsObjPtr, Tcl_NewDoubleObj(z));
-            strncpy(symbolName, line + 77, 2);
-            symbolName[2] = '\0';
-
+            symbolName[0] = '\0';
+            if (lineLength >= 78) {
+                symbolName[0] = line[76];
+                symbolName[1] = line[77];
+                symbolName[2] = '\0';
+            }
             atom = VerifyElement(SkipSpaces(atomName), SkipSpaces(symbolName));
             if (atom < 0) {
-                Tcl_AppendResult(interp, "bad atom/element \"", atomName,
-                                 "\" \"", symbolName, "\"", (char *)NULL);
+                Tcl_AppendResult(interp, "bad atom \"", atomName, 
+                        "\" or element \"", symbolName, "\"", (char *)NULL);
                 goto error;
             }