Update from March 8, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@427 18c085ea-50e0-402c-830e-de6fd14e8384

bin/visit.c

@@ -49,6 +49,7 @@ static const char usage[] =
  */
 char *AddEnvironment(int);
 void AddPath(char *, const char *);
+int ReadKey(const char *key, char **keyval);
 
 /******************************************************************************
  *
@@ -85,15 +86,20 @@ void AddPath(char *, const char *);
  *   Brad Whitlock, Tue Nov 11 17:20:05 PST 2003
  *   I added code to launch Silex and XMLedit.
  *
+ *   Brad Whitlock, Tue Mar 8 10:28:21 PDT 2005
+ *   I added support for adding any additional arguments in the registry's
+ *   VISITARGS key to the component's command line.
+ *
  *****************************************************************************/
 
 int
 main(int argc, char *argv[])
 {
     int   nComponentArgs = 0;
-    char *componentArgs[100], *command, *printCommand, *visitpath, *cptr, *cptr2;
+    char *componentArgs[100], *command = 0, *printCommand = 0, *visitpath = 0,
+         *visitargs = 0, *cptr = 0, *cptr2 = 0;
     int i, size = 0, retval = 0, printRunInfo = 1, skipping = 0;
-    int addMovieArguments = 0, useShortFileName = 0;
+    int addMovieArguments = 0, addVISITARGS = 1, useShortFileName = 0;
 
     /*
      * Default values.
@@ -119,26 +125,32 @@ main(int argc, char *argv[])
         else if(ARG("-gui"))
         {
             strcpy(component, "gui");
+            addVISITARGS = 1;
         }
         else if(ARG("-cli"))
         {
             strcpy(component, "cli");
+            addVISITARGS = 1;
         }
         else if(ARG("-viewer"))
         {
             strcpy(component, "viewer");
+            addVISITARGS = 0;
         }
         else if(ARG("-mdserver"))
         {
             strcpy(component, "mdserver");
+            addVISITARGS = 0;
         }
         else if(ARG("-engine"))
         {
             strcpy(component, "engine");
+            addVISITARGS = 0;
         }
         else if(ARG("-vcl"))
         {
             strcpy(component, "vcl");
+            addVISITARGS = 0;
         }
         else if(ARG("-movie"))
         {
@@ -156,10 +168,12 @@ main(int argc, char *argv[])
         else if(ARG("-xmledit"))
         {
             strcpy(component, "xmledit");
+            addVISITARGS = 0;
         }
         else if(ARG("-silex"))
         {
             strcpy(component, "silex");
+            addVISITARGS = 0;
         }
         else if(ARG("-v"))
         {
@@ -177,6 +191,18 @@ main(int argc, char *argv[])
      */
     visitpath = AddEnvironment(useShortFileName);
 
+    /*
+     * Get additional VisIt arguments.
+     */
+    if(addVISITARGS)
+    {
+        if(ReadKey("VISITARGS", &visitargs) == 0)
+        {
+            addVISITARGS = 0;
+            visitargs = 0;
+        }
+    }
+
     /*
      * Figure out the length of the command string.
      */
@@ -189,12 +215,16 @@ main(int argc, char *argv[])
         size += 1 + strlen(visitpath) + 1 + strlen("makemovie.py") + 2;
         size += strlen("-nowin") + 1;
     }
+    if(addVISITARGS)
+        size += (strlen(visitargs) + 1);
 
     /*
      * Create the command to execute and the string that we print.
      */
     command = (char *)malloc(size);
+    memset(command, 0, size);
     printCommand = (char *)malloc(size);
+    memset(printCommand, 0, size);
     if(useShortFileName)
     {
         sprintf(command, "%s\\%s", visitpath, component);
@@ -221,6 +251,13 @@ main(int argc, char *argv[])
             cptr2 += (strlen(componentArgs[i]) + 1);
         }
     }
