Merge pull request firemodels#1926 from gforney/master

smokeview source: fix to colorbar setting
drjfloyd · May 29, 2024 · 526c020 · 526c020
2 parents cdf6773 + d786767
commit 526c020
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Source/smokeview/IOslice.c b/Source/smokeview/IOslice.c
@@ -4352,7 +4352,10 @@ FILE_SIZE ReadSlice(const char *file, int ifile, int time_frame, float *time_val
       }
     }
     if(strcmp(sd->label.shortlabel, "TOA")==0){
-      contour_type_save = contour_type;
+      if(is_toa_slice != 1){
+        contour_type_save = contour_type;
+        is_toa_slice = 1;
+      }
       ColorbarMenu(COLORBAR_LINES);
       int set_chopmax = 1;
       float chopmax = 121.0;
@@ -4362,6 +4365,7 @@ FILE_SIZE ReadSlice(const char *file, int ifile, int time_frame, float *time_val
       GLUISetChopHide("TOA", 1);
     }
     else{
+      is_toa_slice = 0;
       if(contour_type_save == SHADED_CONTOURS)ColorbarMenu(COLORBAR_CONTINUOUS);
       if(contour_type_save == STEPPED_CONTOURS)ColorbarMenu(COLORBAR_STEPPED);
       if(contour_type_save == LINE_CONTOURS)ColorbarMenu(COLORBAR_LINES);

diff --git a/Source/smokeview/readsmv.c b/Source/smokeview/readsmv.c
@@ -14614,7 +14614,6 @@ int ReadIni2(char *inifile, int localfile){
       fgets(buffer, 255, stream);
       sscanf(buffer, "%i", &contour_type);
       contour_type = CLAMP(contour_type, 0, 2);
-      contour_type_save = contour_type;
       continue;
     }
     if(MatchINI(buffer, "P3CONT3DSMOOTH") == 1){

diff --git a/Source/smokeview/smokeviewvars.h b/Source/smokeview/smokeviewvars.h
@@ -1558,6 +1558,7 @@ SVEXTERN int SVDECL(uindex,-1), SVDECL(vindex,-1), SVDECL(windex,-1);
 
 SVEXTERN int SVDECL(contour_type,0), SVDECL(p3cont3dsmooth,0);
 SVEXTERN int SVDECL(contour_type_save, -1);
+SVEXTERN int SVDECL(is_toa_slice, 0);
 SVEXTERN int SVDECL(cullfaces,1);
 SVEXTERN int SVDECL(showonly_hiddenfaces,0);