Merge pull request #2393 from gforney/master

update some smokeview ug figures, minor edits to some dialog box headings

Author: gforney

Manuals/SMV_User_Guide/SMV_User_Guide.tex

@@ -879,7 +879,7 @@ \subsection{Motion Dialog Box}
 \begin{figure}[bph]
 \centerline{
 \begin{tabular}{cc}
-\includegraphics[width=2.62in]{\SMVfigdir/figMOTION}
+\includegraphics[width=2.25in]{\SMVfigdir/figMOTION}
 \end{tabular}
 }
 \caption
@@ -1599,10 +1599,10 @@ \section{HVAC Networks}
 
 \begin{figure}[bph]
 \begin{center}
-\begin{tabular}{cc}
-\includegraphics[width=3.5in]{SCRIPT_FIGURES/hvac_comp_00}&
-\includegraphics[width=3.5in]{SCRIPT_FIGURES/hvac_comp_50}\\
-0.0~s&5.0~s
+\begin{tabular}{c}
+\includegraphics[width=4.5in]{SCRIPT_FIGURES/hvac_comp_00}\\
+\includegraphics[width=4.5in]{SCRIPT_FIGURES/hvac_comp_50}\\
+0.0~s\\5.0~s
 \end{tabular}
 \end{center}
 \caption
@@ -2086,7 +2086,7 @@ \section{Data Bounds}
 
 \begin{figure}[bph]
 \centerline{
-\includegraphics[width=6.65in]{\SMVfigdir/figBOUNDset}}
+\includegraphics[width=5.25in]{\SMVfigdir/figBOUNDset}}
 \caption
 [Dialog box for setting Slice file data bounds]
 {Dialog box for setting Slice file data bounds.
@@ -2189,7 +2189,7 @@ \section{Data Bounds}
 %---------------------------------------------------------------------------------
 \section{3D Smoke Options}
 \begin{figure}[bph]
-\centerline{\includegraphics[width=3.75in]{\SMVfigdir/fig3DSmokeSliceSettings}
+\centerline{\includegraphics[width=4.0in]{\SMVfigdir/fig3DSmokeSliceSettings}
 }\
 \caption
 [Dialog box for setting slice rendered 3D smoke settings]
@@ -2198,7 +2198,7 @@ \section{3D Smoke Options}
 \end{figure}
 
 \begin{figure}[bph]
-\centerline{\includegraphics[width=3.75in]{\SMVfigdir/fig3DSmokeSliceColor}
+\centerline{\includegraphics[width=4.0in]{\SMVfigdir/fig3DSmokeSliceColor}
 }\
 \caption
 [Dialog box for setting slice rendered 3D smoke options - color]
@@ -3568,7 +3568,7 @@ \section{Creating a Script}
 
 \begin{figure}[bph]
 \centerline{
-\includegraphics[width=3.5069444in]{\SMVfigdir/figSCRIPT}
+\includegraphics[width=4.5in]{\SMVfigdir/figSCRIPT}
 }\
 \caption
 [Script dialog box]
@@ -5284,13 +5284,13 @@ \chapter{Making Movies}\ \label{section:movie}\ A movie may be made of a Smokevi
 \begin{figure}[bph]
 \begin{center}
 \begin{tabular}{cc}
-\includegraphics[width=2.3194444in]{\SMVfigdir/figRENDER}&
-\includegraphics[width=2.3194444in]{\SMVfigdir/figMOVIE}
+\includegraphics[width=3.0in]{\SMVfigdir/figRENDER}&
+\includegraphics[width=3.0in]{\SMVfigdir/figMOVIE}
 \end{tabular}
 \end{center}
 \caption
-[Render and Movie dialog box]
-{Render and Movie dialog box. These dialog boxes allow one to specify
+[Render scene and Make Movie dialog boxes]
+{Render scene and Make Movie dialog boxes. These dialog boxes allow one to specify
 options for rendering an image sequence of the displayed scene and to combine these images into a movie.  The Movie dialog box is available if the program ffmpeg is installed.}
 \label{figRENDER}
 \end{figure}

Manuals/SMV_User_Guide/smokezip.tex

@@ -4,12 +4,10 @@
 \begin{figure}[bph]
 \centerline{\includegraphics[width=2.28in]{\SMVfigdir/figBOUNDcompress}\ }
 \caption
-[Compress Files and Autoload dialog box]
+[Compress Files dialog box]
 {File/Bounds dialog
-box showing compression and autoload options.  3D smoke,  boundary and slice
-files may be compressed using Smokezip.  All currently loaded
-files may be loaded automatically when Smokeview first starts by
-selecting the autoload checkbox.}\ \label{figBOUNDScompress}
+box showing compression options.  3D smoke,  boundary and slice
+files may be compressed using Smokezip.}\ \label{figBOUNDScompress}
 \end{figure}
 
 3D smoke, boundary, isosurface and slice files may be compressed

Source/smokeview/glui_objects.cpp

@@ -2023,13 +2023,13 @@ extern "C" void GLUIDeviceSetup(int main_window){
     glui_device->close();
     glui_device=NULL;
   }
-  glui_device = GLUI_Master.create_glui("Devices/Objects/2D plots",0,dialogX0,dialogY0);
+  glui_device = GLUI_Master.create_glui("Devices/Objects",0,dialogX0,dialogY0);
   glui_device->hide();
 
   if(global_scase.devicecoll.ndeviceinfo>0){
     int i;
 
-    PANEL_objects = glui_device->add_panel("Devices/Objects/2D plots", false);
+    PANEL_objects = glui_device->add_panel("Devices/Objects", false);
 
     ROLLOUT_smvobjects = glui_device->add_rollout_to_panel(PANEL_objects, _("Objects"), false, OBJECTS_ROLLOUT, Device_Rollout_CB);
     TOGGLE_ROLLOUT(deviceprocinfo, ndeviceprocinfo, ROLLOUT_smvobjects, OBJECTS_ROLLOUT, glui_device);
@@ -2082,7 +2082,7 @@ extern "C" void GLUIDeviceSetup(int main_window){
         CHECKBOX_vis_ztree = glui_device->add_checkbox_to_panel(ROLLOUT_trees, _A(_("Show"), " z"), &vis_ztree);
       }
 
-      ROLLOUT_windrose = glui_device->add_rollout_to_panel(PANEL_objects, "Windrose", false, WINDROSE_ROLLOUT, Device_Rollout_CB);
+      ROLLOUT_windrose = glui_device->add_rollout_to_panel(PANEL_objects, "Wind rose", false, WINDROSE_ROLLOUT, Device_Rollout_CB);
       TOGGLE_ROLLOUT(deviceprocinfo, ndeviceprocinfo, ROLLOUT_windrose, WINDROSE_ROLLOUT, glui_device);
 
       glui_device->add_checkbox_to_panel(ROLLOUT_windrose, _("show"), &viswindrose, DEVICE_WINDROSE_UPDATE, GLUIDeviceCB);