+    if(addVISITARGS)
+    {
+        sprintf(cptr, " %s", visitargs);
+        cptr += (strlen(visitargs) + 1);
+        sprintf(cptr2, " %s", visitargs);
+        cptr2 += (strlen(visitargs) + 1);
+    }
     if(addMovieArguments)
     {
         sprintf(cptr, " -s \"%s\\makemovie.py\" -nowin", visitpath);
@@ -247,6 +284,8 @@ main(int argc, char *argv[])
     for(i = 0; i < nComponentArgs; ++i)
         free(componentArgs[i]);
     free(visitpath);
+    if(visitargs != 0)
+        free(visitargs);
 
     return retval;
 }

common/plugin/PluginManager.C

@@ -1399,6 +1399,12 @@ PluginManager::PluginOpen(const string &pluginFile)
 //   Brad Whitlock, Tue Sep 14 13:27:35 PST 2004
 //   I made the debug output go to debug5.
 //
+//   Brad Whitlock, Mon Mar 7 12:23:06 PDT 2005
+//   I made the plugin version be handled a little differently on the Mac
+//   because the names that were given to the plugin versions for the Mac
+//   in all of the plugins don't have underscores in them and I don't want
+//   to change them in all of the plugins. Someday we should though.
+//
 // ****************************************************************************
 
 void *
@@ -1418,7 +1424,8 @@ PluginManager::PluginSymbol(const string &symbol, bool noError)
     // function name. Here, we use the name of the plugin file to determine the
     // name of the plugin so we can create the symbol that we're really after.
     //
-    if(symbol.substr(0,3) == "Get" || symbol == "VisItPluginVersion")
+    bool pluginVersion = (symbol == "VisItPluginVersion");
+    if(pluginVersion || symbol.substr(0,3) == "Get")
     {
         string ext(PLUGIN_EXTENSION);
         int slashPos = openPlugin.rfind("/");
@@ -1428,7 +1435,10 @@ PluginManager::PluginSymbol(const string &symbol, bool noError)
                   managerName.size() - ext.size();
         string pluginPrefix(openPlugin.substr(slashPos + 5, len));
         debug4 << "PluginSymbol: prefix: " << pluginPrefix << endl;
-        symbolName = string(pluginPrefix + "_" + symbol);
+        if(pluginVersion)
+            symbolName = string(pluginPrefix + symbol);
+        else
+            symbolName = string(pluginPrefix + "_" + symbol);
         debug4 << "PluginSymbol: sym: " << symbolName << endl;
     }
     

common/utility/Utility.C

