add pp_HTML directive for isolating render to html code (#2495)

* smokeview source: add pp_HTML directive

* smokeview source: add back RENDERDIR script keyword hidden by previous commit

Author: gforney

Source/shared/paths.c

@@ -141,6 +141,7 @@ char *CasePathSmvOrig(smv_case *scase){
   return SetupPath(NULL, scase->fdsprefix, ".smo");
 }
 
+#ifdef pp_HTML
 /* ------------------ CasePathHtmlVr ------------------------ */
 
 // char *htmlvr_filename;
@@ -168,6 +169,7 @@ char *CasePathHtmlSliceNode(smv_case *scase){
 char *CasePathHtmlSliceCell(smv_case *scase){
   return SetupPath(NULL, scase->fdsprefix, "_slicecell.json");
 }
+#endif
 
 /* ------------------ CasePathEvent ------------------------ */
 

Source/shared/paths.h

@@ -27,18 +27,20 @@ EXTERNCPP char *CasePathCaseIni(smv_case *scase);
 EXTERNCPP char *CasePathFed(smv_case *scase);
 // char *dEcsv_filename;
 EXTERNCPP char *CasePathDeCsv(smv_case *scase);
-// char *html_filename;
-EXTERNCPP char *CasePathHtml(smv_case *scase);
-// char *smv_orig_filename;
-EXTERNCPP char *CasePathSmvOrig(smv_case *scase);
+#ifdef pp_HTML
 // char *htmlvr_filename;
 EXTERNCPP char *CasePathHtmlVr(smv_case *scase);
+// char *html_filename;
+EXTERNCPP char *CasePathHtml(smv_case *scase);
 // char *htmlobst_filename;
 EXTERNCPP char *CasePathHtmlObst(smv_case *scase);
 // char *htmlslicenode_filename;
 EXTERNCPP char *CasePathHtmlSliceNode(smv_case *scase);
 // char *htmlslicecell_filename;
 EXTERNCPP char *CasePathHtmlSliceCell(smv_case *scase);
+// char *smv_orig_filename;
+#endif
+EXTERNCPP char *CasePathSmvOrig(smv_case *scase);
 // char *event_filename;
 EXTERNCPP char *CasePathEvent(smv_case *scase);
 // char *ffmpeg_command_filename;

Source/smokeview/IOscript.c

@@ -382,13 +382,15 @@ void InitKeywords(void){
   InitKeyword("RENDERCLIP",          SCRIPT_RENDERCLIP, 1);          // documented
   InitKeyword("RENDERDIR",           SCRIPT_RENDERDIR, 1);           // documented
   InitKeyword("RENDERDOUBLEONCE",    SCRIPT_RENDERDOUBLEONCE, 1);    // documented
+#ifdef pp_HTML
   InitKeyword("RENDERHTMLALL",       SCRIPT_RENDERHTMLALL, 1);       // documented
   InitKeyword("RENDERHTMLDIR",       SCRIPT_RENDERHTMLDIR, 1);       // documented
   InitKeyword("RENDERHTMLGEOM",      SCRIPT_RENDERHTMLGEOM, 1);
   InitKeyword("RENDERHTMLOBST",      SCRIPT_RENDERHTMLOBST, 1);
   InitKeyword("RENDERHTMLONCE",      SCRIPT_RENDERHTMLONCE, 1);      // documented
   InitKeyword("RENDERHTMLSLICECELL", SCRIPT_RENDERHTMLSLICECELL, 2);
   InitKeyword("RENDERHTMLSLICENODE", SCRIPT_RENDERHTMLSLICENODE, 2);
+#endif
   InitKeyword("RENDERONCE",          SCRIPT_RENDERONCE, 1);          // documented
   InitKeyword("RENDERSIZE",          SCRIPT_RENDERSIZE, 1);          // documented
   InitKeyword("RENDERSTART",         SCRIPT_RENDERSTART, 1);         // documented
@@ -924,18 +926,24 @@ int CompileScript(char *scriptfile){
           scripti->ival = AVI;
         }
         break;
-
+#ifdef pp_HTML
 // RENDERDIR
-// RENDERHTMLDIR
 //  directory name (char) (where rendered files will go)
       case SCRIPT_RENDERDIR:
       case SCRIPT_RENDERHTMLDIR:
+#else
+// RENDERDIR
+//  directory name (char) (where rendered files will go)
+      case SCRIPT_RENDERDIR:
+#endif
       {
         int len;
         int i;
 
         scripti->need_graphics = 1;
+#ifdef pp_HTML
         if(kw->index==SCRIPT_RENDERHTMLDIR)scripti->need_graphics = 0;
+#endif
         SETbuffer;
         if(script_renderdir_cmd!=NULL&&strlen(script_renderdir_cmd)>0){
           strcpy(param_buffer, script_renderdir_cmd);
@@ -994,7 +1002,7 @@ int CompileScript(char *scriptfile){
       case SCRIPT_RENDERDOUBLEONCE:
         SETcval2;
         break;
-
+#ifdef pp_HTML
 // RENDERHTMLONCE
 // RENDERHTMLALL
 // file name base (char) (or blank to use smokeview default)
@@ -1016,7 +1024,7 @@ int CompileScript(char *scriptfile){
         SETcval2;
         scripti->need_graphics = 0;
         break;
-
+#endif
 // RENDERSTART
 //  start_frame (int) skip_frame (int)
       case SCRIPT_RENDERSTART:
@@ -1572,6 +1580,7 @@ case SCRIPT_LOADSMV:
   return return_val;
 }
 
+#ifdef pp_HTML
 /* ------------------ GetWebFileName ------------------------ */
 
 void GetWebFileName(char *web_filename, scriptdata *scripti){
@@ -1648,6 +1657,7 @@ void ScriptRenderHtml(scriptdata *scripti, int option){
   GetWebFileName(webvr_filename, scripti);
   strcat(webvr_filename,"_vr.html");
 }
+#endif
 
 /* ------------------ ScriptRenderStart ------------------------ */
 
@@ -4019,6 +4029,7 @@ int RunScriptCommand(scriptdata *script_command){
         script_dir_path=NULL;
       }
       break;
+#ifdef pp_HTML
     case SCRIPT_RENDERHTMLDIR:
       if(scripti->cval!=NULL&&strlen(scripti->cval)>0){
         script_htmldir_path = scripti->cval;
@@ -4033,6 +4044,7 @@ int RunScriptCommand(scriptdata *script_command){
         script_htmldir_path = NULL;
       }
       break;
+#endif
     case SCRIPT_KEYBOARD:
       if(scripti->cval!=NULL){
         char *key;
@@ -4084,6 +4096,7 @@ int RunScriptCommand(scriptdata *script_command){
       Keyboard('r',FROM_SMOKEVIEW);
       returnval=1;
       break;
+#ifdef pp_HTML
     case SCRIPT_RENDERHTMLALL:
       ScriptRenderHtml(scripti, HTML_ALL_TIMES);
       returnval = 1;
@@ -4108,6 +4121,7 @@ int RunScriptCommand(scriptdata *script_command){
       ScriptRenderSliceCell(scripti);
       returnval = 1;
       break;
+#endif
     case SCRIPT_RENDERDOUBLEONCE:
       Keyboard('R',FROM_SMOKEVIEW);
       returnval=1;

Source/smokeview/IOscript.h

@@ -4,13 +4,15 @@
 #define EXTERNAL_VIEW 1
 
 #define SCRIPT_RENDERONCE        101
+#ifdef pp_HTML
 #define SCRIPT_RENDERHTMLONCE    102
 #define SCRIPT_RENDERHTMLALL     105
 #define SCRIPT_RENDERHTMLDIR     109
 #define SCRIPT_RENDERHTMLGEOM    123
 #define SCRIPT_RENDERHTMLOBST    124
 #define SCRIPT_RENDERHTMLSLICENODE 125
 #define SCRIPT_RENDERHTMLSLICECELL 126
+#endif
 #define SCRIPT_RENDERDOUBLEONCE  103
 #define SCRIPT_RENDERALL         104
 #define SCRIPT_RENDER360ALL      106

Source/smokeview/glui_motion.cpp

@@ -1485,8 +1485,9 @@ extern "C" void GLUIMotionSetup(int main_window){
   glui_motion->add_radiobutton_to_group(RADIO_render_type, "jpg");
   glui_motion->add_radiobutton_to_group(RADIO_render_type, "gif");
 
+#ifdef pp_HTML
   glui_motion->add_button_to_panel(PANEL_render_file, "Render to html", RENDER_HTML, RenderCB);
-
+#endif
   LIST_render_skip = glui_motion->add_listbox_to_panel(ROLLOUT_render, "Show:", &render_skip, RENDER_SKIP, RenderCB);
   for(i = 0; i<NRENDER_SKIPS; i++){
     LIST_render_skip->add_item(render_skips[i], crender_skips[i]);
@@ -2683,11 +2684,15 @@ void RenderCB(int var){
     case RENDER_LABEL:
     case RENDER_TYPE:
       break;
-    case RENDER_HTML: {
-      char *html_filename = CasePathHtml(&global_scase);
-      Smv2Html(html_filename, HTML_CURRENT_TIME, FROM_SMOKEVIEW);
-      FREEMEMORY(html_filename);
-    } break;
+#ifdef pp_HTML
+    case RENDER_HTML:
+      {
+        char *html_filename = CasePathHtml(&global_scase);
+        Smv2Html(html_filename, HTML_CURRENT_TIME, FROM_SMOKEVIEW);
+        FREEMEMORY(html_filename);
+      } 
+      break;
+#endif
 #ifdef pp_RENDER360_DEBUG
     case RENDER_DEBUG_360:
       if(debug_360_skip_x<2){

Source/smokeview/glui_motion.h

@@ -97,7 +97,9 @@
 #define UPPER_SCREEN_ROLLOUT  2
 
 #define RENDER_360CB 9
+#ifdef pp_HTML
 #define RENDER_HTML 15
+#endif
 
 //*** glui_motion.cpp headers
 

Source/smokeview/menus.c

@@ -2040,11 +2040,12 @@ void RenderMenu(int value){
     }
     Keyboard('R',FROM_SMOKEVIEW);
     break;
+#ifdef pp_HTML
   case RenderJSON:
   case RenderJSONALL:
     {
 
-      char *htmlobst_filename = CasePathHtmlObst(&global_scase);
+      char *htmlobst_filename      = CasePathHtmlObst(&global_scase);
       char *htmlslicenode_filename = CasePathHtmlSliceNode(&global_scase);
       char *htmlslicecell_filename = CasePathHtmlSliceCell(&global_scase);
       int json_option;
@@ -2088,6 +2089,7 @@ void RenderMenu(int value){
       FREEMEMORY(html_filename);
 
     } break;
+#endif
   case RenderCancel:
     RenderState(RENDER_OFF);
     break;
@@ -11538,11 +11540,13 @@ static int menu_count=0;
     CREATEMENU(rendermenu,RenderMenu);
     GLUTADDSUBMENU("Start rendering",  render_startmenu);
     glutAddMenuEntry("Stop rendering", RenderCancel);
+#ifdef pp_HTML
     glutAddMenuEntry("-", MENU_DUMMY);
     glutAddMenuEntry("Render html(current)", RenderHTML);
     glutAddMenuEntry("Render html(all)",     RenderHTMLALL);
     glutAddMenuEntry("Render json(current)",  RenderJSON);
     glutAddMenuEntry("Render json(all)",     RenderJSONALL);
+#endif
 
     glutAddMenuEntry("-", MENU_DUMMY);
 

Source/smokeview/options.h

@@ -13,6 +13,7 @@
 
 //#define pp_SHOW_UPDATE      // show what is being updated in the UpdateShowScene routine
 //#define pp_TERRAIN_HIDE     // hide terrain when hiding internal blockages
+//#define pp_HTML             // add option to render to html (html render not working)
 
 //*** options: windows
 

Source/smokeview/renderhtml.c

@@ -1,3 +1,4 @@
+#ifdef pp_HTML
 #include "options.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -2539,3 +2540,4 @@ int Smv2Html(char *html_file, int option, int from_where){
   printf(" - complete\n");
   return 0;
 }
+#endif

Source/smokeview/smokeheaders.h

@@ -741,13 +741,15 @@ EXTERNCPP void UpdateUseTextures(void);
 EXTERNCPP void UpdateVentOffset(void);
 EXTERNCPP void WriteIni(int flag,char *file);
 
+#ifdef pp_HTML
 //*** renderhtml.c headers
 
 EXTERNCPP int Obst2Data(char *html_file);
 EXTERNCPP int SliceNode2Data(char *html_file, int option);
 EXTERNCPP int SliceCell2Data(char *html_file, int option);
 EXTERNCPP int Smv2Html(char *html_out, int option, int from_where);
 EXTERNCPP int Smv2Geom(char *html_file);
+#endif
 
 //*** renderimage.c headers