diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp index d58e939da0adeac6952609951e1d70af198de75d..a7d3e4a04a9ed866bcbd92b64882c29dd98b689f 100644 --- a/Geo/Geo.cpp +++ b/Geo/Geo.cpp @@ -1,4 +1,4 @@ -/* $Id: Geo.cpp,v 1.6 2000-11-28 17:18:30 geuzaine Exp $ */ +/* $Id: Geo.cpp,v 1.7 2000-12-01 13:38:53 geuzaine Exp $ */ #include "Gmsh.h" #include "Const.h" @@ -59,6 +59,7 @@ void add_infile(char *text, char *fich){ yyin = fopen("gmsh.tmp","w"); file = fopen(fich,"a"); fprintf(yyin,"%s\n",text); + Msg(SELECT,"%s",text); fclose(yyin); yyin = fopen("gmsh.tmp","r"); while(!feof(yyin)){ @@ -431,14 +432,12 @@ void add_physical_entity(List_T *list, char *fich, int type, int *num){ if(((*num) = recognize_zone(MSH_PHYSICAL_VOLUME,list))) return; *num = NEWREG(); - if (type == 1) - sprintf(text, "Physical Line(%d) = {", *num); - else if (type == 2) - sprintf(text, "Physical Surface(%d) = {", *num); - else if (type == 0) - sprintf(text, "Physical Point(%d) = {", *num); - else - sprintf(text, "Physical Volume(%d) = {", *num); + switch(type){ + case ENT_POINT : sprintf(text, "Physical Point(%d) = {", *num); break; + case ENT_LINE : sprintf(text, "Physical Line(%d) = {", *num); break; + case ENT_SURFACE : sprintf(text, "Physical Surface(%d) = {", *num); break; + case ENT_VOLUME : sprintf(text, "Physical Volume(%d) = {", *num); break; + } for(i=0; i<List_Nbr(list); i++){ List_Read(list, i, &elementary_entity); diff --git a/Unix/CbGeom.cpp b/Unix/CbGeom.cpp index 4a6f7a4960ca7799212383e6ddaec5f1d56db0e7..f80d7b61679c5b18f2fbfaefed34d90bb21c0b0d 100644 --- a/Unix/CbGeom.cpp +++ b/Unix/CbGeom.cpp @@ -1,4 +1,4 @@ -/* $Id: CbGeom.cpp,v 1.5 2000-11-26 15:43:47 geuzaine Exp $ */ +/* $Id: CbGeom.cpp,v 1.6 2000-12-01 13:38:58 geuzaine Exp $ */ #include "Gmsh.h" #include "GmshUI.h" @@ -483,15 +483,15 @@ void geom_event_handler (int event) { switch(event){ case GEOM_PHYS_ADD_POINT: Msg(STATUS,"Select Point ('e'=end, 'q'=quit)"); - type = 0; + type = ENT_POINT; break; case GEOM_PHYS_ADD_LINE: Msg(STATUS,"Select Line ('e'=end, 'q'=quit)"); - type = 1; + type = ENT_LINE; break; case GEOM_PHYS_ADD_SURF: Msg(STATUS,"Select Surface ('e'=end, 'q'=quit)"); - type = 2; + type = ENT_SURFACE; break; } ib = SelectEntity(type, &v,&c,&s);