@@ -865,7 +865,7 @@ WriteKeyToRoot(HKEY which_root, const char *ver, const char *key,
 
     /* Try and read the key from the system registry. */
     sprintf(regkey, "VISIT%s", ver);
-    if(RegOpenKeyEx(which_root, regkey, 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
+    if(RegOpenKeyEx(which_root, regkey, 0, KEY_SET_VALUE, &hkey) == ERROR_SUCCESS)
     {
         DWORD strSize = strlen(keyval);
         if(RegSetValueEx(hkey, key, NULL, REG_SZ,
@@ -971,6 +971,9 @@ ConfigStateGetRunCount(ConfigStateEnum &code)
 //   Brad Whitlock, Wed Mar 2 11:58:53 PDT 2005
 //   Changed interface to WriteKey.
 //
+//   Brad Whitlock, Mon Mar 7 11:31:35 PDT 2005
+//   Changed the Win32 logic.
+//
 // ****************************************************************************
 
 void
@@ -979,12 +982,16 @@ ConfigStateIncrementRunCount(ConfigStateEnum &code)
 #if defined(_WIN32)
     bool firstTime = false;
     ConfigStateEnum code2;
-    int nStartups = firstTime ? 1 : ConfigStateGetRunCount(code2);
+    int nStartups = ConfigStateGetRunCount(code2);
     if(code2 == CONFIGSTATE_IOERROR)
     {
         firstTime = true;
         nStartups = 0;
     }
+    else if(code2 == CONFIGSTATE_SUCCESS)
+    {
+        firstTime == (nStartups == 0);
+    }
 
     char keyval[100];
     SNPRINTF(keyval, 100, "%d", nStartups+1);
@@ -1121,7 +1128,9 @@ ExpandUserPath(const std::string &path)
 // Creation:   Wed Mar 2 12:08:57 PDT 2005
 //
 // Modifications:
-//   
+//   Brad Whitlock, Mon Mar 7 14:23:59 PST 2005
+//   I fixed a bug that made it return the wrong part of the string.
+//
 // ****************************************************************************
 
 std::string
@@ -1154,7 +1163,7 @@ GetVisItInstallationDirectory(const char *version)
         std::string home(idir);
         int lastSlash = home.rfind("/");
         if(lastSlash != -1)
-            installDir = home.substr(lastSlash);
+            installDir = home.substr(0, lastSlash);
         else
             installDir = idir;
     }

config-site/berg01.llnl.gov.conf

@@ -61,8 +61,10 @@ PTHREAD_CXXFLAGS="-pthread"
 ##
 ## We only get 256MB of memory by default, thus the maxdata flag
 ## We can only use 2GB/node without large pages (-blpdata)
+## Temporarily disable large pages because of AIX bug.
 ##
-LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+##LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+LDFLAGS="-Wl,-bmaxdata:0x70000000 $LDFLAGS"
 
 ##
 ## Make sure we use the right MPI library (05/04/01 JSM)

config-site/ice01.asci.llnl.gov.conf

@@ -61,8 +61,10 @@ PTHREAD_CXXFLAGS="-pthread"
 ##
 ## We only get 256MB of memory by default, thus the maxdata flag
 ## We can only use 2GB/node without large pages (-blpdata)
+## Temporarily disable large pages because of AIX bug.
 ##
-LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+## LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+LDFLAGS="-Wl,-bmaxdata:0x70000000 $LDFLAGS"
 
 ##
 ## Make sure we use the right MPI library (05/04/01 JSM)

config-site/pacific.llnl.gov.conf

@@ -61,8 +61,10 @@ PTHREAD_CXXFLAGS="-pthread"
 ##
 ## We only get 256MB of memory by default, thus the maxdata flag
 ## We can only use 2GB/node without large pages (-blpdata)
+## Temporarily disable large pages because of AIX bug.
 ##
-LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+##LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+LDFLAGS="-Wl,-bmaxdata:0x70000000 $LDFLAGS"
 
 ##
 ## Make sure we use the right MPI library (05/04/01 JSM)

config-site/white128.asci.llnl.gov.conf

@@ -61,8 +61,10 @@ PTHREAD_CXXFLAGS="-pthread"
 ##
 ## We only get 256MB of memory by default, thus the maxdata flag
 ## We can only use 2GB/node without large pages (-blpdata)
+## Temporarily disable large pages because of AIX bug.
 ##
-LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+## LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+LDFLAGS="-Wl,-bmaxdata:0x70000000 $LDFLAGS"
 
 ##
 ## Make sure we use the right MPI library (05/04/01 JSM)

config-site/white129.asci.llnl.gov.conf

@@ -61,8 +61,10 @@ PTHREAD_CXXFLAGS="-pthread"
 ##
 ## We only get 256MB of memory by default, thus the maxdata flag
 ## We can only use 2GB/node without large pages (-blpdata)
+## Temporarily disable large pages because of AIX bug.
 ##
-LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+## LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+LDFLAGS="-Wl,-bmaxdata:0x70000000 $LDFLAGS"
 
 ##
 ## Make sure we use the right MPI library (05/04/01 JSM)

config-site/white269.asci.llnl.gov.conf

@@ -61,8 +61,10 @@ PTHREAD_CXXFLAGS="-pthread"
 ##
 ## We only get 256MB of memory by default, thus the maxdata flag
 ## We can only use 2GB/node without large pages (-blpdata)
+## Temporarily disable large pages because of AIX bug.
 ##
-LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+## LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+LDFLAGS="-Wl,-bmaxdata:0x70000000 $LDFLAGS"
 
 ##
 ## Make sure we use the right MPI library (05/04/01 JSM)

config-site/white432.asci.llnl.gov.conf

@@ -61,8 +61,10 @@ PTHREAD_CXXFLAGS="-pthread"
 ##
 ## We only get 256MB of memory by default, thus the maxdata flag
 ## We can only use 2GB/node without large pages (-blpdata)
+## Temporarily disable large pages because of AIX bug.
 ##
-LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+## LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
+LDFLAGS="-Wl,-bmaxdata:0x70000000 $LDFLAGS"
 
 ##
 ## Make sure we use the right MPI library (05/04/01 JSM)

gui/QvisVisItUpdate.C

@@ -467,7 +467,7 @@ QvisVisItUpdate::startUpdate()
             SLOT(ftp_commandStarted()) );
         connect( ftp, SIGNAL(CommandFinished()),
             SLOT(ftp_commandFinished()) );
-        connect( ftp, SIGNAL(Done()),
+        connect( ftp, SIGNAL(Done(bool)),
             SLOT(ftp_done(bool)) );
         connect( ftp, SIGNAL(StateChanged(int)),
             SLOT(ftp_stateChanged(int)) );
@@ -893,7 +893,10 @@ QvisVisItUpdate::ftp_stateChanged(int state)
 // Creation:   Tue Feb 15 12:43:43 PDT 2005
 //
 // Modifications:
-//   
+//   Brad Whitlock, Mon Mar 7 14:48:50 PST 2005
+//   I fixed some bad logic that prevented it from determining the correct
+//   new version.
+//
 // ****************************************************************************
 
 void
@@ -954,6 +957,8 @@ QvisVisItUpdate::ftp_listInfo(const QUrlInfo &item)
                         latestVersion = version;
                         break;
                     }
+                    else if(fv != vv)
+                        break;
                 }
                 else
                     break;

java/AnnotationObject.java

@@ -11,7 +11,7 @@ import java.util.Vector;
 // Notes:      Autogenerated by xml2java.
 //
 // Programmer: xml2java
-// Creation:   Thu Jan 13 08:11:07 PDT 2005
+// Creation:   Mon Mar 7 13:41:47 PST 2005
 //
 // Modifications:
 //   
@@ -35,7 +35,7 @@ public class AnnotationObject extends AttributeSubject
 
     public AnnotationObject()
     {
-        super(17);
+        super(16);
 
         objectType = ANNOTATIONTYPE_TEXT2D;
         visible = false;
@@ -59,12 +59,11 @@ public class AnnotationObject extends AttributeSubject
         fontShadow = false;
         floatAttribute1 = 0f;
         intAttribute1 = 0;
-        timeFormat = new String("%g");
     }
 
     public AnnotationObject(AnnotationObject obj)
     {
-        super(17);
+        super(16);
 
         int i;
 
@@ -95,7 +94,6 @@ public class AnnotationObject extends AttributeSubject
         fontShadow = obj.fontShadow;
         floatAttribute1 = obj.floatAttribute1;
         intAttribute1 = obj.intAttribute1;
-        timeFormat = new String(obj.timeFormat);
 
         SelectAll();
     }
@@ -130,8 +128,7 @@ public class AnnotationObject extends AttributeSubject
                 (fontItalic == obj.fontItalic) &&
                 (fontShadow == obj.fontShadow) &&
                 (floatAttribute1 == obj.floatAttribute1) &&
-                (intAttribute1 == obj.intAttribute1) &&
-                (timeFormat == obj.timeFormat));
+                (intAttribute1 == obj.intAttribute1));
     }
 
     // Property setting methods
