Merge pull request #1612 from gforney/devel

make colorbar code more flexible
firemodels · Jun 22, 2023 · e798361 · e798361
2 parents d605503 + 0bf0ae8
commit e798361
Show file tree

Hide file tree

Showing 20 changed files with 2,377 additions and 618 deletions.
diff --git a/Source/shared/file_util.h b/Source/shared/file_util.h
@@ -46,6 +46,9 @@ typedef struct {
 #define REPLACE_FILE 0
 #define APPEND_FILE 1
 
+#define FILE_MODE 0
+#define DIR_MODE  1
+
 #define NOT_FORCE_IN_DIR 0
 #define FORCE_IN_DIR 1
 

diff --git a/Source/smokeview/IOslice.c b/Source/smokeview/IOslice.c
@@ -1253,7 +1253,7 @@ void ReadFed(int file_index, int time_frame, float *time_value, int flag, int fi
     cb = GetColorbar(default_fed_colorbar);
     if(cb!=NULL){
       colorbartype=cb-colorbarinfo;
-      SetColorbarListIndex(colorbartype);
+      SetColorbarListEdit(colorbartype);
       SliceBoundCB(COLORBAR_LIST2);
       UpdateCurrentColorbar(cb);
     }

diff --git a/Source/smokeview/callbacks.c b/Source/smokeview/callbacks.c
@@ -265,6 +265,7 @@ void MouseEditColorbar(int x, int y){
   GLubyte r, g, b;
   colorbardata *cbi;
 
+  if(colorbar_hidescene==0)return; // don't edit colorbar with mouse if showing scene
   if(show_firecolormap==0){
     cbi = colorbarinfo + colorbartype;
   }