From 579fbdf994b239ddcf68b1364fa3c84b2837d5c8 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 19 Oct 2019 16:05:49 +0000
Subject: [PATCH] Restore seems to be working, however...
---
src/restore.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/restore.c b/src/restore.c
index 7079960..9f9c3f4 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -394,22 +394,22 @@
for(i=0,idx=0;i<data_len;i+=3,idx++){
// while(token[0]!=NULL){
if(idx<vesicle->vlist->n){
- vesicle->vlist->vtx[idx]->x=coords[idx];//atof(token[0]);
- vesicle->vlist->vtx[idx]->y=coords[idx+1];//atof(token[1]);
- vesicle->vlist->vtx[idx]->z=coords[idx+2];//atof(token[2]);
+ vesicle->vlist->vtx[idx]->x=coords[i];//atof(token[0]);
+ vesicle->vlist->vtx[idx]->y=coords[i+1];//atof(token[1]);
+ vesicle->vlist->vtx[idx]->z=coords[i+2];//atof(token[2]);
} else if(vesicle->tape->nmono && vesicle->tape->npoly && idx<vesicle->vlist->n+vesicle->tape->nmono*vesicle->tape->npoly) {
polyidx=(idx-vesicle->vlist->n)/vesicle->tape->nmono;
monoidx=(idx-vesicle->vlist->n)%vesicle->tape->nmono;
- vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->x=coords[idx];//atof(token[0]);
- vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->y=coords[idx+1];//atof(token[1]);
- vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->z=coords[idx+2];//atof(token[2]);
+ vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->x=coords[i];//atof(token[0]);
+ vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->y=coords[i+1];//atof(token[1]);
+ vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->z=coords[i+2];//atof(token[2]);
} else {
filidx=(idx-vesicle->vlist->n-vesicle->tape->nmono*vesicle->tape->npoly)/vesicle->tape->nfono;
fonoidx=(idx-vesicle->vlist->n-vesicle->tape->nmono*vesicle->tape->npoly)%vesicle->tape->nfono;
//fprintf(stderr,"filidx=%d, fonoidx=%d, coord=%s,%s,%s\n",filidx,fonoidx,token[0],token[1],token[2]);
- vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->x=coords[idx];//atof(token[0]);
- vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->y=coords[idx+1];//atof(token[1]);
- vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->z=coords[idx+2];//atof(token[2]);
+ vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->x=coords[i];//atof(token[0]);
+ vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->y=coords[i+1];//atof(token[1]);
+ vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->z=coords[i+2];//atof(token[2]);
}
//for(i=0;i<2;i++) token[i]=strtok(NULL," ");
//token[2]=strtok(NULL,"\n");
@@ -428,7 +428,7 @@
xmlNodePtr child = cur->xmlChildrenNode;
xmlChar *bonds, *conname;
// char *b;
- int i,idx, polyidx;
+ int idx, polyidx;
// char *token[2];
// int temp_cnt=0;
while (child != NULL) {
@@ -440,7 +440,7 @@
data_len=data_len/sizeof(unsigned long);
//token[0]=strtok(b," ");
//token[1]=strtok(NULL,"\n");
- for(i=0,idx=0;i<data_len;i+=2,idx++){
+ for(idx=0;idx<data_len;idx+=2){
// while(token[0]!=NULL){
if(idx<3*(vesicle->vlist->n-2)){
bond_add(vesicle->blist, vesicle->vlist->vtx[conn[idx]], vesicle->vlist->vtx[conn[idx+1]]);
--
Gitblit v1.9.3