@@ -251,12 +248,6 @@ public class AnnotationObject extends AttributeSubject
         Select(15);
     }
 
-    public void SetTimeFormat(String timeFormat_)
-    {
-        timeFormat = timeFormat_;
-        Select(16);
-    }
-
     // Property getting methods
     public int            GetObjectType() { return objectType; }
     public boolean        GetVisible() { return visible; }
@@ -274,7 +265,6 @@ public class AnnotationObject extends AttributeSubject
     public boolean        GetFontShadow() { return fontShadow; }
     public float          GetFloatAttribute1() { return floatAttribute1; }
     public int            GetIntAttribute1() { return intAttribute1; }
-    public String         GetTimeFormat() { return timeFormat; }
 
     // Write and read methods.
     public void WriteAtts(CommunicationBuffer buf)
@@ -311,8 +301,6 @@ public class AnnotationObject extends AttributeSubject
             buf.WriteFloat(floatAttribute1);
         if(WriteSelect(15, buf))
             buf.WriteInt(intAttribute1);
-        if(WriteSelect(16, buf))
-            buf.WriteString(timeFormat);
     }
 
     public void ReadAtts(int n, CommunicationBuffer buf)
@@ -373,9 +361,6 @@ public class AnnotationObject extends AttributeSubject
             case 15:
                 SetIntAttribute1(buf.ReadInt());
                 break;
