Merge pull request #633 from gforney/master

minor update to smokeview menus and formatting output

Author: gforney

Source/smokeview/IOsmoke.c

@@ -4970,6 +4970,7 @@ void ReadSmoke3d(int iframe,int ifile,int flag, int *errorcode){
   int nchars[2];
   int nframes_found=0;
   int frame_start, frame_end;
+  char smoketype[100];
 
   float time_local;
   char compstring[128];
@@ -4989,6 +4990,25 @@ void ReadSmoke3d(int iframe,int ifile,int flag, int *errorcode){
     fortran_skip=0;
   }
 
+  switch(smoke3di->type){
+  case HRRPUV:
+    strcpy(smoketype, "hrrpuv");
+    break;
+  case TEMP:
+    strcpy(smoketype, "temperature");
+    break;
+  case CO2:
+    strcpy(smoketype, "CO2");
+    break;
+  case SOOT:
+    strcpy(smoketype, "soot");
+    break;
+  default:
+    strcpy(smoketype, "unknown");
+    ASSERT(FFALSE);
+    break;
+  }
+
   if(smoke3di->loaded==1&&flag!=RELOAD){
     FreeSmoke3d(smoke3di);
     smoke3di->loaded=0;
@@ -5200,7 +5220,7 @@ void ReadSmoke3d(int iframe,int ifile,int flag, int *errorcode){
     }
     if(use_tload_begin==1&&time_local<tload_begin)smoke3di->use_smokeframe[i]=0;
     if(smoke3di->use_smokeframe[i]==1){
-      PRINTF("3D smoke/fire time=%.2f",time_local);
+      PRINTF("%s time=%.2f mesh:%s",smoketype,time_local,meshi->label);
     }
     SKIP;fread(nchars,4,2,SMOKE3DFILE);SKIP;
     if(feof(SMOKE3DFILE)!=0){

Source/smokeview/menus.c

@@ -805,6 +805,12 @@ void ColorbarMenu(int value){
      contour_type=LINE_CONTOURS;
      UpdateRGBColors(COLORBAR_INDEX_NONE);
      break;
+   case COLORBAR_HORIZONTAL:
+     LabelMenu(MENU_LABEL_colorbar_horizontal);
+     break;
+   case COLORBAR_VERTICAL:
+     LabelMenu(MENU_LABEL_colorbar_vertical);
+     break;
    default:
      ASSERT(FFALSE);
      break;
@@ -7324,6 +7330,11 @@ updatemenu=0;
 /* -------------------------------- colorbarmenu -------------------------- */
 
   CREATEMENU(colorbarshademenu,ColorbarMenu);
+  if(visColorbarVertical==1)glutAddMenuEntry(_("*Vertical"),COLORBAR_VERTICAL);
+  if(visColorbarVertical==0)glutAddMenuEntry(_("Vertical"),COLORBAR_VERTICAL);
+  if(visColorbarHorizontal==1)glutAddMenuEntry(_("*Horizontal"),COLORBAR_HORIZONTAL);
+  if(visColorbarHorizontal==0)glutAddMenuEntry(_("Horizontal"),COLORBAR_HORIZONTAL);
+  glutAddMenuEntry("-", MENU_DUMMY);
   if(contour_type==SHADED_CONTOURS){
     glutAddMenuEntry(_("*Continuous"),COLORBAR_CONTINUOUS);
     glutAddMenuEntry(_("Stepped"),COLORBAR_STEPPED);

Source/smokeview/smokeviewdefs.h

@@ -750,6 +750,9 @@ void _Sniff_Errors(char *whereat);
 #define COLORBAR_CONTINUOUS -17
 #define COLORBAR_STEPPED -18
 #define COLORBAR_LINES -19
+#define COLORBAR_HORIZONTAL -23
+#define COLORBAR_VERTICAL -24
+#define COLORBAR_LINES -19
 #define COLORBAR_HIGHLIGHT_BELOW -7
 #define COLORBAR_HIGHLIGHT_ABOVE -20
 #define COLORBAR_TRANSPARENT -13