Changeset 4675 for branches/1.3


Ignore:
Timestamp:
Nov 9, 2014, 9:58:32 PM (5 years ago)
Author:
ldelgass
Message:

merge r4658 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4658
  • branches/1.3/gui/src/RpPdbToVtk.c

    r4412 r4675  
    191191    for (i = 0, hPtr = Tcl_FirstHashEntry(atomTablePtr, &iter); hPtr != NULL;
    192192         hPtr = Tcl_NextHashEntry(&iter), i++) {
    193         PdbAtom *atomPtr;
    194 
    195         atomPtr = Tcl_GetHashValue(hPtr);
     193        PdbAtom *atomPtr = Tcl_GetHashValue(hPtr);
    196194        array[i] = atomPtr;
    197195    }
     
    691689        Tcl_AppendToObj(objPtr, mesg, -1);
    692690    }
     691#if 0
    693692    for (hPtr = Tcl_FirstHashEntry(&atomTable, &iter); hPtr != NULL;
    694693         hPtr = Tcl_NextHashEntry(&iter)) {
    695         PdbAtom *atomPtr;
    696 
    697         atomPtr = Tcl_GetHashValue(hPtr);
    698 #if 0
     694        PdbAtom *atomPtr = Tcl_GetHashValue(hPtr);
    699695        fprintf(stderr, "%d %s %d connections\n", atomPtr->ordinal,
    700696                elements[atomPtr->number].symbol, atomPtr->numConnections);
     697    }
    701698#endif
    702     }
    703699    sprintf(mesg, "POINT_DATA %d\n", atomTable.numEntries);
    704700    Tcl_AppendToObj(objPtr, mesg, -1);
Note: See TracChangeset for help on using the changeset viewer.