-            case 16:
-                SetTimeFormat(buf.ReadString());
-                break;
             }
         }
     }
@@ -398,6 +383,5 @@ public class AnnotationObject extends AttributeSubject
     private boolean        fontShadow;
     private float          floatAttribute1;
     private int            intAttribute1;
-    private String         timeFormat;
 }
 

tools/xml/GenerateMakefile.h

@@ -122,7 +122,8 @@
 //
 //    Brad Whitlock, Thu Mar 3 09:00:24 PDT 2005
 //    I removed WriteVersionFile since the version is now included in the
-//    common plugin info.
+//    common plugin info. I also added the Slice operator to the OnionPeel
+//    hack code for MacOS X.
 //
 // ****************************************************************************
 
@@ -361,7 +362,7 @@ class MakefileGeneratorPlugin
             //                   library, we have to link all of the viewer
             //                   dependencies and most operators don't do need to.
             //
-            bool usesViewerLib = (name == "OnionPeel");
+            bool usesViewerLib = (name == "OnionPeel" || name == "Slice");
             if (usesViewerLib)
             {
                out << "-lviewer -lviewerrpc -lproxybase -lvclproxy -lvclrpc "

windowsbuild/installation/ClickInstall.ini

+; Ini file generated by the HM NIS Edit IO designer.
+[Settings]
+NumFields=1
+Title=Install VisIt now
+
+[Field 1]
+Type=Label
+Text=Click the Install button to install VisIt.
+Left=9
+Right=232
+Top=6
+Bottom=31
+

windowsbuild/installation/DefaultDatabasePlugin.ini

+; Ini file generated by the HM NIS Edit IO designer.
+[Settings]
+NumFields=2
+Title=Select default database reader plugin
+
+[Field 1]
+Type=Listbox
+Text=Default database reader plugin
+State=Silo
+ListItems=Silo|PDB|ANALYZE|BOV|Cosmos|CosmosPP|Curve2D|Dune|EnSight|KullLite|OVERFLOW|Pixie|Plot2D|Plot3D|Point3D|SAMRAI|SAR|Spheral|STL|Tetrad|TFT|VTK|WavefrontOBJ
+Left=9
+Right=263
+Top=24
+Bottom=137
+
+[Field 2]
+Type=Label
+Text=Select the database reader plugin that VisIt will try first when opening a database.
+Left=9
+Right=299
+Top=6
+Bottom=22
+

windowsbuild/installation/WantDatabasePlugin.ini

+; Ini file generated by the HM NIS Edit IO designer.
+[Settings]
+NumFields=4
+Title=Select default database reader plugin
+
+[Field 1]
+Type=RadioButton
+Text=No
+State=1
+Left=32
+Right=59
+Top=65
+Bottom=75
+
+[Field 2]
+Type=RadioButton
+Text=Yes
+Left=62
+Right=242
+Top=65
+Bottom=75
+
+[Field 3]
+Type=Label
+Text=Would you like to select a default database reader plugin?
+Left=9
+Right=197
+Top=49
+Bottom=64
+
+[Field 4]
+Type=Label
+Text=A default database reader plugin is the first plugin that VisIt will use when trying to open a database. In most cases, it is not necessary to specify a default database reader plugin but it can help VisIt pick the right database reader plugin when there are multiple database reader plugins that are associated with a given file extension.
+Left=9
+Right=299
+Top=6
+Bottom=38
+

windowsbuild/installation/binaryinstallation-MSVC7.Net.nsi

@@ -21,7 +21,8 @@
 #  Updated for 1.4.1.
 #
 #  Brad Whitlock, Thu Feb 24 16:09:30 PST 2005
-#  Updated for 1.4.2.
+#  Updated for 1.4.2. I also added more configuration screens that allow
+#  the user to pick a default database format.
 #
 ##############################################################################
 
@@ -50,6 +51,10 @@ SetCompressor bzip2
 #!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
 
 ReserveFile "NetworkConfig.ini"
+ReserveFile "WantDatabasePlugin.ini"
+ReserveFile "DefaultDatabasePlugin.ini"
+ReserveFile "ClickInstall.ini"
+
 ; Reserve files
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
 
@@ -61,6 +66,8 @@ ReserveFile "NetworkConfig.ini"
 !insertmacro MUI_PAGE_DIRECTORY
 ; Custom
 page custom ChooseNetworkConfig
+page custom WantDefaultDatabasePlugin
+page custom ChooseDefaultDatabasePlugin
 
 ; Instfiles page
 !insertmacro MUI_PAGE_INSTFILES
@@ -85,17 +92,80 @@ ShowInstDetails show
 ShowUnInstDetails show
 
 Var CreatedPythonLinks
+Var DefaultDatabase
+Var SelectingDefaultDatabase
+
+###############################################################################
+#
+# Functions
+#
+###############################################################################
 
 Function .onInit
   ;Extract InstallOptions INI files
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NetworkConfig.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "WantDatabasePlugin.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "DefaultDatabasePlugin.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ClickInstall.ini"
+  Strcpy $SelectingDefaultDatabase "no"
+  Strcpy $DefaultDatabase ""
 FunctionEnd
 
+#
+# This function is called when we show the Network configuration screen.
+#
 Function ChooseNetworkConfig
-#  !insertmacro MUI_HEADER_TEXT "Choose Network Configuration"
+  !insertmacro MUI_HEADER_TEXT "Network configuration" "Select the desired network configuration."
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NetworkConfig.ini"
 FunctionEnd
 
+#
+# This function is called when we show the WantDatabasePlugin screen. We read whether
+# the user chose yes or no and use that to set a variable that we use to determine the
+# look of the next page.
+#
+Function WantDefaultDatabasePlugin
+  !insertmacro MUI_HEADER_TEXT "Select default database reader plugin" "Do you want to select a default database reader plugin?"
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "WantDatabasePlugin.ini"
+
+  # Get whether or not the user selected a default file format.
+  !insertmacro MUI_INSTALLOPTIONS_READ $0 "WantDatabasePlugin.ini" "Field 1" "State"
+  # If $0=="1" then we're going to have a networkconfig
+  Strcmp $0 "1" NoDefaultDatabase PickedDefaultDatabase
+PickedDefaultDatabase:
+    # We got here because we picked a default database. Enable the database plugin combobox.
+    Strcpy $SelectingDefaultDatabase "yes"
+    Goto EndWantDefaultDatabasePlugin
+NoDefaultDatabase:
+    # We got here because we picked no default database.
+    Strcpy $SelectingDefaultDatabase "no"
+EndWantDefaultDatabasePlugin:
+FunctionEnd
+
+#
+# This function is called when we want to actually choose a database reader plugin. If the
+# user chose not to set up a database reader plugin then we show the "Click install"
+# screen instead.
+#
+Function ChooseDefaultDatabasePlugin
+  Strcmp $SelectingDefaultDatabase "yes" YesPickDatabase NoPickDatabase
+YesPickDatabase:
+  !insertmacro MUI_HEADER_TEXT "Select default database reader plugin" "Select the database reader plugin that VisIt will try first when opening a database."
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "DefaultDatabasePlugin.ini"
+  !insertmacro MUI_INSTALLOPTIONS_READ $0 "DefaultDatabasePlugin.ini" "Field 1" "State"
+   Strcpy $DefaultDatabase "-default_format $0"