From 6415a3e0127eb4278e0975f0ba280840ceb1ef95 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 13 Jul 2016 16:02:06 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng
---
src/restore.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/src/restore.c b/src/restore.c
index 56e52b8..3a93d3f 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -57,6 +57,7 @@
if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Points"))){
//fprintf(stderr,"Found point data\n");
if(vesicle!=NULL)
+ //fprintf(stderr,"Fils: %ld, Nfono: %ld\n", vesicle->tape->nfil, vesicle->tape->nfono);
parseXMLVertexPosition(vesicle, doc, cur2);
}
if ((!xmlStrcmp(cur2->name, (const xmlChar *)"Cells"))){
@@ -83,7 +84,7 @@
/* TODO: filaments */
- ts_fprintf(stdout,"Restoration completed\n");
+// ts_fprintf(stdout,"Restoration completed\n");
// write_vertex_xml_file(vesicle,999);
// vesicle_free(vesicle);
// exit(0);
@@ -164,6 +165,16 @@
if ((!xmlStrcmp(child->name, (const xmlChar *)"tristar"))){
parseTrisurfTristar(vesicle, doc, child);
}
+ if ((!xmlStrcmp(child->name, (const xmlChar *)"nucleus"))){
+ parseTrisurfNucleus(vesicle, doc, child);
+ }
+ if ((!xmlStrcmp(child->name, (const xmlChar *)"constant_volume"))){
+ parseTrisurfConstantVolume(doc, child);
+ }
+ if ((!xmlStrcmp(child->name, (const xmlChar *)"constant_area"))){
+ parseTrisurfConstantArea(doc, child);
+ }
+
child = child->next;
}
@@ -178,6 +189,33 @@
/* Low level tags parsers */
+ts_bool parseTrisurfConstantVolume(xmlDocPtr doc, xmlNodePtr cur){
+ xmlChar *cvol = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ char *n=(char *)cvol;
+ V0=atof(n);
+ xmlFree(cvol);
+ return TS_SUCCESS;
+}
+ts_bool parseTrisurfConstantArea(xmlDocPtr doc, xmlNodePtr cur){
+ xmlChar *carea = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ char *n=(char *)carea;
+ A0=atof(n);
+ xmlFree(carea);
+ return TS_SUCCESS;
+}
+
+ts_bool parseTrisurfNucleus(ts_vesicle *vesicle, xmlDocPtr doc, xmlNodePtr cur){
+ xmlChar *coords = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+ char *n=(char *)coords;
+ char *token=strtok(n," ");
+ ts_uint i;
+ for(i=0;i<3;i++){
+ vesicle->nucleus_center[i]=atof(token);
+ token=strtok(NULL," ");
+ }
+ xmlFree(coords);
+ return TS_SUCCESS;
+}
ts_bool parseTrisurfVtxn(ts_vertex_list *vlist, xmlDocPtr doc, xmlNodePtr cur){
@@ -286,7 +324,7 @@
xmlNodePtr child = cur->xmlChildrenNode;
xmlChar *points;
char *pts;
- int i, idx, polyidx, monoidx;
+ int i, idx, polyidx, monoidx, filidx, fonoidx;
char *token[3];
while (child != NULL) {
if ((!xmlStrcmp(child->name, (const xmlChar *)"DataArray"))){
@@ -301,12 +339,19 @@
vesicle->vlist->vtx[idx]->x=atof(token[0]);
vesicle->vlist->vtx[idx]->y=atof(token[1]);
vesicle->vlist->vtx[idx]->z=atof(token[2]);
- } else {
+ } 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=atof(token[0]);
vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->y=atof(token[1]);
vesicle->poly_list->poly[polyidx]->vlist->vtx[monoidx]->z=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=atof(token[0]);
+ vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->y=atof(token[1]);
+ vesicle->filament_list->poly[filidx]->vlist->vtx[fonoidx]->z=atof(token[2]);
}
for(i=0;i<2;i++) token[i]=strtok(NULL," ");
token[2]=strtok(NULL,"\n");
@@ -316,6 +361,7 @@
}
child=child->next;
}
+ //fprintf(stderr,"Came here\n");
//fprintf(stderr,"Vertices position j=%d\n",idx);
return TS_SUCCESS;
@@ -340,7 +386,8 @@
}
else {
//find grafted vtx
- if((vesicle->tape->nmono-1)==(idx-3*(vesicle->vlist->n-2))%(vesicle->tape->nmono)){
+ if(vesicle->tape->npoly && vesicle->tape->nmono && (vesicle->tape->nmono-1)==(idx-3*(vesicle->vlist->n-2))%(vesicle->tape->nmono)
+ && idx<(3*vesicle->vlist->n-2+vesicle->tape->nmono*vesicle->tape->npoly+vesicle->tape->npoly)){
polyidx=(idx-3*(vesicle->vlist->n-2))/(vesicle->tape->nmono);
//fprintf(stderr,"poly=%d, vertex=%d\n",polyidx,atoi(token[0]));
vesicle->poly_list->poly[polyidx]->grafted_vtx=vesicle->vlist->vtx[atoi(token[0])];
--
Gitblit v1.9.3