Merge pull request #1826 from gforney/screen

add command line parameters for specifying startup screen position

Author: gforney

Source/smokeview/command_args.c

@@ -206,6 +206,14 @@ CommandlineArgs ParseCommandlineNew(int argc, char **argv, char *message,
       i++;
       sscanf(argv[i],"%f",&args.max_mem_GB);
       if(args.max_mem_GB<0.0)args.max_mem_GB = 0.0;
+    } else if(strcmp(argv[i], "-x0") == 0) {
+      args.have_x0 = true;
+      i++;
+      sscanf(argv[i],"%i",&args.x0);
+    } else if(strcmp(argv[i], "-y0") == 0) {
+      args.have_y0 = true;
+      i++;
+      sscanf(argv[i],"%i",&args.y0);
     } else if (strcmp(argv[i], "-geominfo") == 0) {
       args.geominfo = true;
     } else if (strcmp(argv[i], "-fast") == 0) {

Source/smokeview/command_args.h

@@ -120,6 +120,9 @@ typedef struct CommandlineArgs {
   char *ini_to;
   char *ssf_from;
   char *ssf_to;
+  /// @brief initial screen coordinates
+  bool have_x0, have_y0;
+  int x0, y0;
 } CommandlineArgs;
 
 enum CommandLineError {

Source/smokeview/glui_display.cpp

@@ -144,6 +144,7 @@ GLUI_Rollout *ROLLOUT_light2 = NULL;
 
 GLUI_Panel *PANEL_boundingbox = NULL;
 GLUI_Panel *PANEL_titles=NULL;
+GLUI_Panel *PANEL_screen = NULL;
 GLUI_Panel *PANEL_light=NULL;
 GLUI_Panel *PANEL_position0=NULL;
 GLUI_Panel *PANEL_position1 = NULL;
@@ -242,7 +243,9 @@ GLUI_Button *BUTTON_label_4=NULL;
 #define LABELS_REFRESH_RATE   37
 #endif
 #define LABELS_BOUNDING_BOX   38
-
+#define LABELS_show_screen_origin 39
+#define LABELS_save_screen_origin 40
+#define LABELS_reset_screen_origin 41
 
 #define LABELS_HMS 18
 #define SAVE_SETTINGS_DISPLAY 99
@@ -699,6 +702,11 @@ extern "C" void GLUIDisplaySetup(int main_window){
   CHECKBOX_labels_availmemory = glui_labels->add_checkbox_to_panel(PANEL_gen1, _("Memory load"), &visAvailmemory, LABELS_label, GLUILabelsCB);
 #endif
 
+  PANEL_screen = glui_labels->add_panel_to_panel(PANEL_gen1, "Screen");
+  glui_labels->add_button_to_panel(PANEL_screen,_("Show origin"), LABELS_show_screen_origin, GLUILabelsCB);
+  glui_labels->add_button_to_panel(PANEL_screen,_("Save origin"), LABELS_save_screen_origin, GLUILabelsCB);
+  glui_labels->add_button_to_panel(PANEL_screen,_("Reset origin to (0,0)"), LABELS_reset_screen_origin, GLUILabelsCB);
+
   glui_labels->add_column_to_panel(PANEL_gen1, false);
 
   CHECKBOX_labels_meshlabel = glui_labels->add_checkbox_to_panel(PANEL_gen1, _("Mesh"), &visMeshlabel, LABELS_meshlabel, GLUILabelsCB);
@@ -1147,6 +1155,15 @@ extern "C" void GLUIUpdateGeomBoundingBox(void){
 extern "C" void GLUILabelsCB(int var){
   updatemenu=1;
   switch(var){
+    case LABELS_show_screen_origin:  
+      printf("screen origin: (%i, %i)\n", (int)glutGet((GLenum)GLUT_WINDOW_X), (int)glutGet((GLenum)GLUT_WINDOW_Y));
+      break;
+    case LABELS_save_screen_origin:
+      SaveScreenOrigin((int)glutGet((GLenum)GLUT_WINDOW_X), (int)glutGet((GLenum)GLUT_WINDOW_Y));
+      break;
+    case LABELS_reset_screen_origin:
+      SaveScreenOrigin(0, 0);
+      break;
     case LABELS_BOUNDING_BOX:
       updatemenu = 1;
       break;

Source/smokeview/main.c

@@ -115,6 +115,8 @@ void Usage(char *prog,int option){
     PRINTF("%s\n", _(" -update_slice  - calculate slice file parameters"));
     PRINTF("%s\n", _(" -update        - equivalent to -update_bounds and -update_slice"));
     PRINTF("%s\n", _(" -update_ini case.ini - update case.ini to the current format"));
+    PRINTF("%s\n", _(" -x0 val - horizontal screen coordinate in pixels where window is place at startup"));
+    PRINTF("%s\n", _(" -y0 val - vertical screen coordinate in pixels where window is place at startup"));
     PRINTF("%s\n", _(" -volrender     - generate images of volume rendered smoke and fire"));
     UsageCommon(HELP_ALL);
   }
@@ -182,6 +184,14 @@ char *ProcessCommandLine(CommandlineArgs *args) {
     void SMV_EXIT(int error);
     SMV_EXIT(0);
   }
+  if(args->have_x0){
+    use_commandline_origin = 1;
+    screenOriginX = args->x0;
+  }
+  if(args->have_y0){
+    use_commandline_origin = 1;
+    screenOriginY = args->y0;
+  }
   if (args->csv) {
     update_csv_load = 1;
   }

Source/smokeview/menus.c

@@ -1864,6 +1864,50 @@ void GetNextViewLabel(char *label){
   }
 }
 
+/* ------------------ SaveScreenOrigin ------------------------ */
+
+void SaveScreenOrigin(int x, int y){
+  FILE *stream;
+
+  stream = fopen(smv_screenini, "w");
+  if(stream==NULL)return;
+  fprintf(stream, "%i %i", x, y);
+  fclose(stream);
+}
+
+/* ------------------ GetScreenOrigin ------------------------ */
+
+int GetScreenOrigin(int *x, int *y){
+  FILE *stream;
+  char buffer[255];
+
+  stream = fopen(smv_screenini, "r");
+  if(stream==NULL)return 0;
+  fgets(buffer, 255, stream);
+  sscanf(buffer, "%i %i", x, y);
+  fclose(stream);
+  return 1;
+}
+
+/* ------------------ ScreenMenu ------------------------ */
+
+void ScreenMenu(int value){
+  switch (value){
+    case 1:
+      printf("screen origin: (%i, %i)\n", (int)glutGet((GLenum)GLUT_WINDOW_X), (int)glutGet((GLenum)GLUT_WINDOW_Y));
+      break;
+    case 2:
+      SaveScreenOrigin((int)glutGet((GLenum)GLUT_WINDOW_X), (int)glutGet((GLenum)GLUT_WINDOW_Y));
+      break;
+    case 3:
+      SaveScreenOrigin(0, 0);
+      break;
+    default:
+      assert(FFALSE);
+      break;
+  }
+}
+
 /* ------------------ ResetMenu ------------------------ */
 
 void ResetMenu(int value){
@@ -8472,6 +8516,7 @@ static int smokecolorbars_submenu1 = 0, smokecolorbars_submenu2 = 0, smokecolorb
 static int smokecolorbars_submenu4 = 0, smokecolorbars_submenu5 = 0, smokecolorbars_submenu6 = 0;
 static int smokecolorbars_submenu7 = 0;
 static int resetmenu=0, defaultviewmenu=0, frameratemenu=0, rendermenu=0, smokeviewinimenu=0, inisubmenu=0, resolutionmultipliermenu=0;
+static int screenmenu = 0;
 static int terrain_geom_showmenu = 0;
 static int render_resolutionmenu=0, render_filetypemenu=0, render_filesuffixmenu=0, render_skipmenu=0;
 static int render_startmenu = 0;
@@ -10709,6 +10754,13 @@ static int menu_count=0;
     glutAddMenuEntry(line, ca->view_id);
   }
 
+  /* --------------------------------screen menu -------------------------- */
+
+  CREATEMENU(screenmenu, ScreenMenu);
+  glutAddMenuEntry("Show screen origin", 1);
+  glutAddMenuEntry("Save screen origin", 2);
+  glutAddMenuEntry("Reset screen origin", 3);
+
   /* --------------------------------reset menu -------------------------- */
 
   CREATEMENU(resetmenu,ResetMenu);
@@ -10806,6 +10858,7 @@ static int menu_count=0;
 
   GLUTADDSUBMENU(_("Viewpoints (default)"), defaultviewmenu);
   GLUTADDSUBMENU(_("Viewpoints (user)"), resetmenu);
+  GLUTADDSUBMENU(_("Screen"), screenmenu);
   glutAddMenuEntry("-", MENU_DUMMY);
   if(nsmoke3dloaded>0){
     showhide_data = 1;

Source/smokeview/smokeheaders.h

@@ -323,6 +323,9 @@ EXTERNCPP void SetupPlot2DUnitData(void);
 
 EXTERNCPP void TimeAveragePlot2DData(float *times, float *vals, float *vals_avg, int nvals, float time_interval);
 
+EXTERNCPP void SaveScreenOrigin(int x, int y);
+EXTERNCPP int GetScreenOrigin(int *x, int *y);
+
 EXTERNCPP void SetHVACInfo(void);
 EXTERNCPP void DrawHVACS(void);
 EXTERNCPP hvacnodedata *GetHVACNode(hvacdata *hvaci, int node_id);

Source/smokeview/smokeviewvars.h

@@ -1353,6 +1353,9 @@ SVEXTERN float SVDECL(scene_aspect_ratio,1.0);
 SVEXTERN int SVDECL(fix_window_aspect, 0);
 SVEXTERN float SVDECL(window_aspect,640.0/480.0);
 SVEXTERN int SVDECL(screenWidth,640), SVDECL(screenHeight,480);
+SVEXTERN int SVDECL(screenOriginX, 0), SVDECL(screenOriginY, 0);
+SVEXTERN int SVDECL(use_commandline_origin, 0);
+SVEXTERN char SVDECL(*smv_screenini, NULL);
 SVEXTERN int screenWidth_save, screenHeight_save;
 SVEXTERN int SVDECL(screenWidthINI,640), SVDECL(screenHeightINI,480);
 SVEXTERN int SVDECL(glui_screenWidth,640), SVDECL(glui_screenHeight,480);

Source/smokeview/startup.c

@@ -425,6 +425,10 @@ void InitStartupDirs(void){
     MKDIR(smokeview_scratchdir);
   }
 
+  NewMemory((void **)&smv_screenini, strlen(smokeview_scratchdir) + strlen("smv_screen.ini") + 1);
+  strcpy(smv_screenini, smokeview_scratchdir);
+  strcat(smv_screenini, "smv_screen.ini");
+
   NewMemory((void **)&colorbars_user_dir, strlen(homedir) + strlen(dirseparator) + strlen(".smokeview") + strlen(dirseparator) + strlen("colorbars") + 1);
   strcpy(colorbars_user_dir, homedir);
   strcat(colorbars_user_dir, dirseparator);
@@ -494,6 +498,8 @@ void SetupGlut(int argc, char **argv){
     if(verbose_output==1)PRINTF("%s",_("initializing Smokeview graphics window - "));
 #endif
     glutInitWindowSize(screenWidth, screenHeight);
+    if(use_commandline_origin == 0)GetScreenOrigin(&screenOriginX, &screenOriginY);
+    glutInitWindowPosition(screenOriginX, screenOriginY);
 #ifdef _DEBUG
     if(verbose_output==1)PRINTF("%s\n",_("initialized"));
 #endif