Changeset 938

Timestamp:

May 14, 2020 4:33:07 PM (2 years ago)

Author:

ilavsky

Message:

Igor 9 related changes

Location:

trunk/User Procedures

Files:

• CanSAS/HDF5gateway.ipf (modified) (3 diffs)
• CanSAS/IRNI_NexusSupport.ipf (modified) (1 diff)
• Indra 2/IN2_GeneralProcedures.ipf (modified) (4 diffs)
• Indra 2/IN2_Load Indra 2.ipf (modified) (1 diff)
• Indra 2/IN2_USAXS.ipf (modified) (1 diff)
• Indra 2/IN3_Calculations.ipf (modified) (3 diffs)
• Indra 2/IN3_FlyScan.ipf (modified) (2 diffs)
• Irena/IR1_ImportData.ipf (modified) (2 diffs)
• Irena/IR1_Main.ipf (modified) (1 diff)
• Irena/IR2_DataMiner.ipf (modified) (5 diffs)
• Irena/IR3_SimpleFits.ipf (modified) (18 diffs)
• Nika/NI1_HDF5Browser.ipf (modified) (7 diffs)
• Nika/NI1_Main.ipf (modified) (1 diff)

trunk/User Procedures/CanSAS/HDF5gateway.ipf

@@ -2 +2 @@
 #pragma version=1.01
 
+#if(IgorVersion()<9)    //no need to include, Igor 9 has this by default.  
 #include <HDF5 Browser>
-
+#endif
 
 //1.01 rmoeved KillWaves/Z which took surprisngly long time. Not needed. 
@@ -939 +940 @@
         endif
 
+        Variable err
         if ( 0 )
                 STRUCT HDF5DataInfo di  // Defined in HDF5 Browser.ipf.
                 InitHDF5DataInfo(di)    // Initialize structure.
+#if(IgorVersion()<9)
                 HDF5AttributeInfo(fileID, "/", 1, "file_name", 0, di)
+#else
+                err = HDF5AttributeInfo(fileID, "/", 1, "file_name", 0, di)
+#endif          
                 Print di
         endif
@@ -949 +955 @@
         String/G file_path = S_path
         String/G file_name = fileName
+
         return fileID
 End

trunk/User Procedures/CanSAS/IRNI_NexusSupport.ipf

@@ -582 +582 @@
                 endif
         endfor
-        //HDf5Browser#LoadGroupButtonProc("LoadGroup")
-        
-        //HDf5Browser#CloseFileButtonProc("CloseFIle")
-        
-        //KillWindow $(browserName)
+
 end
 

trunk/User Procedures/Indra 2/IN2_GeneralProcedures.ipf

@@ -1 +1 @@
 IN2G_FindNu#pragma rtGlobals=2          // Use modern global access method.
-#pragma version = 2.22
+#pragma version = 2.23
 #pragma IgorVersion = 7.05
 
@@ -35 +35 @@
 //*************************************************************************/
 //
+//2.23 add IN2G_AddButtonsToBrowser(), which calls IN2G_ExtractInfoFromFldrname(). Use: adds button (via hooks functions) tgo DataBrowser and that will extract info from SampleName strings we are using. 
 //2.22 minor fix to IN2G_ColorTopGrphRainbow
                 //added         IN2G_RemoveDataFromGraph(topGraphStr = "IRB1_ATSASInterfacePanel#DataDisplay")
@@ -507 +508 @@
 End
 
+//Does not seem we can modify DataBrowser right clcik menu... 
+//Menu "DataBrowser"
+//              "Samplenames-to-Values", IN2G_ExtractInfoFromFldrname()
+//end
+
+//here is add to Browser button, it will be in after compile hooks. 
+Function IN2G_AddButtonsToBrowser()
+
+        ModifyBrowser appendUserButton={'SampleName-to-Values',"IN2G_ExtractInfoFromFldrname()"}
+
+end
+//************************************************************************************************
+//************************************************************************************************
+
 Function IN2G_SaveTopGraphJpg()
                 string topWindow=WinName(0,1)
@@ -514 +529 @@
                 string topWindow=WinName(0,1)
                 SaveGraphCopy /I /W=$(topWindow)                                                //this is pxp
+end
+
+
+//************************************************************************************************
+//************************************************************************************************
+
+Function IN2G_ExtractInfoFromFldrname()
+
+        string SelectedWaveNm=GetBrowserSelection (0, 1)
+        if(strlen(SelectedWaveNm)<=3)           //path must contain at least "root:"
+                        return 0
+        endif
+                //check for wave type, need string wave with foldernames...
+        if(WaveType($(SelectedWaveNm),1)!=2)            //not text wave, bail out...
+                        return 0
+        endif
+        Wave/T SampleName = $(SelectedWaveNm)
+        if(WaveDims(SampleName)!=1)                     //thsi is not 1D array of somethign, which should be names. 
+                return 0
+        endif
+        variable i, imax=numpnts(SampleName)
+        
+        DFref oldDf=GetDataFolderDFR()
+        setDataFolder GetWavesDataFolderDFR(SampleName)
+        make/O/N=(imax) TimeWave, TemperatureWave, PercentWave, OrderWave
+        String DataFolderName
+        For(i=0;i<imax;i+=1)
+                DataFolderName = SampleName[i]
+                TimeWave[i]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[i]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[i]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[i]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
+        endfor
+        //clean up and leave only thoser who contain some numbers in tehm. 
+        string ReportExisting=""
+        if(sum(TimeWave)<=0 || numtype(sum(TimeWave))!=0)
+                KillWaves  TimeWave
+        else
+                ReportExisting+= " TimeWave;"
+        endif
+        if(sum(TemperatureWave)<=0 || numtype(sum(TemperatureWave))!=0)
+                KillWaves  TemperatureWave
+        else
+                ReportExisting+= " TemperatureWave;"
+        endif
+        if(sum(PercentWave)<=0|| numtype(sum(PercentWave))!=0)
+                KillWaves  PercentWave
+        else
+                ReportExisting+= " PercentWave;"
+        endif
+        if(sum(OrderWave)<=0|| numtype(sum(OrderWave))!=0)
+                KillWaves  OrderWave
+        else
+                ReportExisting+= " OrderWave;"
+        endif
+        print "Processed wave :"+SelectedWaveNm
+        print "Extracted following data from names :"+ReportExisting
+        
+        setDataFolder oldDf
+end
+
+//**********************************************************************************************************
+
+
+Function IN2G_IdentifyNameComponent(NameStr, whichComp)
+                string NameStr, whichComp               //"_xyzC",  _xyzmin, _xyzpct, _xyz
+                
+                string NameStrLoc=StringFromList(ItemsInList(NameStr, ":")-1, NameStr, ":"  )
+                string result="", tmpStr
+                variable i
+                if(StringMatch(whichComp, "_xyz"))
+                        FOr(i=ItemsInList(NameStrLoc, "_")-1;i>=0;i-=1)
+                                tmpStr = StringFromList(i, NameStrLoc, "_")
+                                if(GrepString(tmpStr, "^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$"))
+                                        return str2num(tmpStr)
+                                endif
+                        endfor
+                endif
+                FOr(i=0;i<ItemsInList(NameStrLoc, "_");i+=1)
+                        tmpStr = StringFromList(i, NameStrLoc, "_")
+                        strswitch(whichComp)                                    // string switch
+                                case "_xyzC":                                           // execute if case matches expression
+                                        if(GrepString(tmpStr, "^[-+]?[0-9]*\.?[0-9]+C$" ))
+                                                return str2num(tmpStr)
+                                        endif
+                                        break                                                   // exit from switch
+                                case "_xyzmin": // execute if case matches expression
+                                        if(GrepString(tmpStr, "^[-+]?[0-9]*\.?[0-9]+min$" ))
+                                                return str2num(tmpStr)
+                                        endif
+                                        break
+                                case "_xyzpct": // execute if case matches expression
+                                        if(GrepString(tmpStr, "^[-+]?[0-9]*\.?[0-9]+pct$" ))
+                                                return str2num(tmpStr)
+                                        endif
+                                        break
+                        endswitch               
+                endfor
+        return Nan
 end
 

trunk/User Procedures/Indra 2/IN2_Load Indra 2.ipf

@@ -62 +62 @@
 #include "::CanSAS:IRNI_NexusSupport", version>=1.14
 
+#if(IgorVersion()<9)    //no need to include, Igor 9 has this by default.  
 #include <HDF5 Browser>
+#endif
 
+

trunk/User Procedures/Indra 2/IN2_USAXS.ipf

@@ -182 +182 @@
         IN2G_CheckPlatformGUIFonts()
         IN2G_ResetSizesForALlPanels(WindowProcNames)
+        IN2G_AddButtonsToBrowser()              //adds button to DataBrowser. 
+
         //and print in history which version of codeis being used for future reference.
         string file= StringFromList((ItemsInList(FunctionPath("LoadUSAXSMacros"), ":")-1), FunctionPath("LoadUSAXSMacros"), ":")

trunk/User Procedures/Indra 2/IN3_Calculations.ipf

@@ -2785 +2785 @@
         
         Silent 1        
+        //Duplicate FitIntensity, root:FitIntensityOrig, root:DSMErrorsOrig
+        //Duplicate Qvector, root:QvectorOrig
+        
         
         DsmErrors=FitIntensity*(SmErrors/SmIntensity)                                           //error proportional to input data
@@ -2790 +2793 @@
         variable i=1, imax=numpnts(FitIntensity)
         Redimension/N=(numpnts(FitIntensity)) DsmErrors
+        Variable start = StopMSTimer(-2)
         Do
                 if( (numtype(FitIntensity[i-1])==0) && (numtype(FitIntensity[i])==0) && (numtype(FitIntensity[i+1])==0) )
@@ -2797 +2801 @@
         i+=1
         while (i<imax-1)
-
+        Variable theend = StopMSTimer(-2)
+        print "IN3_GetErrors took : "+num2str((theend-start)/100)
         DsmErrors[0]=DsmErrors[1]                                                                       //some error needed for 1st point
         DsmErrors[imax-1]=DsmErrors[imax-2]                                                             //and error for last point      
 
         Smooth /E=2 3, DsmErrors
-        
+        //abort
 end
 

trunk/User Procedures/Indra 2/IN3_FlyScan.ipf

@@ -305 +305 @@
                 endif
         endif
-        
+
         variable i
         string FileName
@@ -324 +324 @@
                 endif
         endfor
-        //HDf5Browser#LoadGroupButtonProc("LoadGroup")
-        
-        //HDf5Browser#CloseFileButtonProc("CloseFIle")
-        
-        //KillWindow $(browserName)
 end
 

trunk/User Procedures/Irena/IR1_ImportData.ipf

@@ -2 +2 @@
 //#pragma rtGlobals=2           // Use modern global access method.
 #pragma version=2.40
+
+#if(IgorVersion()<9)    //no need to include, Igor 9 has this by default.  
 #include <HDF5 Browser>
+#endif
+
+
 Constant IR1IversionNumber = 2.37
 Constant IR1IversionNumber2 = 2.36
@@ -3181 +3186 @@
                 endif
         endfor
-        //HDf5Browser#LoadGroupButtonProc("LoadGroup")
-        
-        //HDf5Browser#CloseFileButtonProc("CloseFIle")
-        
-        //KillWindow $(browserName)
 end
 

trunk/User Procedures/Irena/IR1_Main.ipf

@@ -333 +333 @@
         IN2G_CheckForGraphicsSetting(0)
         IN2G_ResetSizesForALlPanels(WindowProcNames) 
+        IN2G_AddButtonsToBrowser()              //adds button to DataBrowser. 
 
         //and print in history which version of codeis being used for future reference.

trunk/User Procedures/Irena/IR2_DataMiner.ipf

@@ -697 +697 @@
                                 Wave TmpWv=TemperatureWv
                                 Redimension/N=(NumberOfExtractedItems+1) TmpWv
-                                TmpWv[NumberOfExtractedItems] = IR3B_IdentifyNameComponent(DataFolderName, "_xyzC")
+                                TmpWv[NumberOfExtractedItems] = IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
                 elseif(StringMatch(KeyString, "Extract_xyzmin"))                //_xyzC, _xyzmin, _xyzpct, _xyz
                                 Wave/Z TmpWv=TimeWv
@@ -705 +705 @@
                                 Wave TmpWv=TimeWv
                                 Redimension/N=(NumberOfExtractedItems+1) TmpWv
-                                TmpWv[NumberOfExtractedItems] = IR3B_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                                TmpWv[NumberOfExtractedItems] = IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
                 elseif(StringMatch(KeyString, "Extract_xyz"))           //_xyzC, _xyzmin, _xyzpct, _xyz
                                 Wave/Z TmpWv=OrderWv
@@ -713 +713 @@
                                 Wave TmpWv=OrderWv
                                 Redimension/N=(NumberOfExtractedItems+1) OrderWv
-                                TmpWv[NumberOfExtractedItems] = IR3B_IdentifyNameComponent(DataFolderName, "_xyz")
+                                TmpWv[NumberOfExtractedItems] = IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
                 elseif(StringMatch(KeyString, "Extract_xyzpct"))                //_xyzC, _xyzmin, _xyzpct, _xyz
                                 Wave/Z TmpWv=PercentWv
@@ -721 +721 @@
                                 Wave TmpWv=PercentWv
                                 Redimension/N=(NumberOfExtractedItems+1) PercentWv
-                                TmpWv[NumberOfExtractedItems] = IR3B_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                                TmpWv[NumberOfExtractedItems] = IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
                 //done with special name based waves... 
                 else            ///all others. 
@@ -764 +764 @@
 end
 //**********************************************************************************************************
-//**********************************************************************************************************
-
-
-static Function IR3B_IdentifyNameComponent(NameStr, whichComp)
-                string NameStr, whichComp               //"_xyzC",  _xyzmin, _xyzpct, _xyz
-                
-                string NameStrLoc=StringFromList(ItemsInList(NameStr, ":")-1, NameStr, ":"  )
-                string result="", tmpStr
-                variable i
-                if(StringMatch(whichComp, "_xyz"))
-                        FOr(i=ItemsInList(NameStrLoc, "_")-1;i>=0;i-=1)
-                                tmpStr = StringFromList(i, NameStrLoc, "_")
-                                if(GrepString(tmpStr, "^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$"))
-                                        return str2num(tmpStr)
-                                endif
-                        endfor
-                endif
-                FOr(i=0;i<ItemsInList(NameStrLoc, "_");i+=1)
-                        tmpStr = StringFromList(i, NameStrLoc, "_")
-                        strswitch(whichComp)                                    // string switch
-                                case "_xyzC":                                           // execute if case matches expression
-                                        if(GrepString(tmpStr, "^[-+]?[0-9]*\.?[0-9]+C$" ))
-                                                return str2num(tmpStr)
-                                        endif
-                                        break                                                   // exit from switch
-                                case "_xyzmin": // execute if case matches expression
-                                        if(GrepString(tmpStr, "^[-+]?[0-9]*\.?[0-9]+min$" ))
-                                                return str2num(tmpStr)
-                                        endif
-                                        break
-                                case "_xyzpct": // execute if case matches expression
-                                        if(GrepString(tmpStr, "^[-+]?[0-9]*\.?[0-9]+pct$" ))
-                                                return str2num(tmpStr)
-                                        endif
-                                        break
-                        endswitch               
-                endfor
-        return Nan
-end
 //**********************************************************************************************************
 //**********************************************************************************************************

trunk/User Procedures/Irena/IR3_SimpleFits.ipf

@@ -1876 +1876 @@
                         Note /K/NOCR ResuldQ, NoteWithResults
                         break
-                case "Volume Size Distribution":        // nothng to do here...
-                        break
-                case "Number Size Distribution":        // nothng to do here...
+                case "Volume Size Distribution":        // nothing to do here...
+                        break
+                case "Number Size Distribution":        // nothing to do here...
                         break
                 default:                        // optional default expression executed
@@ -1940 +1940 @@
                 Wave/Z GuinierRg
                 if(!WaveExists(GuinierRg))
-                        make/O/N=0 GuinierRg, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare
+                        make/O/N=0 GuinierRg, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave
                         make/O/N=0/T SampleName
                         SetScale/P x 0,1,"A", GuinierRg
@@ -1946 +1946 @@
                 endif
                 curlength = numpnts(GuinierRg)
-                redimension/N=(curlength+1) SampleName,GuinierRg, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare 
+                redimension/N=(curlength+1) SampleName,GuinierRg, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave 
                 SampleName[curlength] = DataFolderName
-                GuinierRg[curlength] = Guinier_Rg
-                GuinierI0[curlength] = Guinier_I0
-                GuinierQmin[curlength] = DataQstart
-                GuinierQmax[curlength] = DataQEnd
-                GuinierChiSquare[curlength] = AchievedChiSquare
+                TimeWave[curlength]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[curlength]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[curlength]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[curlength]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
+                GuinierRg[curlength]                            = Guinier_Rg
+                GuinierI0[curlength]                            = Guinier_I0
+                GuinierQmin[curlength]                  = DataQstart
+                GuinierQmax[curlength]                  = DataQEnd
+                GuinierChiSquare[curlength]     = AchievedChiSquare
                 IR3J_GetTableWithresults()
         elseif(stringmatch(SimpleModel,"Guinier Rod"))
@@ -1959 +1963 @@
                 Wave/Z GuinierRc
                 if(!WaveExists(GuinierRc))
-                        make/O/N=0 GuinierRc, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare
+                        make/O/N=0 GuinierRc, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave
                         make/O/N=0/T SampleName
                         SetScale/P x 0,1,"A", GuinierRc
@@ -1965 +1969 @@
                 endif
                 curlength = numpnts(GuinierRc)
-                redimension/N=(curlength+1) SampleName,GuinierRc, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare 
+                redimension/N=(curlength+1) SampleName,GuinierRc, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave 
                 SampleName[curlength] = DataFolderName
+                TimeWave[curlength]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[curlength]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[curlength]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[curlength]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
                 GuinierRc[curlength] = Guinier_Rg
                 GuinierI0[curlength] = Guinier_I0
@@ -1978 +1986 @@
                 Wave/Z GuinierTh
                 if(!WaveExists(GuinierTh))
-                        make/O/N=0 GuinierTh, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare
+                        make/O/N=0 GuinierTh, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave
                         make/O/N=0/T SampleName
                         SetScale/P x 0,1,"A", GuinierTh
@@ -1984 +1992 @@
                 endif
                 curlength = numpnts(GuinierTh)
-                redimension/N=(curlength+1) SampleName,GuinierTh, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare 
+                redimension/N=(curlength+1) SampleName,GuinierTh, GuinierI0, GuinierQmin, GuinierQmax, GuinierChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave 
                 SampleName[curlength] = DataFolderName
+                TimeWave[curlength]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[curlength]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[curlength]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[curlength]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
                 GuinierTh[curlength] = sqrt(12)*Guinier_Rg
                 GuinierI0[curlength] = Guinier_I0
@@ -1997 +2009 @@
                 Wave/Z PorodConstant
                 if(!WaveExists(PorodConstant))
-                        make/O/N=0 PorodConstant, PorodBackground, PorodQmin, PorodQmax, PorodChiSquare
+                        make/O/N=0 PorodConstant, PorodBackground, PorodQmin, PorodQmax, PorodChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave
                         make/O/N=0/T SampleName
                         SetScale/P x 0,1,"cm3/A", PorodConstant                 //this may be worng, I suspect
@@ -2003 +2015 @@
                 endif
                 curlength = numpnts(PorodConstant)
-                redimension/N=(curlength+1) SampleName,PorodConstant, PorodBackground, PorodQmin, PorodQmax, PorodChiSquare 
+                redimension/N=(curlength+1) SampleName,PorodConstant, PorodBackground, PorodQmin, PorodQmax, PorodChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave 
                 SampleName[curlength] = DataFolderName
+                TimeWave[curlength]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[curlength]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[curlength]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[curlength]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
                 PorodConstant[curlength] = Porod_Constant
                 PorodBackground[curlength]=DataBackground
@@ -2016 +2032 @@
                 Wave/Z SphereRadius
                 if(!WaveExists(SphereRadius))
-                        make/O/N=0 SphereRadius, SphereScalingFactor, SphereBackground, SphereQmin, SphereQmax, SphereChiSquare
+                        make/O/N=0 SphereRadius, SphereScalingFactor, SphereBackground, SphereQmin, SphereQmax, SphereChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave
                         make/O/N=0/T SampleName
                         SetScale/P x 0,1,"A", SphereRadius
@@ -2022 +2038 @@
                 endif
                 curlength = numpnts(SphereRadius)
-                redimension/N=(curlength+1) SampleName,SphereRadius, SphereScalingFactor, SphereBackground, SphereQmin, SphereQmax, SphereChiSquare 
+                redimension/N=(curlength+1) SampleName,SphereRadius, SphereScalingFactor, SphereBackground, SphereQmin, SphereQmax, SphereChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave 
                 SampleName[curlength] = DataFolderName
+                TimeWave[curlength]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[curlength]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[curlength]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[curlength]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
                 SphereRadius[curlength] = Sphere_Radius
                 SphereScalingFactor[curlength] = Sphere_ScalingConstant
@@ -2036 +2056 @@
                 Wave/Z SpheroidRadius
                 if(!WaveExists(SpheroidRadius))
-                        make/O/N=0 SpheroidRadius, SpheroidScalingFactor, SpheroidAspectRatio, SpheroidBackground, SpheroidQmin, SpheroidQmax, SpheroidChiSquare
+                        make/O/N=0 SpheroidRadius, SpheroidScalingFactor, SpheroidAspectRatio, SpheroidBackground, SpheroidQmin, SpheroidQmax, SpheroidChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave
                         make/O/N=0/T SampleName
                         SetScale/P x 0,1,"A", SpheroidRadius
@@ -2042 +2062 @@
                 endif
                 curlength = numpnts(SpheroidRadius)
-                redimension/N=(curlength+1) SampleName,SpheroidRadius, SpheroidScalingFactor, SpheroidAspectRatio, SpheroidBackground, SpheroidQmin, SpheroidQmax, SpheroidChiSquare 
+                redimension/N=(curlength+1) SampleName,SpheroidRadius, SpheroidScalingFactor, SpheroidAspectRatio, SpheroidBackground, SpheroidQmin, SpheroidQmax, SpheroidChiSquare, TimeWave, TemperatureWave, PercentWave, OrderWave 
                 SampleName[curlength]                   = DataFolderName
+                TimeWave[curlength]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[curlength]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[curlength]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[curlength]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
                 SpheroidRadius[curlength]                       = Spheroid_Radius
                 SpheroidScalingFactor[curlength] = Spheroid_ScalingConstant
@@ -2057 +2081 @@
                 Wave/Z Rg
                 if(!WaveExists(Rg))
-                        make/O/N=0 Rg, VolumeFraction, MeanDiaVolDist, ModeDiaVolDist, MeadianDiaVolDist
+                        make/O/N=0 Rg, VolumeFraction, MeanDiaVolDist, ModeDiaVolDist, MeadianDiaVolDist, TimeWave, TemperatureWave, PercentWave, OrderWave
                         make/O/N=0/T SampleName
                         SetScale/P x 0,1,"A", Rg, MeanDiaVolDist, ModeDiaVolDist, MeadianDiaVolDist
@@ -2063 +2087 @@
                 endif
                 curlength = numpnts(Rg)
-                redimension/N=(curlength+1) SampleName,Rg, VolumeFraction, MeanDiaVolDist, ModeDiaVolDist, MeadianDiaVolDist 
+                redimension/N=(curlength+1) SampleName,Rg, VolumeFraction, MeanDiaVolDist, ModeDiaVolDist, MeadianDiaVolDist, TimeWave, TemperatureWave, PercentWave, OrderWave 
                 SampleName[curlength]                   = DataFolderName
+                TimeWave[curlength]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[curlength]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[curlength]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[curlength]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
                 Rg[curlength]                                           = VOlSD_Rg
                 VolumeFraction[curlength]               = VolSD_Volume
@@ -2077 +2105 @@
                 Wave/Z NumPartsPercm3
                 if(!WaveExists(NumPartsPercm3)) 
-                        make/O/N=0 NumPartsPercm3, MeanDiaNumDist, ModeDiaNumDist, MeadianDiaNumDist
+                        make/O/N=0 NumPartsPercm3, MeanDiaNumDist, ModeDiaNumDist, MeadianDiaNumDist, TimeWave, TemperatureWave, PercentWave, OrderWave
                         make/O/N=0/T SampleName
                         SetScale/P x 0,1,"A", MeanDiaNumDist, ModeDiaNumDist, MeadianDiaNumDist
@@ -2083 +2111 @@
                 endif
                 curlength = numpnts(NumPartsPercm3)
-                redimension/N=(curlength+1) SampleName, NumPartsPercm3, MeanDiaNumDist, ModeDiaNumDist, MeadianDiaNumDist 
+                redimension/N=(curlength+1) SampleName, NumPartsPercm3, MeanDiaNumDist, ModeDiaNumDist, MeadianDiaNumDist, TimeWave, TemperatureWave, PercentWave, OrderWave 
                 SampleName[curlength]                   = DataFolderName
+                TimeWave[curlength]                             =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzmin")
+                TemperatureWave[curlength]      =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzC")
+                PercentWave[curlength]                  =       IN2G_IdentifyNameComponent(DataFolderName, "_xyzpct")
+                OrderWave[curlength]                            =       IN2G_IdentifyNameComponent(DataFolderName, "_xyz")
                 NumPartsPercm3[curlength]               = NumSD_NumPartPerCm3
                 MeanDiaNumDist[curlength]               = NumSD_MeanDiameter
@@ -2091 +2123 @@
 
                 //IR3J_GetTableWithresults()
+        endif
+        if(sum(TimeWave)<=0 || numtype(sum(TimeWave))!=0)
+                KillWaves/Z  TimeWave
+        endif
+        if(sum(TemperatureWave)<=0 || numtype(sum(TemperatureWave))!=0)
+                KillWaves/Z  TemperatureWave
+        endif
+        if(sum(PercentWave)<=0|| numtype(sum(PercentWave))!=0)
+                KillWaves/Z  PercentWave
+        endif
+        if(sum(OrderWave)<=0|| numtype(sum(OrderWave))!=0)
+                KillWaves/Z  OrderWave
         endif
         

trunk/User Procedures/Nika/NI1_HDF5Browser.ipf

@@ -24 +24 @@
         string CalledFrom,  fileName, PathName
         
+        abort "General HDF5 load is broken due to Igor 9 code modifications. Remind author to fix it (and send example data set, please)"
         //CalledFrom ... "Nika" or "Irena"
         Wave/Z/T GroupNames=$("root:Packages:"+CalledFrom+"HDF5Loader:GroupNames")
@@ -101 +102 @@
 
 
-
 Structure NI2HDF5BrowserData
         SVAR browserName
@@ -123 +123 @@
         SVAR datasetInfo                                                // Panel readout info for currently-selected dataset
 EndStructure
-
+//
 static Function CreateHDF5BrowserGlobals(newBrowserName)
         String newBrowserName
@@ -154 +154 @@
         SetDataFolder savedDataFolder
 End
-
+//
 Function/S NI2_SetBrowserDataFolder(browserName)                // Pass "" for browserName to set to master browser folder.
         String browserName
@@ -169 +169 @@
         return savedDataFolder
 End
-
-static Function SetNI2HDF5BrowserData(browserName, bd)
-        String browserName
-        STRUCT NI2HDF5BrowserData &bd
-        
-        String savedDataFolder = NI2_SetBrowserDataFolder(browserName)
-        
-        // These statements set the structure fields to reference the corresponding waves and variables in the data folder.
-        
-        SVAR bd.browserName
-        
-        Wave/T bd.groupsList
-        Wave/T bd.groupAttributesList
-        Wave/T bd.datasetsList
-        Wave/T bd.datasetAttributesList
-        
-        Wave/T bd.groupFullPaths
-        SVAR bd.groupPath
-
-        SVAR bd.hyperSelectionWavePath
-        
-        NVAR bd.fileID
-        SVAR bd.fileName
-        SVAR bd.path
-        SVAR bd.fullPath
-        NVAR bd.readOnly
-        
-        SVAR bd.datasetInfo
-        
-        SetDataFolder savedDataFolder
-End
-
-static Function CountSlashes(item)
-        String item
-        
-        Variable slashes = 0
-        Variable pos = 0
-        
-        do
-                pos = strsearch(item, "/", pos)
-                if (pos < 0)
-                        break
-                endif
-                slashes += 1
-                pos += 1
-        while (1)
-
-        return slashes
-End
-
-Function/S NI2_GetGroupHierarchy(fileID, startPath, level, mode)
-        Variable fileID
-        String startPath
-        Variable level
-        Variable mode                   // 0 to just get group names; 1 to get full path to each group.
-
-        String result = ""
-
-        String indent = ""                      // Used only for mode 0.
-        Variable i, j
-
-#if Exists("HDF5ListGroup")     
-        
-        // This gives full hierarchy with full paths
-        HDF5ListGroup /F /R /TYPE=1 fileID, startPath
-        result = S_HDF5ListGroup
-        
-        if (mode == 0)                          // Want just names, not full paths
-                result = ""
-                Variable numItems = ItemsInList(S_HDF5ListGroup)
-                for(i=0; i<numItems; i+=1)
-                        String item = StringFromList(i, S_HDF5ListGroup)
-                        level = CountSlashes(item)
-                        indent = ""
-                        for(j=0; j<level; j+=1)
-                                indent += "    "
-                        endfor
-                        item = ParseFilePath(0, item, "/", 1, 0)                        // Get last element
-                        item = indent + item                                            // Prepend indentation
-                        result += item + ";"            
-                endfor  
-        endif
-        
-        return result
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function/S GetFileHierarchy(bd, mode)
-        STRUCT NI2HDF5BrowserData &bd
-        Variable mode                                           // 0 to just get group names; 1 to get full path to each group.
-        
-        if (bd.fileID == 0)                                                     // No file is open?
-                return ""
-        endif
-        
-        String hierarchy, rootName
-        if (mode == 1)
-                rootName = "/"                                  // For purposes of storing full path, use true root name
-        else
-                rootName = "root"                                       // For display purposes, use "root" as root name
-        endif
-        hierarchy = rootName + ";" + NI2_GetGroupHierarchy(bd.fileID, "/", 1, mode)
-        
-        return hierarchy
-End
-
-static Function ResetListSelections(bd, resetGroupsList, resetGroupAttributesList, resetDatasetsList, resetDatasetAttributesList)
-        STRUCT NI2HDF5BrowserData &bd
-        Variable resetGroupsList, resetGroupAttributesList, resetDatasetsList, resetDatasetAttributesList
-
-        if (resetGroupsList)
-                ListBox GroupsList, win=$bd.browserName, selRow=0
-        endif
-        if (resetGroupAttributesList)
-                ListBox GroupAttributesList, win=$bd.browserName, selRow=0
-        endif
-        if (resetDatasetsList)
-                ListBox DatasetsList, win=$bd.browserName, selRow=0
-        endif
-        if (resetDatasetAttributesList)
-                ListBox DatasetAttributesList, win=$bd.browserName, selRow=0
-        endif
-End
-
-Function/S NI2_HDF5GetObjectFullPath(groupPath, objectName)
-        String groupPath                                        // Path to parent group
-        String objectName                               // Name of dataset or group in parent group
-        
-        String fullPath
-        
-        if (CmpStr(groupPath, "/") == 0)
-                fullPath = "/" + objectName
-        else
-                fullPath = groupPath + "/" + objectName
-        endif
-        
-        return fullPath
-End
-
-Function/S NI2_GetTextPreviewString(tw)
-        Wave/T tw                                               // tw has already been flattened to 1D.
-        
-        String preview, temp
-        Variable len
-        
-        Variable row, numRows, totalLength
-        
-        totalLength = 0
-
-        numRows = numpnts(tw)
-        if (numRows == 0)
-                return ""
-        endif
-        
-        preview = ""
-        row = 0
-        do
-                temp = tw[row]
-                temp = ReplaceString("\r", temp, "<CR>", 1)     // Convert CR to "\r"
-                temp = ReplaceString("\n", temp, "<LF>", 1)     // Convert LF to "\n"
-
-                len = strlen(temp)
-                if (len > 128)
-                        if (numRows == 1)
-                                sprintf preview, "\"%s\" . . . (%d characters total)", temp[0,127], len
-                        else
-                                preview += " . . . <Strings too long to display here>"
-                        endif
-                        
-                        row = numRows                                                   // To prevent extra . . .
-                        break
-                endif
-
-                preview += "\"" + temp + "\""
-                row += 1
-                totalLength += len
-
-                if (row >= numRows)
-                        break
-                endif
-                if (totalLength >= 256)                         // Enough is enough
-                        break
-                endif
-
-                preview += ", "
-        while(1)
-
-        if (row < numRows)
-                preview += " . . ."
-        endif
-
-        return preview
-End
-
-Function/S NI2_GetNumericPreviewString(w)
-        Wave w                                                  // w has already been flattened to 1D.
-
-        String preview, temp
-        
-        Variable row, numRows, totalLength
-        
-        totalLength = 0
-
-        numRows = numpnts(w)
-        if (numRows == 0)
-                return ""
-        endif
-        
-        preview = ""
-        row = 0
-        do
-                sprintf temp, "%g", w[row]
-                preview += temp
-                row += 1
-                totalLength += strlen(temp)
-
-                if (row >= numRows)
-                        break
-                endif
-                if (totalLength >= 256)                                 // Enough is enough
-                        break
-                endif
-
-                preview += ", "
-        while(1)
-
-        if (row < numRows)
-                preview += " . . ."
-        endif
-        
-        return preview
-End
-
-Function/S NI2_GetPreviewString(locationID, objectType, di, fullPath, attributeName)
-        Variable locationID
-        Variable objectType                                             // 1 = group, 2 = dataset
-        STRUCT NI2_HDF5DataInfo &di
-        String fullPath                                                 // Full path to group or dataset
-        String attributeName                                    // "" if this is a dataset, not an attribute
-        
-        String value = "<Can't display here>"
-        String temp
-        
-        Variable rank = di.ndims
-        Variable dim, numElements
-        
-        if (rank == 0)
-                numElements = 1
-        else
-                numElements = di.dims[0]
-                for(dim=1; dim<rank; dim+=1)
-                        numElements *= di.dims[dim]             
-                endfor
-        endif
-
-#if Exists("HDF5LoadData")      
-        strswitch(di.datatype_class_str)
-                case "H5T_INTEGER":
-                case "H5T_FLOAT":
-                case "H5T_ENUM":
-                case "H5T_OPAQUE":
-                case "H5T_BITFIELD":
-                        if (numElements > 100)
-                                value = "<Too big to display here>"     // It would take too long to load.
-                                break
-                        endif
-                        
-                        HDF5LoadData /A=attributeName /N=tempNumericAttributeWave /O /Q /TYPE=(objectType) /VAR=0 /Z locationID, fullPath 
-                        if (V_flag != 0)
-                                value = "ERROR!"
-                        else
-                                Wave tempNumericAttributeWave
-                                
-                                if (rank > 1)
-                                        // So we can treat multi-dimensional wave as one big row.
-                                        Redimension/N=(numElements)/E=1 tempNumericAttributeWave
-                                endif
-                                
-                                value = NI2_GetNumericPreviewString(tempNumericAttributeWave)
-                        endif
-                        KillWaves/Z tempNumericAttributeWave
-                        break                           
-
-                case "H5T_REFERENCE":
-                        if (numElements > 10)
-                                value = "<Too big to display here>"     // It would take too long to load.
-                                break
-                        endif
-                
-                        HDF5LoadData /A=attributeName /N=tempTextAttributeWave /O /Q /TYPE=(objectType) /VAR=0 /Z locationID, fullPath 
-                        if (V_flag != 0)
-                                value = "ERROR!"
-                        else
-                                if (rank > 1)
-                                        wave tempTextAttributeWave
-                                        // So we can treat multi-dimensional wave as one big row.
-                                        Redimension/N=(numElements)/E=1 tempTextAttributeWave
-                                endif
-                                
-                                // Remove the prefix (e.g., "D:" for a dataset, which is there for
-                                // programmatic use but would confuse in a preview.
-                                Wave/T references = tempTextAttributeWave                       // Created by HDF5LoadData
-                                String tmp
-                                Variable npnts=numpnts(references), len
-                                Variable i
-                                for(i=0; i<npnts; i+=1)
-                                        tmp = references[i]
-                                        len = strlen(tmp)
-                                        references[i] = tmp[2,len]
-                                endfor
-                                
-                                value = NI2_GetTextPreviewString(references)
-                        endif
-                        KillWaves/Z tempTextAttributeWave
-                        break                           
-
-                case "H5T_STRING":
-                        if (numElements > 100)
-                                value = "<Too big to display here>"     // It would take too long to load.
-                                break
-                        endif
-                
-                        HDF5LoadData /A=attributeName /N=tempTextAttributeWave /O /Q /TYPE=(objectType) /VAR=0 /Z locationID, fullPath 
-                        if (V_flag != 0)
-                                value = "ERROR!"
-                        else
-                                if (rank > 1)
-                                        // So we can treat multi-dimensional wave as one big row.
-                                        Redimension/N=(numElements)/E=1 tempTextAttributeWave
-                                endif
-                                value = NI2_GetTextPreviewString(tempTextAttributeWave)
-                        endif
-                        KillWaves/Z tempTextAttributeWave
-                        break                           
-                        
-                case "H5T_TIME":
-                case "H5T_COMPOUND":
-                case "H5T_VLEN":
-                case "H5T_ARRAY":
-                        value = "<Can't display this type here>"
-                        break
-        endswitch
-        
-        return value
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function FillDatasetsList(bd)
-        STRUCT NI2HDF5BrowserData &bd
-
-#if Exists("HDF5ListGroup")     
-        HDF5ListGroup /TYPE=2 bd.fileID, bd.groupPath
-        Variable numItemsInList = ItemsInList(S_HDF5ListGroup)
-        
-        if (numItemsInList == 0)
-                Redimension/N=0 bd.datasetsList
-        else
-                Redimension/N=(numItemsInList, 5) bd.datasetsList
-                SetDimLabel 1, 0, Dataset, bd.datasetsList
-                SetDimLabel 1, 1, Rank, bd.datasetsList
-                SetDimLabel 1, 2, 'Dim Sizes', bd.datasetsList
-                SetDimLabel 1, 3, Type, bd.datasetsList
-                SetDimLabel 1, 4, Value, bd.datasetsList
-                bd.datasetsList[][0] = StringFromList(p, S_HDF5ListGroup)
-        
-                String dataset
-                Variable i, numDatasets
-                numDatasets = ItemsInList(S_HDF5ListGroup)
-                for(i=0; i<numDatasets; i+=1)
-                        dataset = StringFromList(i, S_HDF5ListGroup)
-                        String fullPath = NI2_HDF5GetObjectFullPath(bd.groupPath, dataset)
-                        STRUCT NI2_HDF5DataInfo di
-                        NI2_InitHDF5DataInfo(di)                        // Set input fields.
-                        HDF5DatasetInfo(bd.fileID, fullPath, 0, di)
-                        
-                        Variable rank = di.ndims
-                        bd.datasetsList[i][1] = num2istr(rank)
-                        
-                        String dimsStr=""
-                        Variable dim
-                        for(dim=0; dim<rank; dim+=1)
-                                dimsStr += num2istr(di.dims[dim]) + ";"
-                        endfor
-                        bd.datasetsList[i][2] = dimsStr
-
-                        bd.datasetsList[i][3] = di.datatype_str
-
-                        String preview = NI2_GetPreviewString(bd.fileID, 2, di, fullPath, "")
-                        bd.datasetsList[i][4] = preview
-                endfor
-        endif
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-                
-static Function FillGroupAttributesList(bd)
-        STRUCT NI2HDF5BrowserData &bd
-
-#if Exists("HDF5ListAttributes")        
-        Variable numAttributes = 0
-        String groupPath = bd.groupPath
-        if (strlen(groupPath) > 0)
-                HDF5ListAttributes/TYPE=1 bd.fileID, groupPath
-                numAttributes = ItemsInList(S_HDF5ListAttributes)
-        endif
-        
-        if (numAttributes == 0)
-                Redimension/N=0 bd.groupAttributesList
-        else
-                Redimension/N=(numAttributes, 5) bd.groupAttributesList
-                SetDimLabel 1, 0, Attribute,bd.groupAttributesList
-                SetDimLabel 1, 1, Rank,bd.groupAttributesList
-                SetDimLabel 1, 2, 'Dim Sizes',bd.groupAttributesList
-                SetDimLabel 1, 3, Type,bd.groupAttributesList
-                SetDimLabel 1, 4, Value,bd.groupAttributesList
-                bd.groupAttributesList[][0] = StringFromList(p, S_HDF5ListAttributes)
-        
-                String attribute
-                Variable i
-                for(i=0; i<numAttributes; i+=1)
-                        String attributeName
-                        attributeName = StringFromList(i, S_HDF5ListAttributes)
-                        attribute = attributeName
-
-                        STRUCT NI2_HDF5DataInfo di
-                        NI2_InitHDF5DataInfo(di)                        // Set input fields.
-                        HDF5AttributeInfo(bd.fileID, groupPath, 1, attribute, 0, di)
-                        
-                        Variable rank = di.ndims
-                        bd.groupAttributesList[i][1] = num2istr(rank)
-                        
-                        String dimsStr=""
-                        Variable dim
-                        for(dim=0; dim<rank; dim+=1)
-                                dimsStr += num2istr(di.dims[dim]) + ";"
-                        endfor
-                        bd.groupAttributesList[i][2] = dimsStr
-
-                        bd.groupAttributesList[i][3] = di.datatype_str
-
-                        String preview = NI2_GetPreviewString(bd.fileID, 1, di, groupPath, attributeName)
-                        bd.groupAttributesList[i][4] = preview
-                endfor
-        endif
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-                
-static Function FillDatasetAttributesList(bd)
-        STRUCT NI2HDF5BrowserData &bd
-
-#if Exists("HDF5ListAttributes")        
-        Variable numAttributes = 0
-        String datasetPath = NI2_SelectedDatasetPath(bd)
-        if (strlen(datasetPath) > 0)
-                HDF5ListAttributes/TYPE=2 bd.fileID, datasetPath
-                numAttributes = ItemsInList(S_HDF5ListAttributes)
-        endif
-        
-        if (numAttributes == 0)
-                Redimension/N=0 bd.datasetAttributesList
-        else
-                Redimension/N=(numAttributes, 5) bd.datasetAttributesList
-                SetDimLabel 1, 0, Attribute,bd.datasetAttributesList
-                SetDimLabel 1, 1, Rank,bd.datasetAttributesList
-                SetDimLabel 1, 2, 'Dim Sizes',bd.datasetAttributesList
-                SetDimLabel 1, 3, Type,bd.datasetAttributesList
-                SetDimLabel 1, 4, Value,bd.datasetAttributesList
-                bd.datasetAttributesList[][0] = StringFromList(p, S_HDF5ListAttributes)
-        
-                String attribute
-                Variable i
-                for(i=0; i<numAttributes; i+=1)
-                        String attributeName
-                        attributeName = StringFromList(i, S_HDF5ListAttributes)
-                        attribute = attributeName
-
-                        STRUCT NI2_HDF5DataInfo di
-                        NI2_InitHDF5DataInfo(di)                        // Set input fields.
-                        HDF5AttributeInfo(bd.fileID, datasetPath, 2, attribute, 0, di)
-                        
-                        Variable rank = di.ndims
-                        bd.datasetAttributesList[i][1] = num2istr(rank)
-                        
-                        String dimsStr=""
-                        Variable dim
-                        for(dim=0; dim<rank; dim+=1)
-                                dimsStr += num2istr(di.dims[dim]) + ";"
-                        endfor
-                        bd.datasetAttributesList[i][2] = dimsStr
-
-                        bd.datasetAttributesList[i][3] = di.datatype_str
-
-                        String preview = NI2_GetPreviewString(bd.fileID, 2, di, datasetPath, attributeName)
-                        bd.datasetAttributesList[i][4] = preview
-                endfor
-        endif
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-        
-static Function FillLists(bd)
-        STRUCT NI2HDF5BrowserData &bd
-
-        if (bd.fileID == 0)                                                     // No file is open?
-                Redimension/N=(0) bd.groupsList
-                Redimension/N=(0) bd.groupAttributesList
-                Redimension/N=(0) bd.datasetsList
-                Redimension/N=(0) bd.datasetAttributesList
-                return -1
-        endif
-        
-        Variable numItemsInList
-        String hierarchy
-        
-        // Show entire hierarchy in Groups list.
-        hierarchy = GetFileHierarchy(bd, 0)     
-        numItemsInList = ItemsInList(hierarchy)
-        Redimension/N=(numItemsInList) bd.groupsList
-        bd.groupsList = StringFromList(p, hierarchy)
-        
-        // The groupFullPaths wave stores the full path to each group
-        hierarchy = GetFileHierarchy(bd, 1)     
-        numItemsInList = ItemsInList(hierarchy)
-        Redimension/N=(numItemsInList) bd.groupFullPaths
-        bd.groupFullPaths = StringFromList(p, hierarchy)
-        
-        // Show datasets in current group in Datasets list.
-        FillDatasetsList(bd)
-        
-        // Show attributes of currently-selected group.
-        FillGroupAttributesList(bd)
-        
-        // Show attributes of currently-selected dataset.
-        FillDatasetAttributesList(bd)
-End
-
-Function/S NI2_SelectedGroupName(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-        if (numpnts(bd.groupsList) == 0)
-                return ""
-        endif
-
-        ControlInfo/W=$bd.browserName GroupsList
-        Variable selRow = V_value
-        String groupName = bd.groupsList[selRow]
-
-        // Group names may have leading spaces at this point. The spaces are used to create
-        // indentation in the list to show the hierarchy. We must remove the leading spaces.
-        sscanf groupName, " %s", groupName
-
-        if (strlen(groupName) > 0)
-                return groupName
-        endif
-
-        return ""
-End
-
-Function/S NI2_SelectedGroupPath(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-        String groupPath = bd.groupPath
-
-        return groupPath
-End
-
-Function/S NI2_SelectedDatasetName(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-        if (numpnts(bd.datasetsList) == 0)
-                return ""
-        endif
-
-        ControlInfo/W=$bd.browserName DatasetsList
-        Variable selRow = V_value
-        String datasetName = bd.datasetsList[selRow][0]
-        if (strlen(datasetName) > 0)
-                return datasetName
-        endif
-
-        return ""
-End
-
-Function/S NI2_SelectedDatasetPath(bd)
-        STRUCT NI2HDF5BrowserData &bd
-
-        String datasetName = NI2_SelectedDatasetName(bd)
-        if (strlen(datasetName) == 0)
-                return ""                                               // Nothing is selected
-        endif
-        
-        String datasetPath = bd.groupPath
-        if (CmpStr(datasetPath[strlen(datasetPath)-1],"/") != 0)
-                datasetPath += "/"
-        endif
-        datasetPath += datasetName
-
-        return datasetPath
-End
-
-Function/S NI2_SelectedAttributeName(bd, isGroupAttribute)
-        STRUCT NI2HDF5BrowserData &bd
-        Variable isGroupAttribute
-
-        String controlName
-        if (isGroupAttribute)
-                controlName = "GroupAttributesList"
-                Wave/T list = bd.groupAttributesList
-        else
-                controlName = "DatasetAttributesList"
-                Wave/T list = bd.datasetAttributesList
-        endif
-        
-        if (numpnts(list) == 0)
-                return ""
-        endif
-
-        ControlInfo/W=$bd.browserName $controlName
-        Variable selRow = V_value
-        String attributeName = list[selRow][0]
-        
-        if (strlen(attributeName) > 0)
-                return attributeName
-        endif
-
-        return ""
-End
-
-Function/S NI2_SelectedAttributePath(bd, isGroupAttribute)
-        STRUCT NI2HDF5BrowserData &bd
-        Variable isGroupAttribute
-
-        String attributeName = NI2_SelectedAttributeName(bd, isGroupAttribute)
-        if (strlen(attributeName) == 0)
-                return ""                                               // Nothing is selected
-        endif
-        
-        String path
-        if (isGroupAttribute)
-                path = NI2_SelectedGroupPath(bd)
-        else
-                path = NI2_SelectedDatasetPath(bd)
-        endif
-        
-        path += "/" + attributeName
-
-        return path
-End
-
-StrConstant NI2_kLoadAllMembersString = "_Load_All_Members_"
-
-static Function SetMembersPopupMenu(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-#if Exists("HDF5OpenFile")      
-        Variable hideMembers
-        String memberList
-
-        hideMembers = 1
-        memberList = NI2_kLoadAllMembersString + ";"
-        
-        if (bd.fileID != 0)                             // File is open for this browser?
-                String fullPath
-                
-                fullPath = NI2_SelectedDatasetPath(bd)
-                if (strlen(fullPath) > 0)
-                        STRUCT NI2_HDF5DataInfo di
-                        NI2_InitHDF5DataInfo(di)
-                        HDF5DatasetInfo(bd.fileID, fullPath, 0, di)
-                        if (CmpStr(di.datatype_class_str, "H5T_COMPOUND") == 0)
-                                hideMembers = 0
-                                
-                                ControlInfo /W=$bd.browserName Members
-                                Variable selectedItemNumber = V_Value
-                                STRUCT NI2_HDF5DatatypeInfo dti
-                                NI2_InitHDF5DatatypeInfo(dti)
-                                if (HDF5TypeInfo(bd.fileID, fullPath, "", "", 1, dti))
-                                        memberList += "HDF5TypeInfo Error!"
-                                else
-                                        memberList += dti.names
-                                        if (selectedItemNumber > dti.nmembers+1)        // +1 because of "_Load_All_Members_" item.
-                                                selectedItemNumber = 1          // Force menu selection to be in bounds.
-                                        endif
-                                endif
-                                PopupMenu Members, win=$bd.browserName, mode=selectedItemNumber
-                        endif
-                endif
-        endif
-        
-        PopupMenu Members, win=$bd.browserName, disable=hideMembers
-        
-        String cmd                              // What a pain. Can't use local variable with PopupMenu value=
-        sprintf cmd, "PopupMenu Members, win=%s, value=\"%s\"", bd.browserName, memberList
-        Execute cmd
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-Function NI2_HDF5GetReadOnlySetting(browserName)
-        String browserName
-        
-        Variable result
-        ControlInfo /W=$browserName ReadOnly
-        result = V_value
-        return result
-End
-
-Function NI2_HDF5GetCompLoadInfo(bd, isCompound, compMode, memberName)
-        STRUCT NI2HDF5BrowserData &bd
-        Variable &isCompound                                    // Output: If non-zero, a compound dataset is selected.
-        Variable &compMode                                              // Output: Value suitable for passing to HDF5LoadData /COMP flag.
-        String &memberName                                              // Output: If "" load all members.
-        
-        isCompound = 0
-        memberName = ""
-        
-        ControlInfo /W=$bd.browserName Members
-        if (V_disable == 0)
-                isCompound = 1
-                memberName = S_value
-                if (CmpStr(memberName, NI2_kLoadAllMembersString) == 0)
-                        memberName = ""
-                endif
-        endif
-
-        compMode = isCompound && strlen(memberName)>0
-End
-
-Function NI2_HDF5GetTranspose2DSetting(browserName)
-        String browserName
-        
-        Variable result
-        ControlInfo /W=$browserName Transpose2DDatasets
-        result = V_value
-        return result
-End
-
-static Function HDF5GetLoadDatasetOptions(browserName, tableDisplayMode, graphDisplayMode)
-        String browserName
-        Variable &tableDisplayMode, &graphDisplayMode
-        
-        ControlInfo /W=$browserName DisplayInTable
-        tableDisplayMode = V_value - 1                                          // 0=no; 1=display; 2=append
-        
-        ControlInfo /W=$browserName DisplayInGraph
-        graphDisplayMode = V_value - 1                                          // 0=no; 1=display; 2=append
-        
-        return tableDisplayMode || graphDisplayMode
-End
-
-static Function MembersPopupProc(ctrlName,popNum,popStr) : PopupMenuControl
-        String ctrlName
-        Variable popNum
-        String popStr
-        
-        String browserName = NI2_HDF5GetTopBrowserName()
-        
-        STRUCT NI2HDF5BrowserData bd
-        SetNI2HDF5BrowserData(browserName, bd)
-        
-        NI2_HDF5DisplaySelectedDataset(bd)
-End
-
-static Function SetButtonStates(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-        if (bd.fileID == 0)                             // No file is open for this browser?
-                Button CreateFile, win=$bd.browserName, disable=2               // Enable Create
-                Button OpenFile, win=$bd.browserName, disable=0         // Enable Open
-                Button CloseFile, win=$bd.browserName, disable=2                // Disable Close
-                Button LoadGroup, win=$bd.browserName, disable=2                // Disable Load Group
-                Button SaveDataFolder, win=$bd.browserName, disable=2   // Disable Save Data Folder
-                Button LoadDataset, win=$bd.browserName, disable=2      // Disable Load Dataset
-                Button SaveWaves, win=$bd.browserName, disable=2                // Disable Save Waves
-        else
-                Button CreateFile, win=$bd.browserName, disable=2               // Disable Create
-                Button OpenFile, win=$bd.browserName, disable=2         // Disable Open
-                Button CloseFile, win=$bd.browserName, disable=0                // Enable Close
-                
-                String groupName = NI2_SelectedGroupName(bd)
-                Variable code = strlen(groupName) > 0 ? 0:2
-                Button LoadGroup, win=$bd.browserName, disable=code     // Enable Load Group
-                code = bd.readOnly == 0 ? 0:2
-                Button SaveDataFolder, win=$bd.browserName, disable=code        // Enable Save Data Folder
-                
-                String datasetName = NI2_SelectedDatasetName(bd)
-                code = strlen(datasetName) > 0 ? 0:2
-                Button LoadDataset, win=$bd.browserName, disable=code   // Enable Load Dataset
-                code = bd.readOnly == 0 ? 0:2
-                Button SaveWaves, win=$bd.browserName, disable=code             // Enable Save Waves
-                //overwrite the code above...
-                Button LoadGroup, win=$bd.browserName, disable=2        // Disable Load Dataset
-                Button LoadDataset, win=$bd.browserName, disable=2      // Disable Load Dataset
-        endif
-        SetMembersPopupMenu(bd)
-        SetGraphButtonTitle(bd.browserName)
-        SetTableButtonTitle(bd.browserName)
-        SetDumpButtonTitle(bd.browserName)
-        SetVariable HyperSelectionWave, win=$bd.browserName, value= bd.hyperSelectionWavePath
-End
-
-static Function DrawFilePath(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-        // TitleBox FilePath, win=$bd.browserName, title=bd.fullPath                    // This is limited to 63 characters.
-        TitleBox FilePath, win=$bd.browserName, variable=bd.fullPath
-End
-
-static Function DrawGroupPath(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-        TitleBox GroupPath, win=$bd.browserName, variable=bd.groupPath
-End
-
-static Function DrawDatasetInfo(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-        TitleBox Dataset, win=$bd.browserName, variable=bd.datasetInfo
-End
-
-static Function UpdateAfterFileCreateOrOpen(isCreate, browserName, fileID, path, fileName)
-        Variable isCreate
-        String browserName
-        Variable fileID
-        String path, fileName
-        
-        STRUCT NI2HDF5BrowserData bd
-        SetNI2HDF5BrowserData(browserName, bd)
-
-        ResetListSelections(bd, 1, 1, 1, 1)
-
-        bd.fileID = fileID
-        bd.fileName = fileName
-        bd.path = path
-        bd.fullPath = path + fileName
-        DrawFilePath(bd)
-        
-        bd.readOnly = isCreate ? 0 : NI2_HDF5GetReadOnlySetting(browserName)
-
-        bd.groupPath = "/"
-        DrawGroupPath(bd)
-
-        SetButtonStates(bd)
-
-        FillLists(bd)
-        
-        NI2_UpdateAfterGroupSelected(bd, "/")
-        
-        String datasetName = NI2_SelectedDatasetName(bd)
-        if (strlen(datasetName) > 0)
-                NI2_SelectDataset(bd, datasetName)
-        endif
-End
-
-static Function CreateFileButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-        
-#if Exists("HDF5OpenFile")      
-        String browserName = NI2_HDF5GetTopBrowserName()
-
-        STRUCT NI2HDF5BrowserData bd
-        SetNI2HDF5BrowserData(browserName, bd)
-        
-        Variable fileID
-        
-        HDF5CreateFile /I /O fileID  as ""
-        if (V_flag == 0)                // Create OK?
-                UpdateAfterFileCreateOrOpen(1, browserName, fileID, S_path, S_fileName)
-        endif
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function OpenFileButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-        
-#if Exists("HDF5OpenFile")      
-        String browserName = NI2_HDF5GetTopBrowserName()
-        
-        Variable readOnly = NI2_HDF5GetReadOnlySetting(browserName)
-        
-        Variable locFileID
-        
-        if (readOnly)
-                HDF5OpenFile/R locFileID as ""
-        else
-                HDF5OpenFile locFileID as ""
-        endif
-        
-        if (V_flag == 0)                                        // Open OK?
-                UpdateAfterFileCreateOrOpen(0, browserName, locFileID, S_path, S_fileName)
-        endif
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-// This detects if the file is no longer open, such as if you save the experiment, quit Igor and then reopen the experiment.
-Function NI2_FileWasUnexpectedlyClosed(bd)
-        STRUCT NI2HDF5BrowserData &bd
-
-#if Exists("HDF5OpenFile")      
-        if (bd.fileID == 0)
-                return 0                                // File is closed but not unexpectedly.
-        endif
-        
-        HDF5ListAttributes/Q /TYPE=1 /Z bd.fileID , "/"         // Try to list the attributes of the root of the file.
-        if (V_flag != 0)
-                return 1                                                                // Error: Assume file was closed.
-        endif
-        
-        return 0
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function FileWasClosed(bd)                       // Does cleanup after a file is closed.
-        STRUCT NI2HDF5BrowserData &bd
-
-        bd.fileID = 0
-        Redimension/N=(0) bd.groupFullPaths
-        bd.groupPath = ""
-        bd.fileName = ""
-        bd.path = ""
-        bd.fullPath = ""
-        bd.datasetInfo = ""
-
-        DrawFilePath(bd)
-        SetButtonStates(bd)
-        FillLists(bd)
-End
-
-static Function CloseFileButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-        
-#if Exists("HDF5OpenFile")      
-        String browserName = NI2_HDF5GetTopBrowserName()
-
-        STRUCT NI2HDF5BrowserData bd
-        SetNI2HDF5BrowserData(browserName, bd)
-
-        HDF5CloseFile bd.fileID
-        CloseSavePanels()
-        FileWasClosed(bd)
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function LoadDatasetButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-
-#if Exists("HDF5OpenFile")      
-        String browserName
-        STRUCT NI2HDF5BrowserData bd
-        
-        if(stringmatch(ctrlName,"AddGrouptoList"))
-                
-                browserName = NI2_HDF5GetTopBrowserName()
-        
-                SetNI2HDF5BrowserData(browserName, bd)
-                
-                Wave/T DataSetNames=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":DataSetNames")
-                Wave/T GroupNames=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":GroupNames")
-                SVAR BrowserNameFldr=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":BrowserNameFldr")
-                Redimension/N=(numpnts(DataSetNames)+1) GroupNames
-                GroupNames[numpnts(GroupNames)-1]=NI2_SelectedGroupPath(bd)
-                BrowserNameFldr = NI2_HDF5GetTopBrowserName()
-        elseif(stringmatch(ctrlName,"ClearDatasetList"))
-                browserName = NI2_HDF5GetTopBrowserName()       
-                SetNI2HDF5BrowserData(browserName, bd)          
-                Wave/T DataSetNames=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":DataSetNames")
-                Wave/T GroupNames=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":GroupNames")
-                SVAR BrowserNameFldr=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":BrowserNameFldr")
-                Redimension/N=(0) DataSetNames, GroupNames
-//              DataSetNames[numpnts(DataSetNames)-1]=NI2_SelectedDatasetPath(bd)
-                BrowserNameFldr = NI2_HDF5GetTopBrowserName()           
-        else            //Old LoadDataset button...
-        
-                browserName = NI2_HDF5GetTopBrowserName()
-        
-                SetNI2HDF5BrowserData(browserName, bd)
-                
-                String datasetPath = NI2_SelectedDatasetPath(bd)
-        
-                String slabWaveStr = ""
-                ControlInfo /W=$bd.browserName UseHyperSelection
-                if (V_value)                                                            // Use Hyperselection is checked?
-                        slabWaveStr = bd.hyperSelectionWavePath
-                endif
-                WAVE/Z slabWave = $slabWaveStr                  // It is OK if wave does not exist and slabWave is NULL. HDF5LoadData will simply ignore /SLAB.
-                
-                Variable isCompound
-                String memberName
-                Variable compMode
-                NI2_HDF5GetCompLoadInfo(bd, isCompound, compMode, memberName)
-        
-                // If isFormalImage is true, we are loading an image written
-                // according to the HDF5 Image and Palette Specification.
-                Variable isFormalImage = 0
-                if (!isCompound)
-                        String savedDataFolder = NI2_SetBrowserDataFolder("")                   // tempClassAttribute goes in master HDF5Browser data folder
-                        HDF5LoadData /Z /O /N=tempClassAttribute /A="CLASS" /Q /VAR=1 bd.fileID, datasetPath
-                        if (V_flag == 0)
-                                WAVE/T tempClassAttribute                       // HDF5LoadData will have created this string
-                                if (CmpStr(tempClassAttribute[0],"IMAGE") == 0)
-                                        isFormalImage = 1
-                                endif   
-                                KillWaves/Z tempClassAttribute
-                        endif
-                        SetDataFolder savedDataFolder
-                endif
-                
-                Variable tableDisplayMode, graphDisplayMode             // 0=no; 1=display; 2=append
-                HDF5GetLoadDatasetOptions(bd.browserName, tableDisplayMode, graphDisplayMode)
-                
-                if (isFormalImage)
-                        HDF5LoadImage /O /GRPH=(graphDisplayMode) /T=(tableDisplayMode) bd.fileID, datasetPath
-                else
-                        Variable transpose2D = NI2_HDF5GetTranspose2DSetting(bd.browserName)
-                        HDF5LoadData /O /SLAB=slabWave /TRAN=(transpose2D) /COMP={compMode,memberName} /GRPH=(graphDisplayMode) /T=(tableDisplayMode) bd.fileID, datasetPath
-                endif
-        endif
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function LoadGroupButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-
-#if Exists("HDF5OpenFile")      
-        String browserName = NI2_HDF5GetTopBrowserName()
-
-        STRUCT NI2HDF5BrowserData bd
-        SetNI2HDF5BrowserData(browserName, bd)
-        
-        String groupPath = NI2_SelectedGroupPath(bd)
-
-        ControlInfo /W=$bd.browserName LoadGroupsRecursively
-        if (V_value)                                                                    // Use LoadGroupsRecursively is checked?
-                HDF5LoadGroup /O /R /T /IMAG=1 :, bd.fileID, groupPath
-        else
-                HDF5LoadGroup /O /T /IMAG=1 :, bd.fileID, groupPath
-        endif
-
-        // For debugging
-        Variable numItems
-        Variable debug = 1
-        if (debug)
-                Wave/Z/T groupPaths = root:groupPaths
-                if (WaveExists(groupPaths))
-                        numItems = ItemsInList(S_groupPaths)
-                        Redimension/N=(numItems) groupPaths
-                        groupPaths = StringFromList(p, S_groupPaths)
-                endif
-
-                Wave/Z/T dataFolderPaths = root:dataFolderPaths
-                if (WaveExists(dataFolderPaths))
-                        numItems = ItemsInList(S_dataFolderPaths)
-                        Redimension/N=(numItems) dataFolderPaths
-                        dataFolderPaths = StringFromList(p, S_dataFolderPaths)
-                endif
-
-                Wave/Z/T wavePaths = root:wavePaths
-                if (WaveExists(wavePaths))
-                        numItems = ItemsInList(S_objectPaths)
-                        Redimension/N=(numItems) wavePaths
-                        wavePaths = StringFromList(p, S_objectPaths)
-                endif
-        endif
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
+//
+//static Function SetNI2HDF5BrowserData(browserName, bd)
+//      String browserName
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      String savedDataFolder = NI2_SetBrowserDataFolder(browserName)
+//      
+//      // These statements set the structure fields to reference the corresponding waves and variables in the data folder.
+//      
+//      SVAR bd.browserName
+//      
+//      Wave/T bd.groupsList
+//      Wave/T bd.groupAttributesList
+//      Wave/T bd.datasetsList
+//      Wave/T bd.datasetAttributesList
+//      
+//      Wave/T bd.groupFullPaths
+//      SVAR bd.groupPath
+//
+//      SVAR bd.hyperSelectionWavePath
+//      
+//      NVAR bd.fileID
+//      SVAR bd.fileName
+//      SVAR bd.path
+//      SVAR bd.fullPath
+//      NVAR bd.readOnly
+//      
+//      SVAR bd.datasetInfo
+//      
+//      SetDataFolder savedDataFolder
+//End
+//
+//static Function CountSlashes(item)
+//      String item
+//      
+//      Variable slashes = 0
+//      Variable pos = 0
+//      
+//      do
+//              pos = strsearch(item, "/", pos)
+//              if (pos < 0)
+//                      break
+//              endif
+//              slashes += 1
+//              pos += 1
+//      while (1)
+//
+//      return slashes
+//End
+//
+//Function/S NI2_GetGroupHierarchy(fileID, startPath, level, mode)
+//      Variable fileID
+//      String startPath
+//      Variable level
+//      Variable mode                   // 0 to just get group names; 1 to get full path to each group.
+//
+//      String result = ""
+//
+//      String indent = ""                      // Used only for mode 0.
+//      Variable i, j
+//
+//#if Exists("HDF5ListGroup")   
+//      
+//      // This gives full hierarchy with full paths
+//      HDF5ListGroup /F /R /TYPE=1 fileID, startPath
+//      result = S_HDF5ListGroup
+//      
+//      if (mode == 0)                          // Want just names, not full paths
+//              result = ""
+//              Variable numItems = ItemsInList(S_HDF5ListGroup)
+//              for(i=0; i<numItems; i+=1)
+//                      String item = StringFromList(i, S_HDF5ListGroup)
+//                      level = CountSlashes(item)
+//                      indent = ""
+//                      for(j=0; j<level; j+=1)
+//                              indent += "    "
+//                      endfor
+//                      item = ParseFilePath(0, item, "/", 1, 0)                        // Get last element
+//                      item = indent + item                                            // Prepend indentation
+//                      result += item + ";"            
+//              endfor  
+//      endif
+//      
+//      return result
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function/S GetFileHierarchy(bd, mode)
+//      STRUCT NI2HDF5BrowserData &bd
+//      Variable mode                                           // 0 to just get group names; 1 to get full path to each group.
+//      
+//      if (bd.fileID == 0)                                                     // No file is open?
+//              return ""
+//      endif
+//      
+//      String hierarchy, rootName
+//      if (mode == 1)
+//              rootName = "/"                                  // For purposes of storing full path, use true root name
+//      else
+//              rootName = "root"                                       // For display purposes, use "root" as root name
+//      endif
+//      hierarchy = rootName + ";" + NI2_GetGroupHierarchy(bd.fileID, "/", 1, mode)
+//      
+//      return hierarchy
+//End
+//
+//static Function ResetListSelections(bd, resetGroupsList, resetGroupAttributesList, resetDatasetsList, resetDatasetAttributesList)
+//      STRUCT NI2HDF5BrowserData &bd
+//      Variable resetGroupsList, resetGroupAttributesList, resetDatasetsList, resetDatasetAttributesList
+//
+//      if (resetGroupsList)
+//              ListBox GroupsList, win=$bd.browserName, selRow=0
+//      endif
+//      if (resetGroupAttributesList)
+//              ListBox GroupAttributesList, win=$bd.browserName, selRow=0
+//      endif
+//      if (resetDatasetsList)
+//              ListBox DatasetsList, win=$bd.browserName, selRow=0
+//      endif
+//      if (resetDatasetAttributesList)
+//              ListBox DatasetAttributesList, win=$bd.browserName, selRow=0
+//      endif
+//End
+//
+//Function/S NI2_HDF5GetObjectFullPath(groupPath, objectName)
+//      String groupPath                                        // Path to parent group
+//      String objectName                               // Name of dataset or group in parent group
+//      
+//      String fullPath
+//      
+//      if (CmpStr(groupPath, "/") == 0)
+//              fullPath = "/" + objectName
+//      else
+//              fullPath = groupPath + "/" + objectName
+//      endif
+//      
+//      return fullPath
+//End
+//
+//Function/S NI2_GetTextPreviewString(tw)
+//      Wave/T tw                                               // tw has already been flattened to 1D.
+//      
+//      String preview, temp
+//      Variable len
+//      
+//      Variable row, numRows, totalLength
+//      
+//      totalLength = 0
+//
+//      numRows = numpnts(tw)
+//      if (numRows == 0)
+//              return ""
+//      endif
+//      
+//      preview = ""
+//      row = 0
+//      do
+//              temp = tw[row]
+//              temp = ReplaceString("\r", temp, "<CR>", 1)     // Convert CR to "\r"
+//              temp = ReplaceString("\n", temp, "<LF>", 1)     // Convert LF to "\n"
+//
+//              len = strlen(temp)
+//              if (len > 128)
+//                      if (numRows == 1)
+//                              sprintf preview, "\"%s\" . . . (%d characters total)", temp[0,127], len
+//                      else
+//                              preview += " . . . <Strings too long to display here>"
+//                      endif
+//                      
+//                      row = numRows                                                   // To prevent extra . . .
+//                      break
+//              endif
+//
+//              preview += "\"" + temp + "\""
+//              row += 1
+//              totalLength += len
+//
+//              if (row >= numRows)
+//                      break
+//              endif
+//              if (totalLength >= 256)                         // Enough is enough
+//                      break
+//              endif
+//
+//              preview += ", "
+//      while(1)
+//
+//      if (row < numRows)
+//              preview += " . . ."
+//      endif
+//
+//      return preview
+//End
+//
+//Function/S NI2_GetNumericPreviewString(w)
+//      Wave w                                                  // w has already been flattened to 1D.
+//
+//      String preview, temp
+//      
+//      Variable row, numRows, totalLength
+//      
+//      totalLength = 0
+//
+//      numRows = numpnts(w)
+//      if (numRows == 0)
+//              return ""
+//      endif
+//      
+//      preview = ""
+//      row = 0
+//      do
+//              sprintf temp, "%g", w[row]
+//              preview += temp
+//              row += 1
+//              totalLength += strlen(temp)
+//
+//              if (row >= numRows)
+//                      break
+//              endif
+//              if (totalLength >= 256)                                 // Enough is enough
+//                      break
+//              endif
+//
+//              preview += ", "
+//      while(1)
+//
+//      if (row < numRows)
+//              preview += " . . ."
+//      endif
+//      
+//      return preview
+//End
+//
+//Function/S NI2_GetPreviewString(locationID, objectType, di, fullPath, attributeName)
+//      Variable locationID
+//      Variable objectType                                             // 1 = group, 2 = dataset
+//      STRUCT NI2_HDF5DataInfo &di
+//      String fullPath                                                 // Full path to group or dataset
+//      String attributeName                                    // "" if this is a dataset, not an attribute
+//      
+//      String value = "<Can't display here>"
+//      String temp
+//      
+//      Variable rank = di.ndims
+//      Variable dim, numElements
+//      
+//      if (rank == 0)
+//              numElements = 1
+//      else
+//              numElements = di.dims[0]
+//              for(dim=1; dim<rank; dim+=1)
+//                      numElements *= di.dims[dim]             
+//              endfor
+//      endif
+//
+//#if Exists("HDF5LoadData")    
+//      strswitch(di.datatype_class_str)
+//              case "H5T_INTEGER":
+//              case "H5T_FLOAT":
+//              case "H5T_ENUM":
+//              case "H5T_OPAQUE":
+//              case "H5T_BITFIELD":
+//                      if (numElements > 100)
+//                              value = "<Too big to display here>"     // It would take too long to load.
+//                              break
+//                      endif
+//                      
+//                      HDF5LoadData /A=attributeName /N=tempNumericAttributeWave /O /Q /TYPE=(objectType) /VAR=0 /Z locationID, fullPath 
+//                      if (V_flag != 0)
+//                              value = "ERROR!"
+//                      else
+//                              Wave tempNumericAttributeWave
+//                              
+//                              if (rank > 1)
+//                                      // So we can treat multi-dimensional wave as one big row.
+//                                      Redimension/N=(numElements)/E=1 tempNumericAttributeWave
+//                              endif
+//                              
+//                              value = NI2_GetNumericPreviewString(tempNumericAttributeWave)
+//                      endif
+//                      KillWaves/Z tempNumericAttributeWave
+//                      break                           
+//
+//              case "H5T_REFERENCE":
+//                      if (numElements > 10)
+//                              value = "<Too big to display here>"     // It would take too long to load.
+//                              break
+//                      endif
+//              
+//                      HDF5LoadData /A=attributeName /N=tempTextAttributeWave /O /Q /TYPE=(objectType) /VAR=0 /Z locationID, fullPath 
+//                      if (V_flag != 0)
+//                              value = "ERROR!"
+//                      else
+//                              if (rank > 1)
+//                                      wave tempTextAttributeWave
+//                                      // So we can treat multi-dimensional wave as one big row.
+//                                      Redimension/N=(numElements)/E=1 tempTextAttributeWave
+//                              endif
+//                              
+//                              // Remove the prefix (e.g., "D:" for a dataset, which is there for
+//                              // programmatic use but would confuse in a preview.
+//                              Wave/T references = tempTextAttributeWave                       // Created by HDF5LoadData
+//                              String tmp
+//                              Variable npnts=numpnts(references), len
+//                              Variable i
+//                              for(i=0; i<npnts; i+=1)
+//                                      tmp = references[i]
+//                                      len = strlen(tmp)
+//                                      references[i] = tmp[2,len]
+//                              endfor
+//                              
+//                              value = NI2_GetTextPreviewString(references)
+//                      endif
+//                      KillWaves/Z tempTextAttributeWave
+//                      break                           
+//
+//              case "H5T_STRING":
+//                      if (numElements > 100)
+//                              value = "<Too big to display here>"     // It would take too long to load.
+//                              break
+//                      endif
+//              
+//                      HDF5LoadData /A=attributeName /N=tempTextAttributeWave /O /Q /TYPE=(objectType) /VAR=0 /Z locationID, fullPath 
+//                      if (V_flag != 0)
+//                              value = "ERROR!"
+//                      else
+//                              if (rank > 1)
+//                                      // So we can treat multi-dimensional wave as one big row.
+//                                      Redimension/N=(numElements)/E=1 tempTextAttributeWave
+//                              endif
+//                              value = NI2_GetTextPreviewString(tempTextAttributeWave)
+//                      endif
+//                      KillWaves/Z tempTextAttributeWave
+//                      break                           
+//                      
+//              case "H5T_TIME":
+//              case "H5T_COMPOUND":
+//              case "H5T_VLEN":
+//              case "H5T_ARRAY":
+//                      value = "<Can't display this type here>"
+//                      break
+//      endswitch
+//      
+//      return value
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function FillDatasetsList(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//
+//#if Exists("HDF5ListGroup")   
+//      HDF5ListGroup /TYPE=2 bd.fileID, bd.groupPath
+//      Variable numItemsInList = ItemsInList(S_HDF5ListGroup)
+//      
+//      if (numItemsInList == 0)
+//              Redimension/N=0 bd.datasetsList
+//      else
+//              Redimension/N=(numItemsInList, 5) bd.datasetsList
+//              SetDimLabel 1, 0, Dataset, bd.datasetsList
+//              SetDimLabel 1, 1, Rank, bd.datasetsList
+//              SetDimLabel 1, 2, 'Dim Sizes', bd.datasetsList
+//              SetDimLabel 1, 3, Type, bd.datasetsList
+//              SetDimLabel 1, 4, Value, bd.datasetsList
+//              bd.datasetsList[][0] = StringFromList(p, S_HDF5ListGroup)
+//      
+//              String dataset
+//              Variable i, numDatasets
+//              Variable err
+//              numDatasets = ItemsInList(S_HDF5ListGroup)
+//              for(i=0; i<numDatasets; i+=1)
+//                      dataset = StringFromList(i, S_HDF5ListGroup)
+//                      String fullPath = NI2_HDF5GetObjectFullPath(bd.groupPath, dataset)
+//#if(IgorVersion()<9)
+//                      STRUCT NI2_HDF5DataInfo di
+//                      NI2_InitHDF5DataInfo(di)                        // Set input fields.
+//                      HDF5DatasetInfo(bd.fileID, fullPath, 0, di)
+//#else
+//                      STRUCT HDF5DataInfo di
+//                      InitHDF5DataInfo(di)                    // Set input fields.
+//                      err = HDF5DatasetInfo(bd.fileID, fullPath, 0, di)
+//#endif                
+//                      
+//                      
+//                      Variable rank = di.ndims
+//                      bd.datasetsList[i][1] = num2istr(rank)
+//                      
+//                      String dimsStr=""
+//                      Variable dim
+//                      for(dim=0; dim<rank; dim+=1)
+//                              dimsStr += num2istr(di.dims[dim]) + ";"
+//                      endfor
+//                      bd.datasetsList[i][2] = dimsStr
+//
+//                      bd.datasetsList[i][3] = di.datatype_str
+//
+//                      String preview = NI2_GetPreviewString(bd.fileID, 2, di, fullPath, "")
+//                      bd.datasetsList[i][4] = preview
+//              endfor
+//      endif
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//              
+//static Function FillGroupAttributesList(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//
+//#if Exists("HDF5ListAttributes")      
+//      Variable numAttributes = 0
+//      String groupPath = bd.groupPath
+//      if (strlen(groupPath) > 0)
+//              HDF5ListAttributes/TYPE=1 bd.fileID, groupPath
+//              numAttributes = ItemsInList(S_HDF5ListAttributes)
+//      endif
+//      
+//      if (numAttributes == 0)
+//              Redimension/N=0 bd.groupAttributesList
+//      else
+//              Redimension/N=(numAttributes, 5) bd.groupAttributesList
+//              SetDimLabel 1, 0, Attribute,bd.groupAttributesList
+//              SetDimLabel 1, 1, Rank,bd.groupAttributesList
+//              SetDimLabel 1, 2, 'Dim Sizes',bd.groupAttributesList
+//              SetDimLabel 1, 3, Type,bd.groupAttributesList
+//              SetDimLabel 1, 4, Value,bd.groupAttributesList
+//              bd.groupAttributesList[][0] = StringFromList(p, S_HDF5ListAttributes)
+//      
+//              String attribute
+//              Variable i
+//              for(i=0; i<numAttributes; i+=1)
+//                      String attributeName
+//                      attributeName = StringFromList(i, S_HDF5ListAttributes)
+//                      attribute = attributeName
+//
+//                      STRUCT NI2_HDF5DataInfo di
+//                      NI2_InitHDF5DataInfo(di)                        // Set input fields.
+//                      HDF5AttributeInfo(bd.fileID, groupPath, 1, attribute, 0, di)
+//                      
+//                      Variable rank = di.ndims
+//                      bd.groupAttributesList[i][1] = num2istr(rank)
+//                      
+//                      String dimsStr=""
+//                      Variable dim
+//                      for(dim=0; dim<rank; dim+=1)
+//                              dimsStr += num2istr(di.dims[dim]) + ";"
+//                      endfor
+//                      bd.groupAttributesList[i][2] = dimsStr
+//
+//                      bd.groupAttributesList[i][3] = di.datatype_str
+//
+//                      String preview = NI2_GetPreviewString(bd.fileID, 1, di, groupPath, attributeName)
+//                      bd.groupAttributesList[i][4] = preview
+//              endfor
+//      endif
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//              
+//static Function FillDatasetAttributesList(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//
+//#if Exists("HDF5ListAttributes")      
+//      Variable numAttributes = 0
+//      String datasetPath = NI2_SelectedDatasetPath(bd)
+//      if (strlen(datasetPath) > 0)
+//              HDF5ListAttributes/TYPE=2 bd.fileID, datasetPath
+//              numAttributes = ItemsInList(S_HDF5ListAttributes)
+//      endif
+//      
+//      if (numAttributes == 0)
+//              Redimension/N=0 bd.datasetAttributesList
+//      else
+//              Redimension/N=(numAttributes, 5) bd.datasetAttributesList
+//              SetDimLabel 1, 0, Attribute,bd.datasetAttributesList
+//              SetDimLabel 1, 1, Rank,bd.datasetAttributesList
+//              SetDimLabel 1, 2, 'Dim Sizes',bd.datasetAttributesList
+//              SetDimLabel 1, 3, Type,bd.datasetAttributesList
+//              SetDimLabel 1, 4, Value,bd.datasetAttributesList
+//              bd.datasetAttributesList[][0] = StringFromList(p, S_HDF5ListAttributes)
+//      
+//              String attribute
+//              Variable i
+//              for(i=0; i<numAttributes; i+=1)
+//                      String attributeName
+//                      attributeName = StringFromList(i, S_HDF5ListAttributes)
+//                      attribute = attributeName
+//
+//                      STRUCT NI2_HDF5DataInfo di
+//                      NI2_InitHDF5DataInfo(di)                        // Set input fields.
+//                      HDF5AttributeInfo(bd.fileID, datasetPath, 2, attribute, 0, di)
+//                      
+//                      Variable rank = di.ndims
+//                      bd.datasetAttributesList[i][1] = num2istr(rank)
+//                      
+//                      String dimsStr=""
+//                      Variable dim
+//                      for(dim=0; dim<rank; dim+=1)
+//                              dimsStr += num2istr(di.dims[dim]) + ";"
+//                      endfor
+//                      bd.datasetAttributesList[i][2] = dimsStr
+//
+//                      bd.datasetAttributesList[i][3] = di.datatype_str
+//
+//                      String preview = NI2_GetPreviewString(bd.fileID, 2, di, datasetPath, attributeName)
+//                      bd.datasetAttributesList[i][4] = preview
+//              endfor
+//      endif
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//      
+//static Function FillLists(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//
+//      if (bd.fileID == 0)                                                     // No file is open?
+//              Redimension/N=(0) bd.groupsList
+//              Redimension/N=(0) bd.groupAttributesList
+//              Redimension/N=(0) bd.datasetsList
+//              Redimension/N=(0) bd.datasetAttributesList
+//              return -1
+//      endif
+//      
+//      Variable numItemsInList
+//      String hierarchy
+//      
+//      // Show entire hierarchy in Groups list.
+//      hierarchy = GetFileHierarchy(bd, 0)     
+//      numItemsInList = ItemsInList(hierarchy)
+//      Redimension/N=(numItemsInList) bd.groupsList
+//      bd.groupsList = StringFromList(p, hierarchy)
+//      
+//      // The groupFullPaths wave stores the full path to each group
+//      hierarchy = GetFileHierarchy(bd, 1)     
+//      numItemsInList = ItemsInList(hierarchy)
+//      Redimension/N=(numItemsInList) bd.groupFullPaths
+//      bd.groupFullPaths = StringFromList(p, hierarchy)
+//      
+//      // Show datasets in current group in Datasets list.
+//      FillDatasetsList(bd)
+//      
+//      // Show attributes of currently-selected group.
+//      FillGroupAttributesList(bd)
+//      
+//      // Show attributes of currently-selected dataset.
+//      FillDatasetAttributesList(bd)
+//End
+//
+//Function/S NI2_SelectedGroupName(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      if (numpnts(bd.groupsList) == 0)
+//              return ""
+//      endif
+//
+//      ControlInfo/W=$bd.browserName GroupsList
+//      Variable selRow = V_value
+//      String groupName = bd.groupsList[selRow]
+//
+//      // Group names may have leading spaces at this point. The spaces are used to create
+//      // indentation in the list to show the hierarchy. We must remove the leading spaces.
+//      sscanf groupName, " %s", groupName
+//
+//      if (strlen(groupName) > 0)
+//              return groupName
+//      endif
+//
+//      return ""
+//End
+//
+//Function/S NI2_SelectedGroupPath(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      String groupPath = bd.groupPath
+//
+//      return groupPath
+//End
+//
+//Function/S NI2_SelectedDatasetName(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      if (numpnts(bd.datasetsList) == 0)
+//              return ""
+//      endif
+//
+//      ControlInfo/W=$bd.browserName DatasetsList
+//      Variable selRow = V_value
+//      String datasetName = bd.datasetsList[selRow][0]
+//      if (strlen(datasetName) > 0)
+//              return datasetName
+//      endif
+//
+//      return ""
+//End
+//
+//Function/S NI2_SelectedDatasetPath(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//
+//      String datasetName = NI2_SelectedDatasetName(bd)
+//      if (strlen(datasetName) == 0)
+//              return ""                                               // Nothing is selected
+//      endif
+//      
+//      String datasetPath = bd.groupPath
+//      if (CmpStr(datasetPath[strlen(datasetPath)-1],"/") != 0)
+//              datasetPath += "/"
+//      endif
+//      datasetPath += datasetName
+//
+//      return datasetPath
+//End
+//
+//Function/S NI2_SelectedAttributeName(bd, isGroupAttribute)
+//      STRUCT NI2HDF5BrowserData &bd
+//      Variable isGroupAttribute
+//
+//      String controlName
+//      if (isGroupAttribute)
+//              controlName = "GroupAttributesList"
+//              Wave/T list = bd.groupAttributesList
+//      else
+//              controlName = "DatasetAttributesList"
+//              Wave/T list = bd.datasetAttributesList
+//      endif
+//      
+//      if (numpnts(list) == 0)
+//              return ""
+//      endif
+//
+//      ControlInfo/W=$bd.browserName $controlName
+//      Variable selRow = V_value
+//      String attributeName = list[selRow][0]
+//      
+//      if (strlen(attributeName) > 0)
+//              return attributeName
+//      endif
+//
+//      return ""
+//End
+//
+//Function/S NI2_SelectedAttributePath(bd, isGroupAttribute)
+//      STRUCT NI2HDF5BrowserData &bd
+//      Variable isGroupAttribute
+//
+//      String attributeName = NI2_SelectedAttributeName(bd, isGroupAttribute)
+//      if (strlen(attributeName) == 0)
+//              return ""                                               // Nothing is selected
+//      endif
+//      
+//      String path
+//      if (isGroupAttribute)
+//              path = NI2_SelectedGroupPath(bd)
+//      else
+//              path = NI2_SelectedDatasetPath(bd)
+//      endif
+//      
+//      path += "/" + attributeName
+//
+//      return path
+//End
+//
+//StrConstant NI2_kLoadAllMembersString = "_Load_All_Members_"
+//
+//static Function SetMembersPopupMenu(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//#if Exists("HDF5OpenFile")    
+//      Variable hideMembers
+//      String memberList
+//
+//      hideMembers = 1
+//      memberList = NI2_kLoadAllMembersString + ";"
+//      
+//      if (bd.fileID != 0)                             // File is open for this browser?
+//              String fullPath
+//              
+//              fullPath = NI2_SelectedDatasetPath(bd)
+//              if (strlen(fullPath) > 0)
+//                      STRUCT NI2_HDF5DataInfo di
+//                      NI2_InitHDF5DataInfo(di)
+//                      HDF5DatasetInfo(bd.fileID, fullPath, 0, di)
+//                      if (CmpStr(di.datatype_class_str, "H5T_COMPOUND") == 0)
+//                              hideMembers = 0
+//                              
+//                              ControlInfo /W=$bd.browserName Members
+//                              Variable selectedItemNumber = V_Value
+//                              STRUCT NI2_HDF5DatatypeInfo dti
+//                              NI2_InitHDF5DatatypeInfo(dti)
+//                              if (HDF5TypeInfo(bd.fileID, fullPath, "", "", 1, dti))
+//                                      memberList += "HDF5TypeInfo Error!"
+//                              else
+//                                      memberList += dti.names
+//                                      if (selectedItemNumber > dti.nmembers+1)        // +1 because of "_Load_All_Members_" item.
+//                                              selectedItemNumber = 1          // Force menu selection to be in bounds.
+//                                      endif
+//                              endif
+//                              PopupMenu Members, win=$bd.browserName, mode=selectedItemNumber
+//                      endif
+//              endif
+//      endif
+//      
+//      PopupMenu Members, win=$bd.browserName, disable=hideMembers
+//      
+//      String cmd                              // What a pain. Can't use local variable with PopupMenu value=
+//      sprintf cmd, "PopupMenu Members, win=%s, value=\"%s\"", bd.browserName, memberList
+//      Execute cmd
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//Function NI2_HDF5GetReadOnlySetting(browserName)
+//      String browserName
+//      
+//      Variable result
+//      ControlInfo /W=$browserName ReadOnly
+//      result = V_value
+//      return result
+//End
+//
+//Function NI2_HDF5GetCompLoadInfo(bd, isCompound, compMode, memberName)
+//      STRUCT NI2HDF5BrowserData &bd
+//      Variable &isCompound                                    // Output: If non-zero, a compound dataset is selected.
+//      Variable &compMode                                              // Output: Value suitable for passing to HDF5LoadData /COMP flag.
+//      String &memberName                                              // Output: If "" load all members.
+//      
+//      isCompound = 0
+//      memberName = ""
+//      
+//      ControlInfo /W=$bd.browserName Members
+//      if (V_disable == 0)
+//              isCompound = 1
+//              memberName = S_value
+//              if (CmpStr(memberName, NI2_kLoadAllMembersString) == 0)
+//                      memberName = ""
+//              endif
+//      endif
+//
+//      compMode = isCompound && strlen(memberName)>0
+//End
+//
+//Function NI2_HDF5GetTranspose2DSetting(browserName)
+//      String browserName
+//      
+//      Variable result
+//      ControlInfo /W=$browserName Transpose2DDatasets
+//      result = V_value
+//      return result
+//End
+//
+//static Function HDF5GetLoadDatasetOptions(browserName, tableDisplayMode, graphDisplayMode)
+//      String browserName
+//      Variable &tableDisplayMode, &graphDisplayMode
+//      
+//      ControlInfo /W=$browserName DisplayInTable
+//      tableDisplayMode = V_value - 1                                          // 0=no; 1=display; 2=append
+//      
+//      ControlInfo /W=$browserName DisplayInGraph
+//      graphDisplayMode = V_value - 1                                          // 0=no; 1=display; 2=append
+//      
+//      return tableDisplayMode || graphDisplayMode
+//End
+//
+//static Function MembersPopupProc(ctrlName,popNum,popStr) : PopupMenuControl
+//      String ctrlName
+//      Variable popNum
+//      String popStr
+//      
+//      String browserName = NI2_HDF5GetTopBrowserName()
+//      
+//      STRUCT NI2HDF5BrowserData bd
+//      SetNI2HDF5BrowserData(browserName, bd)
+//      
+//      NI2_HDF5DisplaySelectedDataset(bd)
+//End
+//
+//static Function SetButtonStates(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      if (bd.fileID == 0)                             // No file is open for this browser?
+//              Button CreateFile, win=$bd.browserName, disable=2               // Enable Create
+//              Button OpenFile, win=$bd.browserName, disable=0         // Enable Open
+//              Button CloseFile, win=$bd.browserName, disable=2                // Disable Close
+//              Button LoadGroup, win=$bd.browserName, disable=2                // Disable Load Group
+//              Button SaveDataFolder, win=$bd.browserName, disable=2   // Disable Save Data Folder
+//              Button LoadDataset, win=$bd.browserName, disable=2      // Disable Load Dataset
+//              Button SaveWaves, win=$bd.browserName, disable=2                // Disable Save Waves
+//      else
+//              Button CreateFile, win=$bd.browserName, disable=2               // Disable Create
+//              Button OpenFile, win=$bd.browserName, disable=2         // Disable Open
+//              Button CloseFile, win=$bd.browserName, disable=0                // Enable Close
+//              
+//              String groupName = NI2_SelectedGroupName(bd)
+//              Variable code = strlen(groupName) > 0 ? 0:2
+//              Button LoadGroup, win=$bd.browserName, disable=code     // Enable Load Group
+//              code = bd.readOnly == 0 ? 0:2
+//              Button SaveDataFolder, win=$bd.browserName, disable=code        // Enable Save Data Folder
+//              
+//              String datasetName = NI2_SelectedDatasetName(bd)
+//              code = strlen(datasetName) > 0 ? 0:2
+//              Button LoadDataset, win=$bd.browserName, disable=code   // Enable Load Dataset
+//              code = bd.readOnly == 0 ? 0:2
+//              Button SaveWaves, win=$bd.browserName, disable=code             // Enable Save Waves
+//              //overwrite the code above...
+//              Button LoadGroup, win=$bd.browserName, disable=2        // Disable Load Dataset
+//              Button LoadDataset, win=$bd.browserName, disable=2      // Disable Load Dataset
+//      endif
+//      SetMembersPopupMenu(bd)
+//      SetGraphButtonTitle(bd.browserName)
+//      SetTableButtonTitle(bd.browserName)
+//      SetDumpButtonTitle(bd.browserName)
+//      SetVariable HyperSelectionWave, win=$bd.browserName, value= bd.hyperSelectionWavePath
+//End
+//
+//static Function DrawFilePath(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      // TitleBox FilePath, win=$bd.browserName, title=bd.fullPath                    // This is limited to 63 characters.
+//      TitleBox FilePath, win=$bd.browserName, variable=bd.fullPath
+//End
+//
+//static Function DrawGroupPath(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      TitleBox GroupPath, win=$bd.browserName, variable=bd.groupPath
+//End
+//
+//static Function DrawDatasetInfo(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      TitleBox Dataset, win=$bd.browserName, variable=bd.datasetInfo
+//End
+//
+//static Function UpdateAfterFileCreateOrOpen(isCreate, browserName, fileID, path, fileName)
+//      Variable isCreate
+//      String browserName
+//      Variable fileID
+//      String path, fileName
+//      
+//      STRUCT NI2HDF5BrowserData bd
+//      SetNI2HDF5BrowserData(browserName, bd)
+//
+//      ResetListSelections(bd, 1, 1, 1, 1)
+//
+//      bd.fileID = fileID
+//      bd.fileName = fileName
+//      bd.path = path
+//      bd.fullPath = path + fileName
+//      DrawFilePath(bd)
+//      
+//      bd.readOnly = isCreate ? 0 : NI2_HDF5GetReadOnlySetting(browserName)
+//
+//      bd.groupPath = "/"
+//      DrawGroupPath(bd)
+//
+//      SetButtonStates(bd)
+//
+//      FillLists(bd)
+//      
+//      NI2_UpdateAfterGroupSelected(bd, "/")
+//      
+//      String datasetName = NI2_SelectedDatasetName(bd)
+//      if (strlen(datasetName) > 0)
+//              NI2_SelectDataset(bd, datasetName)
+//      endif
+//End
+//
+//static Function CreateFileButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//      
+//#if Exists("HDF5OpenFile")    
+//      String browserName = NI2_HDF5GetTopBrowserName()
+//
+//      STRUCT NI2HDF5BrowserData bd
+//      SetNI2HDF5BrowserData(browserName, bd)
+//      
+//      Variable fileID
+//      
+//      HDF5CreateFile /I /O fileID  as ""
+//      if (V_flag == 0)                // Create OK?
+//              UpdateAfterFileCreateOrOpen(1, browserName, fileID, S_path, S_fileName)
+//      endif
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function OpenFileButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//      
+//#if Exists("HDF5OpenFile")    
+//      String browserName = NI2_HDF5GetTopBrowserName()
+//      
+//      Variable readOnly = NI2_HDF5GetReadOnlySetting(browserName)
+//      
+//      Variable locFileID
+//      
+//      if (readOnly)
+//              HDF5OpenFile/R locFileID as ""
+//      else
+//              HDF5OpenFile locFileID as ""
+//      endif
+//      
+//      if (V_flag == 0)                                        // Open OK?
+//              UpdateAfterFileCreateOrOpen(0, browserName, locFileID, S_path, S_fileName)
+//      endif
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//// This detects if the file is no longer open, such as if you save the experiment, quit Igor and then reopen the experiment.
+//Function NI2_FileWasUnexpectedlyClosed(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//
+//#if Exists("HDF5OpenFile")    
+//      if (bd.fileID == 0)
+//              return 0                                // File is closed but not unexpectedly.
+//      endif
+//      
+//      HDF5ListAttributes/Q /TYPE=1 /Z bd.fileID , "/"         // Try to list the attributes of the root of the file.
+//      if (V_flag != 0)
+//              return 1                                                                // Error: Assume file was closed.
+//      endif
+//      
+//      return 0
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function FileWasClosed(bd)                     // Does cleanup after a file is closed.
+//      STRUCT NI2HDF5BrowserData &bd
+//
+//      bd.fileID = 0
+//      Redimension/N=(0) bd.groupFullPaths
+//      bd.groupPath = ""
+//      bd.fileName = ""
+//      bd.path = ""
+//      bd.fullPath = ""
+//      bd.datasetInfo = ""
+//
+//      DrawFilePath(bd)
+//      SetButtonStates(bd)
+//      FillLists(bd)
+//End
+//
+//static Function CloseFileButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//      
+//#if Exists("HDF5OpenFile")    
+//      String browserName = NI2_HDF5GetTopBrowserName()
+//
+//      STRUCT NI2HDF5BrowserData bd
+//      SetNI2HDF5BrowserData(browserName, bd)
+//
+//      HDF5CloseFile bd.fileID
+//      CloseSavePanels()
+//      FileWasClosed(bd)
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function LoadDatasetButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//
+//#if Exists("HDF5OpenFile")    
+//      String browserName
+//      STRUCT NI2HDF5BrowserData bd
+//      
+//      if(stringmatch(ctrlName,"AddGrouptoList"))
+//              
+//              browserName = NI2_HDF5GetTopBrowserName()
+//      
+//              SetNI2HDF5BrowserData(browserName, bd)
+//              
+//              Wave/T DataSetNames=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":DataSetNames")
+//              Wave/T GroupNames=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":GroupNames")
+//              SVAR BrowserNameFldr=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":BrowserNameFldr")
+//              Redimension/N=(numpnts(DataSetNames)+1) GroupNames
+//              GroupNames[numpnts(GroupNames)-1]=NI2_SelectedGroupPath(bd)
+//              BrowserNameFldr = NI2_HDF5GetTopBrowserName()
+//      elseif(stringmatch(ctrlName,"ClearDatasetList"))
+//              browserName = NI2_HDF5GetTopBrowserName()       
+//              SetNI2HDF5BrowserData(browserName, bd)          
+//              Wave/T DataSetNames=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":DataSetNames")
+//              Wave/T GroupNames=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":GroupNames")
+//              SVAR BrowserNameFldr=$("root:Packages:"+NI2_GetHDF5LoaderLocString()+":BrowserNameFldr")
+//              Redimension/N=(0) DataSetNames, GroupNames
+////            DataSetNames[numpnts(DataSetNames)-1]=NI2_SelectedDatasetPath(bd)
+//              BrowserNameFldr = NI2_HDF5GetTopBrowserName()           
+//      else            //Old LoadDataset button...
+//      
+//              browserName = NI2_HDF5GetTopBrowserName()
+//      
+//              SetNI2HDF5BrowserData(browserName, bd)
+//              
+//              String datasetPath = NI2_SelectedDatasetPath(bd)
+//      
+//              String slabWaveStr = ""
+//              ControlInfo /W=$bd.browserName UseHyperSelection
+//              if (V_value)                                                            // Use Hyperselection is checked?
+//                      slabWaveStr = bd.hyperSelectionWavePath
+//              endif
+//              WAVE/Z slabWave = $slabWaveStr                  // It is OK if wave does not exist and slabWave is NULL. HDF5LoadData will simply ignore /SLAB.
+//              
+//              Variable isCompound
+//              String memberName
+//              Variable compMode
+//              NI2_HDF5GetCompLoadInfo(bd, isCompound, compMode, memberName)
+//      
+//              // If isFormalImage is true, we are loading an image written
+//              // according to the HDF5 Image and Palette Specification.
+//              Variable isFormalImage = 0
+//              if (!isCompound)
+//                      String savedDataFolder = NI2_SetBrowserDataFolder("")                   // tempClassAttribute goes in master HDF5Browser data folder
+//                      HDF5LoadData /Z /O /N=tempClassAttribute /A="CLASS" /Q /VAR=1 bd.fileID, datasetPath
+//                      if (V_flag == 0)
+//                              WAVE/T tempClassAttribute                       // HDF5LoadData will have created this string
+//                              if (CmpStr(tempClassAttribute[0],"IMAGE") == 0)
+//                                      isFormalImage = 1
+//                              endif   
+//                              KillWaves/Z tempClassAttribute
+//                      endif
+//                      SetDataFolder savedDataFolder
+//              endif
+//              
+//              Variable tableDisplayMode, graphDisplayMode             // 0=no; 1=display; 2=append
+//              HDF5GetLoadDatasetOptions(bd.browserName, tableDisplayMode, graphDisplayMode)
+//              
+//              if (isFormalImage)
+//                      HDF5LoadImage /O /GRPH=(graphDisplayMode) /T=(tableDisplayMode) bd.fileID, datasetPath
+//              else
+//                      Variable transpose2D = NI2_HDF5GetTranspose2DSetting(bd.browserName)
+//                      HDF5LoadData /O /SLAB=slabWave /TRAN=(transpose2D) /COMP={compMode,memberName} /GRPH=(graphDisplayMode) /T=(tableDisplayMode) bd.fileID, datasetPath
+//              endif
+//      endif
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function LoadGroupButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//
+//#if Exists("HDF5OpenFile")    
+//      String browserName = NI2_HDF5GetTopBrowserName()
+//
+//      STRUCT NI2HDF5BrowserData bd
+//      SetNI2HDF5BrowserData(browserName, bd)
+//      
+//      String groupPath = NI2_SelectedGroupPath(bd)
+//
+//      ControlInfo /W=$bd.browserName LoadGroupsRecursively
+//      if (V_value)                                                                    // Use LoadGroupsRecursively is checked?
+//              HDF5LoadGroup /O /R /T /IMAG=1 :, bd.fileID, groupPath
+//      else
+//              HDF5LoadGroup /O /T /IMAG=1 :, bd.fileID, groupPath
+//      endif
+//
+//      // For debugging
+//      Variable numItems
+//      Variable debug = 1
+//      if (debug)
+//              Wave/Z/T groupPaths = root:groupPaths
+//              if (WaveExists(groupPaths))
+//                      numItems = ItemsInList(S_groupPaths)
+//                      Redimension/N=(numItems) groupPaths
+//                      groupPaths = StringFromList(p, S_groupPaths)
+//              endif
+//
+//              Wave/Z/T dataFolderPaths = root:dataFolderPaths
+//              if (WaveExists(dataFolderPaths))
+//                      numItems = ItemsInList(S_dataFolderPaths)
+//                      Redimension/N=(numItems) dataFolderPaths
+//                      dataFolderPaths = StringFromList(p, S_dataFolderPaths)
+//              endif
+//
+//              Wave/Z/T wavePaths = root:wavePaths
+//              if (WaveExists(wavePaths))
+//                      numItems = ItemsInList(S_objectPaths)
+//                      Redimension/N=(numItems) wavePaths
+//                      wavePaths = StringFromList(p, S_objectPaths)
+//              endif
+//      endif
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
 Function NI2_AttachListWaves(bd)
-        STRUCT NI2HDF5BrowserData &bd
+        STRUCT HDF5BrowserData &bd
         
         ListBox GroupsList win=$bd.browserName, listWave=bd.groupsList
@@ -1264 +1272 @@
         ListBox DatasetAttributesList win=$bd.browserName, listWave=bd.datasetAttributesList
 End
-
-Function NI2_HDF5BrowserPanelHook(infoStr)
-        String infoStr
-
-#if Exists("HDF5OpenFile")      
-        String browserName= StringByKey("WINDOW",infoStr)
-        String event= StringByKey("EVENT",infoStr)
-
-        STRUCT NI2HDF5BrowserData bd
-        SetNI2HDF5BrowserData(browserName, bd)
-
-        strswitch(event)
-                case "activate":                                // We do not get this on Windows when the panel is first created.
-                        // This detects if the file is no longer open, such as if you save the experiment, quit Igor and then reopen the experiment.
-                        if (NI2_FileWasUnexpectedlyClosed(bd))
-                                Printf "The file \"%s\" is no longer open.\r", bd.fileName
-                                FileWasClosed(bd)
-                        endif
-                        
-                        SetGraphButtonTitle(browserName)
-                        SetTableButtonTitle(browserName)
-                        SetDumpButtonTitle(browserName)
-                        break
-
-                case "resize":
-                        NI2_HDF5ResizeBrowser(browserName)
-                        break
-                        
-                case "moved":                   // This message was added in Igor Pro 5.04B07.
-                        // If this is the last HDF5 browser, save the browser window size and position.
-                        if (strlen(NI2_HDF5GetIndxBrowserName(1)) == 0)
-                                SetPrefWindowCoords(browserName)
-                        endif
-                        break
-                        
-                case "kill":
-                        if (bd.fileID != 0)
-                                HDF5CloseFile bd.fileID
-                                bd.fileID = 0
-                                CloseSavePanels()
-                        endif
-                        KillDataFolder root:Packages:HDF5Browser:$browserName
-                        break
-        endswitch
-        
-        return 0
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-Function NI2_SelectDataset(bd, datasetName)
-        STRUCT NI2HDF5BrowserData &bd
-        String datasetName
-
-#if Exists("HDF5OpenFile")      
-        String info
-
-        if (strlen(datasetName) == 0)
-                info = ""
-        else
-                String fullPath
-                fullPath = NI2_HDF5GetObjectFullPath(bd.groupPath, datasetName)
-                STRUCT NI2_HDF5DataInfo di
-                NI2_InitHDF5DataInfo(di)                        // Set input fields.
-                HDF5DatasetInfo(bd.fileID, fullPath, 0, di)
-                // Print s
-                sprintf info, "%s, class=%s", datasetName, di.datatype_class_str
-        endif
-        bd.datasetInfo = info
-        DrawDatasetInfo(bd)
-        SetButtonStates(bd)
-        FillDatasetAttributesList(bd)
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-Function NI2_UpdateAfterGroupSelected(bd, fullGroupPath)
-        STRUCT NI2HDF5BrowserData &bd
-        String fullGroupPath
-        
-        Variable selectedGroupChanged = CmpStr(bd.groupPath, fullGroupPath) != 0
-
-        bd.groupPath = fullGroupPath
-        DrawGroupPath(bd)
-        FillGroupAttributesList(bd)
-        FillDatasetsList(bd)
-
-        if (selectedGroupChanged)
-                ResetListSelections(bd, 0, 1, 1, 1)
-                String datasetName = ""
-                if (numpnts(bd.datasetsList) > 0)
-                        datasetName = bd.datasetsList[0][0]
-                endif
-                NI2_SelectDataset(bd, datasetName)
-        endif
-        SetButtonStates(bd)
-End
-
-static Function GroupsListActionProc(s, bd) : ListboxControl
-        STRUCT WMListboxAction &s
-        STRUCT NI2HDF5BrowserData &bd
-        
-        String browserName = s.win
-        Variable result = 0                                                                     // As of now, the return value must always be zero.
-        
-        switch(s.eventCode)
-                case 4:                                         // Cell selection
-                        String fullGroupPath = bd.groupFullPaths[s.row]
-                        NI2_UpdateAfterGroupSelected(bd, fullGroupPath)
-                        // Printf "Row=%d, column=%d, path=%s\r", s.row, s.col, fullGroupPath
-                        if (NI2_HDF5BrowserDumpIsVisible())
-                                NI2_HDF5DisplayDumpOfSelGroup(bd)
-                        endif
-                        break   
-        endswitch
-
-        return result
-End
-
-static Function GroupAttributesListActionProc(s, bd) : ListboxControl
-        STRUCT WMListboxAction &s
-        STRUCT NI2HDF5BrowserData &bd
-        
-        String browserName = s.win
-        Variable result = 0                                                                     // As of now, the return value must always be zero.
-        
-        switch(s.eventCode)
-                case 3:                                         // Double-click
-                        break;
-                        
-                case 4:                                         // Cell selection
-                        // Printf "Row=%d, column=%d\r", s.row, s.col
-                        NI2_HDF5DisplaySelAttribute(bd,  1)                             // Update various windows if they are displayed
-                        break   
-        endswitch
-
-        return result
-End
-
-Function NI2_HandleDatasetDoubleClick(s, bd)
-        STRUCT WMListboxAction &s
-        STRUCT NI2HDF5BrowserData &bd
-
-#if Exists("HDF5OpenFile")      
-        String datasetPath = NI2_SelectedDatasetPath(bd)
-        if (strlen(datasetPath) == 0)
-                return -1
-        endif
-        
-        STRUCT NI2_HDF5DataInfo di
-        NI2_InitHDF5DataInfo(di)
-        HDF5DatasetInfo(bd.fileID, datasetPath, 0, di)
-        switch(di.datatype_class)
-                default:
-                        // Load dataset here.
-                        break   
-        endswitch
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function DatasetsListActionProc(s, bd) : ListboxControl
-        STRUCT WMListboxAction &s
-        STRUCT NI2HDF5BrowserData &bd
-        
-        String browserName = s.win
-        Variable result = 0                                                                     // As of now, the return value must always be zero.
-        
-        switch(s.eventCode)
-                case 3:                                         // Double-click
-                        NI2_HandleDatasetDoubleClick(s, bd)
-                        break;
-                        
-                case 4:                                         // Cell selection
-                        String name = bd.datasetsList[s.row][0]
-                        NI2_SelectDataset(bd, name)
-                        // Printf "Row=%d, column=%d, name=%s\r", s.row, s.col, name
-                        NI2_HDF5DisplaySelectedDataset(bd)                                      // Update various windows if they are displayed
-                        break   
-        endswitch
-        
-        return result
-End
-
-static Function DatasetAttributesListActionProc(s, bd) : ListboxControl
-        STRUCT WMListboxAction &s
-        STRUCT NI2HDF5BrowserData &bd
-        
-        String browserName = s.win
-        Variable result = 0                                                                     // As of now, the return value must always be zero.
-        
-        switch(s.eventCode)
-                case 3:                                         // Double-click
-                        break;
-                        
-                case 4:                                         // Cell selection
-                        // Printf "Row=%d, column=%d\r", s.row, s.col
-                        NI2_HDF5DisplaySelAttribute(bd,  0)                             // Update various windows if they are displayed
-                        break   
-        endswitch
-        
-        return result
-End
-
-static Function ListBoxActionProc(s) : ListboxControl
-        STRUCT WMListboxAction &s
-
-        String browserName = s.win
-
-        STRUCT NI2HDF5BrowserData bd
-        SetNI2HDF5BrowserData(browserName, bd)
-        
-        Variable result = 0                                                     // As of now, the return value must always be zero.
-        
-        strswitch(s.ctrlName)
-                case "GroupsList":
-                        result = GroupsListActionProc(s, bd)
-                        break
-                        
-                case "GroupAttributesList":
-                        result = GroupAttributesListActionProc(s, bd)
-                        break
-                        
-                case "DatasetsList":
-                        result = DatasetsListActionProc(s, bd)
-                        break
-                
-                case "DatasetAttributesList":
-                        result = DatasetAttributesListActionProc(s, bd)
-                        break
-        endswitch
-        
-        return result
-End
-
-static Function SetGraphButtonTitle(browserName)
-        String browserName
-        
-        if (NI2_HDF5BrowserGraphIsVisible())
-                Button Graph, win=$browserName, title="Hide Graph"
-        else
-                Button Graph, win=$browserName, title="Show Graph"
-        endif   
-End
-
-static Function GraphButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-
-        String browserName = NI2_HDF5GetTopBrowserName()
-        
-        if (NI2_HDF5BrowserGraphIsVisible())
-                KillWIndow/Z HDF5BrowserGraph
-        else
-                NI2_HDF5CreateBrowserGraph()                            // Create if it does not exist.
-        endif
-        SetGraphButtonTitle(browserName)
-End
-
-static Function SetTableButtonTitle(browserName)
-        String browserName
-        
-        if (NI2_HDF5BrowserTableIsVisible())
-                Button Table, win=$browserName, title="Hide Table"
-        else
-                Button Table, win=$browserName, title="Show Table"
-        endif   
-End
-
-static Function TableButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-
-        String browserName = NI2_HDF5GetTopBrowserName()
-        
-        if (NI2_HDF5BrowserTableIsVisible())
-                KillWIndow/Z HDF5BrowserTable
-        else
-                NI2_HDF5CreateBrowserTable()                            // Create if it does not exist.
-        endif
-        SetTableButtonTitle(browserName)
-End
-
-static Function SetDumpButtonTitle(browserName)
-        String browserName
-        
-        if (NI2_HDF5BrowserDumpIsVisible())
-                Button Dump, win=$browserName, title="Hide Dump"
-        else
-                Button Dump, win=$browserName, title="Show Dump"
-        endif   
-End
-
-static Function DumpButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-
-        String browserName = NI2_HDF5GetTopBrowserName()
-        
-        if (NI2_HDF5BrowserDumpIsVisible())
-                Notebook HDF5DumpNotebook, visible=0
-        else
-                NI2_HDF5CreateDumpWindow()                                              // Create if it does not exist.
-                DoWindow/F HDF5DumpNotebook                     // Show it.
-        endif
-        SetDumpButtonTitle(browserName)
-End
-
-static Function HelpButtonProc(ctrlName) : ButtonControl
-        String ctrlName
-
-        DisplayHelpTopic "The HDF5 Browser"
-End
-
-static Function CreateHDF5BrowserPanel(browserName)
-        String browserName
-        
-        Variable isMacintosh = 0
-        if (CmpStr(IgorInfo(2),"Macintosh") == 0)
-                isMacintosh = 1
-        endif
-
-        // Determine panel size and position
-        Variable left, top, right, bottom
-        GetPrefWindowCoords("HDF5Browser", left, top, right, bottom)    // See if prefs set.
-        if (right-left<200 || bottom-top<200)
-                // These values are calculated to fill a typical 17 inch screen (832x624) on Macintosh.
-                left = 5
-                top = 50
-                right = 1020
-                bottom = 625
-        endif
-        
-        Variable readOnly, loadGroupsRecursively, transpose2DDatasets
-        GetPrefBrowserSettings(readOnly, loadGroupsRecursively, transpose2DDatasets)
-
-        NewPanel /W=(left, top, right, bottom)/K=1 as "HDF5 Browser"
-        
-        DoWindow/C $browserName
-        DoWindow/T $browserName, browserName
-        
-        // This marks this control panel as an HDF5 browser.
-        SetWindow kwTopWin, userdata(HDF5BrowserName)=browserName
-        
-        SetDrawLayer ProgBack
-
-        SetDrawEnv fstyle= 1
-        DrawText 18,75,"File:"
-
-        SetDrawEnv fstyle= 1
-        DrawText 18,103,"Selected Group:"
-
-        SetDrawEnv fstyle= 1
-        DrawText 18,130,"Selected Dataset:"
-
-        TitleBox FilePath,pos={55,57},size={706,21}
-
-        left = isMacintosh ? 150 : 125
-        TitleBox GroupPath,pos={left,86},size={658,20}
-        TitleBox Dataset,pos={left,113},size={13,21}
-
-        CheckBox UseHyperSelection,pos={15,155},size={110,14},title="Use Hyperselection",value= 0
-        CheckBox UseHyperSelection,help={"For experts only. Allows loading a subset of a dataset."}
-
-        SetVariable HyperSelectionWave,pos={140,155},size={340,16},title="Hyper Selection Wave:"
-        SetVariable HyperSelectionWave,help={"Enter full path to wave containing hyperselection information. See HDF5LoadData /SLAB keyword help."}
-
-        CheckBox LoadGroupsRecursively,pos={15,181},size={137,14},title="Load Groups Recursively",value=loadGroupsRecursively
-        CheckBox LoadGroupsRecursively,proc=HDF5BrowserPrefCheckboxProc,help={"When checked, the Load Group button loads subgroups."}
-        
-        Button CreateFile,pos={15,8},size={125,20},proc=NikaHDF5Browser#CreateFileButtonProc,title="Create HDF5 File", disable=1
-        Button OpenFile,pos={159,8},size={125,20},proc=NikaHDF5Browser#OpenFileButtonProc,title="Open HDF5 File"
-        Button CloseFile,pos={296,8},size={125,20},proc=NikaHDF5Browser#CloseFileButtonProc,title="Close HDF5 File"
-        Button Help,pos={435,8},size={50,20},proc=NikaHDF5Browser#HelpButtonProc,title="Help"
-        CheckBox ReadOnly,pos={186,32},size={68,14},title="Read Only",proc=HDF5BrowserPrefCheckboxProc,value=readOnly
-
-        // Start Preview
-
-        Button Graph,pos={556,27},size={90,20},proc=NikaHDF5Browser#GraphButtonProc,title="Show Graph"
-        Button Graph help={"Shows or hides a graph which displays the last dataset or attribute that you selected."}
-
-        Button Table,pos={672,27},size={90,20},proc=NikaHDF5Browser#TableButtonProc,title="Show Table"
-        Button Table help={"Shows or hides a table which displays the last dataset or attribute that you selected."}
-
-        Button Dump,pos={556,59},size={90,20},proc=NikaHDF5Browser#DumpButtonProc,title="Show Dump"
-        Button Dump help={"Shows or hides a window which displays a dump of the last dataset or attribute that you selected."}
-
-        CheckBox ShowAttributesInDump,pos={653,71},size={100,14},title="Show Attributes In Dump"
-        CheckBox ShowAttributesInDump help={"Check to display the dataset's attributes in the dump window."}
-
-        CheckBox ShowDataInDump,pos={653,56},size={114,14},title="Show Data In Dump"
-        CheckBox ShowDataInDump,help={"Check to display data in the dump window. For large datasets this can take a long time."}
-
-        GroupBox PreviewOptions,pos={543,5},size={258,87},title="Preview Options"
-
-        // End Preview
-
-        TitleBox GroupsTitle,pos={15,230},size={50,16},disable=2,title="Groups",fSize=14
-        TitleBox GroupsTitle,frame=0,fStyle=1
-
-        ListBox GroupsList,pos={15,250},size={306,170}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
-        ListBox GroupsList,fSize=14
-
-        Button LoadGroup,pos={80,224},size={100,20},proc=NikaHDF5Browser#LoadGroupButtonProc,title="Load Group"
-        Button LoadGroup,help={"Loads the currently selected group into the current data folder."}
-
-        Button SaveDataFolder,pos={194,224},size={120,20},proc=NikaHDF5Browser#SaveDataFolderButtonProc,title="Save Data Folder"
-        Button SaveDataFolder,help={"Saves a data folder in the currently selected group. Available if the current HDF5 file is open for read/write."}
-
-        TitleBox GroupAttributesTitle,pos={15,435},size={111,16},disable=2,title="Group Attributes"
-        TitleBox GroupAttributesTitle,fSize=14,frame=0,fStyle=1
-
-        ListBox GroupAttributesList,pos={15,455},size={306,109}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
-        ListBox GroupAttributesList, widths={175,40,80,120,1000}, userColumnResize= 1   // userColumnResize requires Igor Pro 5.02.
-        ListBox GroupAttributesList,fSize=14
-
-        TitleBox DatasetsTitle,pos={341,230},size={62,16},disable=2,title="Datasets"
-        TitleBox DatasetsTitle,fSize=14,frame=0,fStyle=1
-
-        ListBox DatasetsList,pos={341,250},size={459,170}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
-        ListBox DatasetsList, widths={175,40,80,120,1000}, userColumnResize= 1  // userColumnResize requires Igor Pro 5.02.
-        ListBox DatasetsList,fSize=14
-
-        TitleBox DatasetAttributesTitle,pos={341,435},size={123,16},disable=2,title="Dataset Attributes"
-        TitleBox DatasetAttributesTitle,fSize=14,frame=0,fStyle=1
-
-        ListBox DatasetAttributesList,pos={341,455},size={459,109}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
-        ListBox DatasetAttributesList, widths={175,40,80,120,1000}, userColumnResize= 1 // userColumnResize requires Igor Pro 5.02.
-        ListBox DatasetAttributesList,fSize=14
-
-
-        Button LoadDataset,pos={415,224},size={100,20},proc=NikaHDF5Browser#LoadDatasetButtonProc,title="Load Dataset"
-        Button LoadDataset,help={"Loads the currently selected dataset into the current data folder."}
-
-        Button SaveWaves,pos={529,224},size={100,20},proc=NikaHDF5Browser#SaveWavesButtonProc,title="Save Waves"
-        Button SaveWaves,help={"Saves waves in the currently selected group. Available if the current HDF5 file is open for read/write."}
-
-        CheckBox Transpose2DDatasets,pos={189,181},size={130,14},title="Transpose 2D Datasets",value=transpose2DDatasets
-        CheckBox Transpose2DDatasets,proc=HDF5BrowserPrefCheckboxProc,help={"When checked, 2D datasets are transposed so that Igor image plots will match HDFView."}
-
-        PopupMenu Members,pos={342,194},size={216,24},title="Members"
-        PopupMenu Members,mode=1,value= #"\"Load All Members\""
-        PopupMenu Members proc=HDF5Browser#MembersPopupProc
-        PopupMenu Members,help={"Choose the compound member to preview or load."}
-        //Nika stuff
-//      Wave/O/N=0/T DataSetNames, GroupNames           //these are pointes to waht user wants to get into Igor...
-        TitleBox NikaDataSetsTitle,pos={801,10},size={62,16},disable=2,title="Selected Datasets"
-        TitleBox NikaDataSetsTitle,fSize=14,frame=0,fStyle=1
-
-        string tempWvName="root:Packages:"+NI2_GetHDF5LoaderLocString()+":GroupNames"
-        ListBox NikaGroupList,pos={755,35},size={220,200}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
-        ListBox NikaGroupList, widths={175,40,80,120,1000}, userColumnResize= 1 // userColumnResize requires Igor Pro 5.02.
-        ListBox NikaGroupList,fSize=14, listwave=$(tempWvName)
-
-        Button AddGrouptoList,pos={600,200},size={150,20},proc=NikaHDF5Browser#LoadDatasetButtonProc,title="Add Group to Nika List"
-        Button AddGrouptoList,help={"Loads the currently selected Group into the current data folder."}
-        Button ClearDatasetList,pos={600,200},size={150,20},proc=NikaHDF5Browser#LoadDatasetButtonProc,title="Clear Nika List"
-        Button ClearDatasetList,help={"Clears Nika list of selected datasets"}
-
-
-        // Load Dataset Options
-        PopupMenu DisplayInTable,pos={565,123},size={200,24},title="Table:"
-        PopupMenu DisplayInTable,mode=2,value= #"\"No Table;Display in New Table;Append to Top Table\""
-        PopupMenu DisplayInGraph,pos={563,154},size={203,24},title="Graph:"
-        PopupMenu DisplayInGraph,mode=2,value= #"\"No Graph;Display in New Graph;Append to Top Graph\""
-        GroupBox LoadDatasetOptions,pos={542,100},size={258,87},title="Load Dataset Options"
-        
-        NI2_HDF5ResizeBrowser(browserName)              // Needed because we used preferred browser size.
-        
-        SetWindow kwTopWin,hook=NI2_HDF5BrowserPanelHook
-EndMacro
-
-
-static Function/S NI2_GetHDF5LoaderLocString()
-        
-        string CurPanelName = WinName(0,64)
-        if(stringmatch(CurPanelName[0,3],"Nika"))
-                return "NikaHDF5Loader"
-        elseif(stringmatch(CurPanelName[0,4],"Irena"))
-                return "IrenaHDF5Loader"
-        else
-                return ""
-        endif
-end
-
-Function NI2_HDF5BrowserPrefCheckboxProc(ctrlName,checked) : CheckBoxControl
-        String ctrlName
-        Variable checked
-        
-        STRUCT NI2_HDF5BrowserPrefs prefs
-        
-        NI2_HDF5BrowserLoadPackagePrefs(prefs)
-        strswitch(ctrlName)
-                case "ReadOnly":
-                        prefs.readOnly = checked
-                        break
-                
-                case "LoadGroupsRecursively":
-                        prefs.loadGroupsRecursively = checked
-                        break
-                
-                case "Transpose2DDatasets":
-                        prefs.transpose2DDatasets = checked
-                        break
-                        
-                case "SaveGroupsRecursively":
-                        prefs.saveGroupsRecursively = checked
-                        break
-                        
-                case "IncludeIgorAttributes":
-                        prefs.includeIgorAttributes = checked
-                        break
-                
-        endswitch
-        NI2_HDF5BrowserSavePackagePrefs(prefs)
-End
-
+//
+//Function NI2_HDF5BrowserPanelHook(infoStr)
+//      String infoStr
+//
+//#if Exists("HDF5OpenFile")    
+//      String browserName= StringByKey("WINDOW",infoStr)
+//      String event= StringByKey("EVENT",infoStr)
+//
+//      STRUCT NI2HDF5BrowserData bd
+//      SetNI2HDF5BrowserData(browserName, bd)
+//
+//      strswitch(event)
+//              case "activate":                                // We do not get this on Windows when the panel is first created.
+//                      // This detects if the file is no longer open, such as if you save the experiment, quit Igor and then reopen the experiment.
+//                      if (NI2_FileWasUnexpectedlyClosed(bd))
+//                              Printf "The file \"%s\" is no longer open.\r", bd.fileName
+//                              FileWasClosed(bd)
+//                      endif
+//                      
+//                      SetGraphButtonTitle(browserName)
+//                      SetTableButtonTitle(browserName)
+//                      SetDumpButtonTitle(browserName)
+//                      break
+//
+//              case "resize":
+//                      NI2_HDF5ResizeBrowser(browserName)
+//                      break
+//                      
+//              case "moved":                   // This message was added in Igor Pro 5.04B07.
+//                      // If this is the last HDF5 browser, save the browser window size and position.
+//                      if (strlen(NI2_HDF5GetIndxBrowserName(1)) == 0)
+//                              SetPrefWindowCoords(browserName)
+//                      endif
+//                      break
+//                      
+//              case "kill":
+//                      if (bd.fileID != 0)
+//                              HDF5CloseFile bd.fileID
+//                              bd.fileID = 0
+//                              CloseSavePanels()
+//                      endif
+//                      KillDataFolder root:Packages:HDF5Browser:$browserName
+//                      break
+//      endswitch
+//      
+//      return 0
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//Function NI2_SelectDataset(bd, datasetName)
+//      STRUCT NI2HDF5BrowserData &bd
+//      String datasetName
+//
+//#if Exists("HDF5OpenFile")    
+//      String info
+//
+//      if (strlen(datasetName) == 0)
+//              info = ""
+//      else
+//              String fullPath
+//              fullPath = NI2_HDF5GetObjectFullPath(bd.groupPath, datasetName)
+//              STRUCT NI2_HDF5DataInfo di
+//              NI2_InitHDF5DataInfo(di)                        // Set input fields.
+//              HDF5DatasetInfo(bd.fileID, fullPath, 0, di)
+//              // Print s
+//              sprintf info, "%s, class=%s", datasetName, di.datatype_class_str
+//      endif
+//      bd.datasetInfo = info
+//      DrawDatasetInfo(bd)
+//      SetButtonStates(bd)
+//      FillDatasetAttributesList(bd)
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//Function NI2_UpdateAfterGroupSelected(bd, fullGroupPath)
+//      STRUCT NI2HDF5BrowserData &bd
+//      String fullGroupPath
+//      
+//      Variable selectedGroupChanged = CmpStr(bd.groupPath, fullGroupPath) != 0
+//
+//      bd.groupPath = fullGroupPath
+//      DrawGroupPath(bd)
+//      FillGroupAttributesList(bd)
+//      FillDatasetsList(bd)
+//
+//      if (selectedGroupChanged)
+//              ResetListSelections(bd, 0, 1, 1, 1)
+//              String datasetName = ""
+//              if (numpnts(bd.datasetsList) > 0)
+//                      datasetName = bd.datasetsList[0][0]
+//              endif
+//              NI2_SelectDataset(bd, datasetName)
+//      endif
+//      SetButtonStates(bd)
+//End
+//
+//static Function GroupsListActionProc(s, bd) : ListboxControl
+//      STRUCT WMListboxAction &s
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      String browserName = s.win
+//      Variable result = 0                                                                     // As of now, the return value must always be zero.
+//      
+//      switch(s.eventCode)
+//              case 4:                                         // Cell selection
+//                      String fullGroupPath = bd.groupFullPaths[s.row]
+//                      NI2_UpdateAfterGroupSelected(bd, fullGroupPath)
+//                      // Printf "Row=%d, column=%d, path=%s\r", s.row, s.col, fullGroupPath
+//                      if (NI2_HDF5BrowserDumpIsVisible())
+//                              NI2_HDF5DisplayDumpOfSelGroup(bd)
+//                      endif
+//                      break   
+//      endswitch
+//
+//      return result
+//End
+//
+//static Function GroupAttributesListActionProc(s, bd) : ListboxControl
+//      STRUCT WMListboxAction &s
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      String browserName = s.win
+//      Variable result = 0                                                                     // As of now, the return value must always be zero.
+//      
+//      switch(s.eventCode)
+//              case 3:                                         // Double-click
+//                      break;
+//                      
+//              case 4:                                         // Cell selection
+//                      // Printf "Row=%d, column=%d\r", s.row, s.col
+//                      NI2_HDF5DisplaySelAttribute(bd,  1)                             // Update various windows if they are displayed
+//                      break   
+//      endswitch
+//
+//      return result
+//End
+//
+//Function NI2_HandleDatasetDoubleClick(s, bd)
+//      STRUCT WMListboxAction &s
+//      STRUCT NI2HDF5BrowserData &bd
+//
+//#if Exists("HDF5OpenFile")    
+//      String datasetPath = NI2_SelectedDatasetPath(bd)
+//      if (strlen(datasetPath) == 0)
+//              return -1
+//      endif
+//      
+//      STRUCT NI2_HDF5DataInfo di
+//      NI2_InitHDF5DataInfo(di)
+//      HDF5DatasetInfo(bd.fileID, datasetPath, 0, di)
+//      switch(di.datatype_class)
+//              default:
+//                      // Load dataset here.
+//                      break   
+//      endswitch
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function DatasetsListActionProc(s, bd) : ListboxControl
+//      STRUCT WMListboxAction &s
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      String browserName = s.win
+//      Variable result = 0                                                                     // As of now, the return value must always be zero.
+//      
+//      switch(s.eventCode)
+//              case 3:                                         // Double-click
+//                      NI2_HandleDatasetDoubleClick(s, bd)
+//                      break;
+//                      
+//              case 4:                                         // Cell selection
+//                      String name = bd.datasetsList[s.row][0]
+//                      NI2_SelectDataset(bd, name)
+//                      // Printf "Row=%d, column=%d, name=%s\r", s.row, s.col, name
+//                      NI2_HDF5DisplaySelectedDataset(bd)                                      // Update various windows if they are displayed
+//                      break   
+//      endswitch
+//      
+//      return result
+//End
+//
+//static Function DatasetAttributesListActionProc(s, bd) : ListboxControl
+//      STRUCT WMListboxAction &s
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//      String browserName = s.win
+//      Variable result = 0                                                                     // As of now, the return value must always be zero.
+//      
+//      switch(s.eventCode)
+//              case 3:                                         // Double-click
+//                      break;
+//                      
+//              case 4:                                         // Cell selection
+//                      // Printf "Row=%d, column=%d\r", s.row, s.col
+//                      NI2_HDF5DisplaySelAttribute(bd,  0)                             // Update various windows if they are displayed
+//                      break   
+//      endswitch
+//      
+//      return result
+//End
+//
+//static Function ListBoxActionProc(s) : ListboxControl
+//      STRUCT WMListboxAction &s
+//
+//      String browserName = s.win
+//
+//      STRUCT NI2HDF5BrowserData bd
+//      SetNI2HDF5BrowserData(browserName, bd)
+//      
+//      Variable result = 0                                                     // As of now, the return value must always be zero.
+//      
+//      strswitch(s.ctrlName)
+//              case "GroupsList":
+//                      result = GroupsListActionProc(s, bd)
+//                      break
+//                      
+//              case "GroupAttributesList":
+//                      result = GroupAttributesListActionProc(s, bd)
+//                      break
+//                      
+//              case "DatasetsList":
+//                      result = DatasetsListActionProc(s, bd)
+//                      break
+//              
+//              case "DatasetAttributesList":
+//                      result = DatasetAttributesListActionProc(s, bd)
+//                      break
+//      endswitch
+//      
+//      return result
+//End
+//
+//static Function SetGraphButtonTitle(browserName)
+//      String browserName
+//      
+//      if (NI2_HDF5BrowserGraphIsVisible())
+//              Button Graph, win=$browserName, title="Hide Graph"
+//      else
+//              Button Graph, win=$browserName, title="Show Graph"
+//      endif   
+//End
+//
+//static Function GraphButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//
+//      String browserName = NI2_HDF5GetTopBrowserName()
+//      
+//      if (NI2_HDF5BrowserGraphIsVisible())
+//              KillWIndow/Z HDF5BrowserGraph
+//      else
+//              NI2_HDF5CreateBrowserGraph()                            // Create if it does not exist.
+//      endif
+//      SetGraphButtonTitle(browserName)
+//End
+//
+//static Function SetTableButtonTitle(browserName)
+//      String browserName
+//      
+//      if (NI2_HDF5BrowserTableIsVisible())
+//              Button Table, win=$browserName, title="Hide Table"
+//      else
+//              Button Table, win=$browserName, title="Show Table"
+//      endif   
+//End
+//
+//static Function TableButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//
+//      String browserName = NI2_HDF5GetTopBrowserName()
+//      
+//      if (NI2_HDF5BrowserTableIsVisible())
+//              KillWIndow/Z HDF5BrowserTable
+//      else
+//              NI2_HDF5CreateBrowserTable()                            // Create if it does not exist.
+//      endif
+//      SetTableButtonTitle(browserName)
+//End
+//
+//static Function SetDumpButtonTitle(browserName)
+//      String browserName
+//      
+//      if (NI2_HDF5BrowserDumpIsVisible())
+//              Button Dump, win=$browserName, title="Hide Dump"
+//      else
+//              Button Dump, win=$browserName, title="Show Dump"
+//      endif   
+//End
+//
+//static Function DumpButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//
+//      String browserName = NI2_HDF5GetTopBrowserName()
+//      
+//      if (NI2_HDF5BrowserDumpIsVisible())
+//              Notebook HDF5DumpNotebook, visible=0
+//      else
+//              NI2_HDF5CreateDumpWindow()                                              // Create if it does not exist.
+//              DoWindow/F HDF5DumpNotebook                     // Show it.
+//      endif
+//      SetDumpButtonTitle(browserName)
+//End
+//
+//static Function HelpButtonProc(ctrlName) : ButtonControl
+//      String ctrlName
+//
+//      DisplayHelpTopic "The HDF5 Browser"
+//End
+//
+//static Function CreateHDF5BrowserPanel(browserName)
+//      String browserName
+//      
+//      Variable isMacintosh = 0
+//      if (CmpStr(IgorInfo(2),"Macintosh") == 0)
+//              isMacintosh = 1
+//      endif
+//
+//      // Determine panel size and position
+//      Variable left, top, right, bottom
+//      GetPrefWindowCoords("HDF5Browser", left, top, right, bottom)    // See if prefs set.
+//      if (right-left<200 || bottom-top<200)
+//              // These values are calculated to fill a typical 17 inch screen (832x624) on Macintosh.
+//              left = 5
+//              top = 50
+//              right = 1020
+//              bottom = 625
+//      endif
+//      
+//      Variable readOnly, loadGroupsRecursively, transpose2DDatasets
+//      GetPrefBrowserSettings(readOnly, loadGroupsRecursively, transpose2DDatasets)
+//
+//      NewPanel /W=(left, top, right, bottom)/K=1 as "HDF5 Browser"
+//      
+//      DoWindow/C $browserName
+//      DoWindow/T $browserName, browserName
+//      
+//      // This marks this control panel as an HDF5 browser.
+//      SetWindow kwTopWin, userdata(HDF5BrowserName)=browserName
+//      
+//      SetDrawLayer ProgBack
+//
+//      SetDrawEnv fstyle= 1
+//      DrawText 18,75,"File:"
+//
+//      SetDrawEnv fstyle= 1
+//      DrawText 18,103,"Selected Group:"
+//
+//      SetDrawEnv fstyle= 1
+//      DrawText 18,130,"Selected Dataset:"
+//
+//      TitleBox FilePath,pos={55,57},size={706,21}
+//
+//      left = isMacintosh ? 150 : 125
+//      TitleBox GroupPath,pos={left,86},size={658,20}
+//      TitleBox Dataset,pos={left,113},size={13,21}
+//
+//      CheckBox UseHyperSelection,pos={15,155},size={110,14},title="Use Hyperselection",value= 0
+//      CheckBox UseHyperSelection,help={"For experts only. Allows loading a subset of a dataset."}
+//
+//      SetVariable HyperSelectionWave,pos={140,155},size={340,16},title="Hyper Selection Wave:"
+//      SetVariable HyperSelectionWave,help={"Enter full path to wave containing hyperselection information. See HDF5LoadData /SLAB keyword help."}
+//
+//      CheckBox LoadGroupsRecursively,pos={15,181},size={137,14},title="Load Groups Recursively",value=loadGroupsRecursively
+//      CheckBox LoadGroupsRecursively,proc=HDF5BrowserPrefCheckboxProc,help={"When checked, the Load Group button loads subgroups."}
+//      
+//      Button CreateFile,pos={15,8},size={125,20},proc=NikaHDF5Browser#CreateFileButtonProc,title="Create HDF5 File", disable=1
+//      Button OpenFile,pos={159,8},size={125,20},proc=NikaHDF5Browser#OpenFileButtonProc,title="Open HDF5 File"
+//      Button CloseFile,pos={296,8},size={125,20},proc=NikaHDF5Browser#CloseFileButtonProc,title="Close HDF5 File"
+//      Button Help,pos={435,8},size={50,20},proc=NikaHDF5Browser#HelpButtonProc,title="Help"
+//      CheckBox ReadOnly,pos={186,32},size={68,14},title="Read Only",proc=HDF5BrowserPrefCheckboxProc,value=readOnly
+//
+//      // Start Preview
+//
+//      Button Graph,pos={556,27},size={90,20},proc=NikaHDF5Browser#GraphButtonProc,title="Show Graph"
+//      Button Graph help={"Shows or hides a graph which displays the last dataset or attribute that you selected."}
+//
+//      Button Table,pos={672,27},size={90,20},proc=NikaHDF5Browser#TableButtonProc,title="Show Table"
+//      Button Table help={"Shows or hides a table which displays the last dataset or attribute that you selected."}
+//
+//      Button Dump,pos={556,59},size={90,20},proc=NikaHDF5Browser#DumpButtonProc,title="Show Dump"
+//      Button Dump help={"Shows or hides a window which displays a dump of the last dataset or attribute that you selected."}
+//
+//      CheckBox ShowAttributesInDump,pos={653,71},size={100,14},title="Show Attributes In Dump"
+//      CheckBox ShowAttributesInDump help={"Check to display the dataset's attributes in the dump window."}
+//
+//      CheckBox ShowDataInDump,pos={653,56},size={114,14},title="Show Data In Dump"
+//      CheckBox ShowDataInDump,help={"Check to display data in the dump window. For large datasets this can take a long time."}
+//
+//      GroupBox PreviewOptions,pos={543,5},size={258,87},title="Preview Options"
+//
+//      // End Preview
+//
+//      TitleBox GroupsTitle,pos={15,230},size={50,16},disable=2,title="Groups",fSize=14
+//      TitleBox GroupsTitle,frame=0,fStyle=1
+//
+//      ListBox GroupsList,pos={15,250},size={306,170}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
+//      ListBox GroupsList,fSize=14
+//
+//      Button LoadGroup,pos={80,224},size={100,20},proc=NikaHDF5Browser#LoadGroupButtonProc,title="Load Group"
+//      Button LoadGroup,help={"Loads the currently selected group into the current data folder."}
+//
+//      Button SaveDataFolder,pos={194,224},size={120,20},proc=NikaHDF5Browser#SaveDataFolderButtonProc,title="Save Data Folder"
+//      Button SaveDataFolder,help={"Saves a data folder in the currently selected group. Available if the current HDF5 file is open for read/write."}
+//
+//      TitleBox GroupAttributesTitle,pos={15,435},size={111,16},disable=2,title="Group Attributes"
+//      TitleBox GroupAttributesTitle,fSize=14,frame=0,fStyle=1
+//
+//      ListBox GroupAttributesList,pos={15,455},size={306,109}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
+//      ListBox GroupAttributesList, widths={175,40,80,120,1000}, userColumnResize= 1   // userColumnResize requires Igor Pro 5.02.
+//      ListBox GroupAttributesList,fSize=14
+//
+//      TitleBox DatasetsTitle,pos={341,230},size={62,16},disable=2,title="Datasets"
+//      TitleBox DatasetsTitle,fSize=14,frame=0,fStyle=1
+//
+//      ListBox DatasetsList,pos={341,250},size={459,170}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
+//      ListBox DatasetsList, widths={175,40,80,120,1000}, userColumnResize= 1  // userColumnResize requires Igor Pro 5.02.
+//      ListBox DatasetsList,fSize=14
+//
+//      TitleBox DatasetAttributesTitle,pos={341,435},size={123,16},disable=2,title="Dataset Attributes"
+//      TitleBox DatasetAttributesTitle,fSize=14,frame=0,fStyle=1
+//
+//      ListBox DatasetAttributesList,pos={341,455},size={459,109}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
+//      ListBox DatasetAttributesList, widths={175,40,80,120,1000}, userColumnResize= 1 // userColumnResize requires Igor Pro 5.02.
+//      ListBox DatasetAttributesList,fSize=14
+//
+//
+//      Button LoadDataset,pos={415,224},size={100,20},proc=NikaHDF5Browser#LoadDatasetButtonProc,title="Load Dataset"
+//      Button LoadDataset,help={"Loads the currently selected dataset into the current data folder."}
+//
+//      Button SaveWaves,pos={529,224},size={100,20},proc=NikaHDF5Browser#SaveWavesButtonProc,title="Save Waves"
+//      Button SaveWaves,help={"Saves waves in the currently selected group. Available if the current HDF5 file is open for read/write."}
+//
+//      CheckBox Transpose2DDatasets,pos={189,181},size={130,14},title="Transpose 2D Datasets",value=transpose2DDatasets
+//      CheckBox Transpose2DDatasets,proc=HDF5BrowserPrefCheckboxProc,help={"When checked, 2D datasets are transposed so that Igor image plots will match HDFView."}
+//
+//      PopupMenu Members,pos={342,194},size={216,24},title="Members"
+//      PopupMenu Members,mode=1,value= #"\"Load All Members\""
+//      PopupMenu Members proc=HDF5Browser#MembersPopupProc
+//      PopupMenu Members,help={"Choose the compound member to preview or load."}
+//      //Nika stuff
+////    Wave/O/N=0/T DataSetNames, GroupNames           //these are pointes to waht user wants to get into Igor...
+//      TitleBox NikaDataSetsTitle,pos={801,10},size={62,16},disable=2,title="Selected Datasets"
+//      TitleBox NikaDataSetsTitle,fSize=14,frame=0,fStyle=1
+//
+//      string tempWvName="root:Packages:"+NI2_GetHDF5LoaderLocString()+":GroupNames"
+//      ListBox NikaGroupList,pos={755,35},size={220,200}, mode=2, proc=NikaHDF5Browser#ListBoxActionProc
+//      ListBox NikaGroupList, widths={175,40,80,120,1000}, userColumnResize= 1 // userColumnResize requires Igor Pro 5.02.
+//      ListBox NikaGroupList,fSize=14, listwave=$(tempWvName)
+//
+//      Button AddGrouptoList,pos={600,200},size={150,20},proc=NikaHDF5Browser#LoadDatasetButtonProc,title="Add Group to Nika List"
+//      Button AddGrouptoList,help={"Loads the currently selected Group into the current data folder."}
+//      Button ClearDatasetList,pos={600,200},size={150,20},proc=NikaHDF5Browser#LoadDatasetButtonProc,title="Clear Nika List"
+//      Button ClearDatasetList,help={"Clears Nika list of selected datasets"}
+//
+//
+//      // Load Dataset Options
+//      PopupMenu DisplayInTable,pos={565,123},size={200,24},title="Table:"
+//      PopupMenu DisplayInTable,mode=2,value= #"\"No Table;Display in New Table;Append to Top Table\""
+//      PopupMenu DisplayInGraph,pos={563,154},size={203,24},title="Graph:"
+//      PopupMenu DisplayInGraph,mode=2,value= #"\"No Graph;Display in New Graph;Append to Top Graph\""
+//      GroupBox LoadDatasetOptions,pos={542,100},size={258,87},title="Load Dataset Options"
+//      
+//      NI2_HDF5ResizeBrowser(browserName)              // Needed because we used preferred browser size.
+//      
+//      SetWindow kwTopWin,hook=NI2_HDF5BrowserPanelHook
+//EndMacro
+//
+//
+//static Function/S NI2_GetHDF5LoaderLocString()
+//      
+//      string CurPanelName = WinName(0,64)
+//      if(stringmatch(CurPanelName[0,3],"Nika"))
+//              return "NikaHDF5Loader"
+//      elseif(stringmatch(CurPanelName[0,4],"Irena"))
+//              return "IrenaHDF5Loader"
+//      else
+//              return ""
+//      endif
+//end
+//
+//Function NI2_HDF5BrowserPrefCheckboxProc(ctrlName,checked) : CheckBoxControl
+//      String ctrlName
+//      Variable checked
+//      
+//      STRUCT NI2_HDF5BrowserPrefs prefs
+//      
+//      NI2_HDF5BrowserLoadPackagePrefs(prefs)
+//      strswitch(ctrlName)
+//              case "ReadOnly":
+//                      prefs.readOnly = checked
+//                      break
+//              
+//              case "LoadGroupsRecursively":
+//                      prefs.loadGroupsRecursively = checked
+//                      break
+//              
+//              case "Transpose2DDatasets":
+//                      prefs.transpose2DDatasets = checked
+//                      break
+//                      
+//              case "SaveGroupsRecursively":
+//                      prefs.saveGroupsRecursively = checked
+//                      break
+//                      
+//              case "IncludeIgorAttributes":
+//                      prefs.includeIgorAttributes = checked
+//                      break
+//              
+//      endswitch
+//      NI2_HDF5BrowserSavePackagePrefs(prefs)
+//End
+//
 Function NI2_CreateNewHDF5Browser(WhereFrom)
         string WhereFrom                        //Nika or Irena
@@ -1803 +1811 @@
         CreateHDF5BrowserGlobals(browserName)
         
-        CreateHDF5BrowserPanel(browserName)
+        HDF5Browser#CreateHDF5BrowserPanel(browserName)
 
-        STRUCT NI2HDF5BrowserData bd
-        SetNI2HDF5BrowserData(browserName, bd)
+        STRUCT HDF5BrowserData bd
+
+#if(IgorVersion()<9)
+        //STRUCT NI2HDF5BrowserData bd
+        HDF5Browser#SetHDF5BrowserData(browserName, bd)
+        NI2_AttachListWaves(bd)
+        HDF5Browser#SetButtonStates(bd)
+#else
+        HDF5Browser#SetHDF5BrowserData(browserName, bd)
+        NI2_AttachListWaves(bd)
+        HDF5Browser#SetButtonStates(bd)
+#endif
+
         
-        NI2_AttachListWaves(bd)
-        SetButtonStates(bd)
 End
-
-Static Function IsHDF5Browser(name)
-        String name                     // Name of a window
-        
-        if (WinType(name) != 7)
-                return 0                                // Not a control panel window
-        endif
-        
-        String data = GetUserData(name, "", "HDF5BrowserName")  // HDF5BrowserName property is set by CreateHDF5BrowserPanel
-        if (CmpStr(data,name) == 0)                     // Is this an HDF5Browser?
-                return 1
-        endif
-        
-        return 0
-End
-
-Function/S NI2_HDF5GetIndxBrowserName(index)
-        Variable index
-        
-        if (index < 0)
-                return ""                               // Bad index
-        endif
-        
-        String panelName
-        
-        Variable i = 0
-        do
-                panelName = WinName(i, 64)
-                if (strlen(panelName) == 0)
-                        break
-                endif
-                
-                if (IsHDF5Browser(panelName))           // Is this an HDF5Browser?
-                        if (index == 0)
-                                return panelName
-                        endif
-                        index -= 1
-                endif
-                
-                i += 1
-        while(1)
-        
-        return ""               // No HDF5 browser with that index
-End
-
-Function/S NI2_HDF5GetTopBrowserName()
-        String browserName = NI2_HDF5GetIndxBrowserName(0)
-        return browserName
-End
-
-Function NI2_HDF5AreAnyBrowsersOpen()
-        String browserName = NI2_HDF5GetIndxBrowserName(0)
-        if (strlen(browserName) > 0)
-                return 1
-        endif
-        return 0
-End
-
-// FixCloseHDF5FileButtons()
-// If experiment was saved with an HDF5 file open, it is no longer open but the panel's Open
-// and Close buttons will be out-of-sync. This fixes that.
-static Function FixCloseHDF5FileButtons()
-
-        STRUCT NI2HDF5BrowserData bd
-        String browserName
-        
-        Variable index = 0
-        do
-                browserName = NI2_HDF5GetIndxBrowserName(index)
-                if (strlen(browserName) == 0)
-                        break
-                endif
-                
-                SetNI2HDF5BrowserData(browserName, bd)
-                if (NI2_FileWasUnexpectedlyClosed(bd))
-                        FileWasClosed(bd)
-                endif
-                
-                index += 1
-        while(1)
-End
-
-static Function AfterFileOpenHook(refNum,file,pathName,type,creator,kind)
-        Variable refNum,kind
-        String file,pathName,type,creator
-
-        // DoAlert 0, "AfterFileOpenHook"               // For debugging
-        
-        switch (kind)
-                case 1:                                                                         // Packed experiment
-                case 2:                                                                         // Unpacked experiment
-                        FixCloseHDF5FileButtons()               // If experiment was saved with an HDF5 file open, it is no longer open
-                break
-        endswitch
-
-        return 0
-End
-
-// ************* Start of HDF5 Browser Display Routines ***************
-
-static Function WaveRank(w)
-        Wave w
-        
-        Variable dimension
-        for(dimension=3; dimension>=0; dimension-=1)
-                if (DimSize(w, dimension) > 0)
-                        return dimension+1
-                endif
-        endfor
-        
-        return 0
-End
-
-// *** DISPLAY IN DUMP WINDOW ***
-
-Function NI2_HDF5BrowserDumpIsVisible() // Returns true if dump window exists and is visible.
-                                                                        // Returns false if it does not exist or is invisible.
-        DoWindow  HDF5DumpNotebook
-        if (V_flag == 0)
-                return 0                                        // Does not exist
-        endif
-        
-        String name
-        Variable index = 0
-        do
-                name = WinName(index, 16, 1)
-                if (strlen(name) == 0)
-                        return 0                                // Did not find HDF5DumpNotebook among visible notebooks.
-                endif
-                if (CmpStr(name, "HDF5DumpNotebook") == 0)
-                        return 1                                // Found HDF5DumpNotebook among visible notebooks
-                endif
-                index += 1
-        while(1)
-        
-        return 0                                                // This will never execute.                                                     
-End
-
-Function NI2_HDF5BrowserDumpHook(infoStr)
-        String infoStr
-
-        String event= StringByKey("EVENT",infoStr)
-
-        strswitch(event)
-                case "activate":                                // We do not get this on Windows when the panel is first created.
-                        break
-                        
-                case "resize":
-                case "moved":                                   // This message was added in Igor Pro 5.04B07.
-                        SetPrefWindowCoords("HDF5DumpNotebook")
-                        break
-        endswitch
-        
-        return 0
-End
-
-Function NI2_HDF5CreateDumpWindow()
-        DoWindow HDF5DumpNotebook
-        if (V_flag == 0)
-                Variable left, top, right, bottom
-                GetPrefWindowCoords("HDF5DumpNotebook", left, top, right, bottom)
-                if (right > left)                                                                                       // Were prefs ever set?
-                        NewNotebook /F=0 /N=HDF5DumpNotebook/K=1 /W=(left, top, right, bottom)
-                else
-                        NewNotebook/F=0/N=HDF5DumpNotebook/K=1
-                endif
-                SetWindow HDF5DumpNotebook,hook=HDF5BrowserDumpHook
-                if (NumType(FontSizeHeight("Courier New", 12, 0)) == 0)         // Courier New exists?
-                        Notebook HDF5DumpNotebook font="Courier New", fSize=12
-                endif
-                Notebook HDF5DumpNotebook text="A dump will appear here when you click a dataset.\r"
-        endif
-End
-
-// CleanupDump(dump)
-// Removes nulls, converts \n to CR, etc. Dump of NASA strings can contain lots of such "garbage".
-// For an example, see the attribute /StructMetadata.O_GLOSDS in the NASA sample file MISRAERO.h5.
-static Function/S CleanupDump(dump)
-        String dump
-        
-        // Convert literal string "\000" to "". Null characters are represented in dump by "\000"
-        dump = ReplaceString("\\000", dump, "", 1)
-        
-        // Convert literal string "\r\n" to CR
-        dump = ReplaceString("\\r\\n", dump, "\r", 1)
-        
-        // Convert literal string "\r" to CR
-        dump = ReplaceString("\\r", dump, "\r", 1)
-        
-        // Convert literal string "\n" to CR
-        dump = ReplaceString("\\n", dump, "\r", 1)
-        
-        // Convert literal string "\t" to tab
-        dump = ReplaceString("\\t", dump, "\t", 1)
-        
-        // Convert CRLF to CR
-        dump = ReplaceString("\r\n", dump, "\r", 1)
-        
-        // Convert LF to CR
-        dump = ReplaceString("\n", dump, "\r", 1)
-        
-        return dump
-End
-
-Function NI2_HDF5DisplayDumpOfSelGroup(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-#if Exists("HDF5OpenFile")      
-        String path = NI2_SelectedGroupPath(bd)
-        if (strlen(path) == 0)
-                return -1
-        endif
-        
-        ControlInfo /W=$bd.browserName ShowAttributesInDump
-        Variable showAttributes = V_value
-        HDF5Dump /Q /H=1 /ATTR=(showAttributes) /G=path bd.fullPath                                     // This sets S_HDF5Dump.
-        S_HDF5Dump = CleanupDump(S_HDF5Dump)    
-        
-        NI2_HDF5CreateDumpWindow()
-        
-        Notebook HDF5DumpNotebook selection={startOfFile, endOfFile}
-        Notebook HDF5DumpNotebook text=S_HDF5Dump
-        Notebook HDF5DumpNotebook selection={startOfFile, startOfFile}, findText={"",1}
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function DisplayDumpOfSelectedDataset(bd)
-        STRUCT NI2HDF5BrowserData &bd
-        
-#if Exists("HDF5OpenFile")      
-        String datasetPath = NI2_SelectedDatasetPath(bd)
-        if (strlen(datasetPath) == 0)
-                return -1
-        endif
-        
-        ControlInfo /W=$bd.browserName ShowAttributesInDump
-        Variable showAttributes = V_value
-        ControlInfo /W=$bd.browserName ShowDataInDump
-        Variable showData = V_value
-        HDF5Dump /Q /ATTR=(showAttributes) /H=(!showData) /D=datasetPath bd.fullPath                    // This sets S_HDF5Dump.
-        S_HDF5Dump = CleanupDump(S_HDF5Dump)    
-        
-        NI2_HDF5CreateDumpWindow()
-        
-        Notebook HDF5DumpNotebook selection={startOfFile, endOfFile}
-        Notebook HDF5DumpNotebook text=S_HDF5Dump
-        Notebook HDF5DumpNotebook selection={startOfFile, startOfFile}, findText={"",1}
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-static Function DisplayDumpOfSelectedAttribute(bd, isGroupAttribute)
-        STRUCT NI2HDF5BrowserData &bd
-        Variable isGroupAttribute
-        
-#if Exists("HDF5OpenFile")      
-        String path = NI2_SelectedAttributePath(bd, isGroupAttribute)
-        if (strlen(path) == 0)
-                return -1
-        endif
-        
-        HDF5Dump /Q /A=path bd.fullPath                                 // This sets S_HDF5Dump.
-        S_HDF5Dump = CleanupDump(S_HDF5Dump)    
-        
-        NI2_HDF5CreateDumpWindow()
-        
-        Notebook HDF5DumpNotebook selection={startOfFile, endOfFile}
-        Notebook HDF5DumpNotebook text=S_HDF5Dump
-        Notebook HDF5DumpNotebook selection={startOfFile, startOfFile}, findText={"",1}
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-// *** DISPLAY IN GRAPH ***
-
-Function NI2_HDF5BrowserGraphIsVisible()                // Returns true if dump window exists and is visible.
-                                                                                // Returns false if it does not exist or is invisible.
-        DoWindow  HDF5BrowserGraph
-        if (V_flag == 0)
-                return 0                                        // Does not exist
-        endif
-        
-        // Graphs are always visible so we don't need to check that.
-        
-        return 1                                                // This will never execute.                                                     
-End
-
-Function NI2_HDF5BrowserGraphHook(infoStr)
-        String infoStr
-
-        String event= StringByKey("EVENT",infoStr)
-
-        strswitch(event)
-                case "activate":                                // We do not get this on Windows when the panel is first created.
-                        break
-                        
-                case "resize":
-                case "moved":                                   // This message was added in Igor Pro 5.04B07.
-                        SetPrefWindowCoords("HDF5BrowserGraph")
-                        break
-        endswitch
-        
-        return 0
-End
-
-Function NI2_HDF5CreateBrowserGraph()
-        DoWindow HDF5BrowserGraph
-        if (V_flag == 0)
-                Variable left, top, right, bottom
-                GetPrefWindowCoords("HDF5BrowserGraph", left, top, right, bottom)
-                if (right > left)                                                                       // Were prefs ever set?
-                        Display /K=1 /W=(left, top, right, bottom)
-                else
-                        Display /K=1
-                endif
-                DoWindow/C HDF5BrowserGraph
-                SetWindow HDF5BrowserGraph,hook=HDF5BrowserGraphHook
-        endif
-End
-
-static Function SetImageLayer(ctrlName,varNum,varStr,varName) : SetVariableControl
-        String ctrlName
-        Variable varNum
-        String varStr
-        String varName
-
-        NVAR imageLayer = root:Packages:HDF5Browser:imageLayer
-
-        ModifyImage /W=HDF5BrowserGraph BrowserWave, plane=varNum
-End
-
-static Function DisplayGraphOfSelectedData(bd, isAttribute, objectType, listOfWavesLoaded)              // The data is already loaded into waves specified by listOfWavesLoaded
-        STRUCT NI2HDF5BrowserData &bd
-        Variable isAttribute
-        Variable objectType                             // Host object type of attribute. 1=group, 2=dataset
-        String listOfWavesLoaded
-
-        NI2_HDF5CreateBrowserGraph()
-
-        String firstWaveLoaded = StringFromList(0, listOfWavesLoaded)
-        Wave browserWave = root:Packages:HDF5Browser:$firstWaveLoaded
-        Variable newDataIsText = WaveType(browserWave) == 0
-
-        Variable oldRank = 0, newRank = 0
-        if (strlen(TraceNameList("HDF5BrowserGraph", ";", 1)) > 0)
-                oldRank = 1                                     
-        endif
-        if (strlen(ImageNameList("HDF5BrowserGraph", ";")) > 0)
-                oldRank = 2
-        endif
-        newRank = WaveRank(browserWave) // Will be zero for zero-point wave
-
-        String savedDataFolder = NI2_SetBrowserDataFolder("")                                   // browserWave goes in master HDF5Browser data folder
-
-        Variable displayedDimensionalityChanged = (oldRank <= 1) != (newRank <= 1)      // Switching between 1D and >1D ?
-        Variable index, browserWaveIsDisplayed
-        String waveLoaded, nameOfGraphWave
-        
-        // Remove any waves in graph not in listOfWavesLoaded or all waves if dimensionality changed
-        index = 0
-        do
-                if (oldRank == 1)
-                        Wave/Z graphWave = WaveRefIndexed("HDF5BrowserGraph", index, 1)
-                        if (!WaveExists(graphWave))
-                                break
-                        endif
-                        nameOfGraphWave = NameOfWave(graphWave)
-                else
-                        nameOfGraphWave = StringFromList(index, ImageNameList("HDF5BrowserGraph", ";" ))
-                        if (strlen(nameOfGraphWave) == 0)
-                                break
-                        endif
-                endif
-                
-                Variable waveIsInListOfLoadedWaves = WhichListItem(nameOfGraphWave, listOfWavesLoaded) >= 0
-                if (displayedDimensionalityChanged || !waveIsInListOfLoadedWaves)
-                        if (oldRank == 1)
-                                RemoveFromGraph /W=HDF5BrowserGraph $nameOfGraphWave
-                        endif
-                        if (oldRank > 1)
-                                RemoveImage /W=HDF5BrowserGraph $nameOfGraphWave
-                        endif
-                        index -= 1
-                endif
-                if (!waveIsInListOfLoadedWaves)
-                        KillWaves/Z $nameOfGraphWave
-                endif
-                
-                index += 1
-        while(1)
-
-        // Append any waves to graph in listOfWavesLoaded
-        index = 0
-        do
-                waveLoaded = StringFromList(index, listOfWavesLoaded)
-                if (strlen(waveLoaded) == 0)
-                        break
-                endif
-                Wave browserWave = root:Packages:HDF5Browser:$waveLoaded
-                Variable browserWaveType = WaveType(browserWave)
-                nameOfGraphWave = waveLoaded
-
-                CheckDisplayed /W=HDF5BrowserGraph browserWave
-                browserWaveIsDisplayed = V_flag
-                
-                if (!newDataIsText)
-                        if (browserWaveType != 0)                               // When loading compound data we can get a mix of numeric and non-numeric.
-                                if (browserWaveIsDisplayed == 0)
-                                        if (newRank <= 1)
-                                                AppendToGraph /W=HDF5BrowserGraph browserWave
-                                                if (displayedDimensionalityChanged)
-                                                        SetAxis/A left
-                                                endif
-                                        else
-                                                AppendImage /W=HDF5BrowserGraph browserWave
-                                                if (displayedDimensionalityChanged)
-                                                        SetAxis/A/R left                                                                        // Reverse left axis like NewImage does.
-                                                endif
-                                        endif
-                                endif
-        
-                                if (newRank >= 2)
-                                        NVAR formalImageType = root:Packages:HDF5Browser:formalImageType
-                                        switch (formalImageType)                                                        // browserPalette would be created by HDF5LoadImage
-                                                case 0:                                                                                         // Not a formal image.
-                                                case 1:                                                                                         // No palette wave loaded.
-                                                        ModifyImage /W=HDF5BrowserGraph $nameOfGraphWave ctab= {*,*,Grays,0}
-                                                        break
-                                                        
-                                                case 2:                                                                                         // Palette wave was loaded.
-                                                        Wave browserPalette = root:Packages:HDF5Browser:browserPalette
-                                                        ModifyImage /W=HDF5BrowserGraph $nameOfGraphWave, cindex=browserPalette
-                                                        break
-                                        endswitch
-                                endif
-                        endif
-                endif
-
-                if (newDataIsText)                                              // Display a snippet of the text wave.
-                        if (browserWaveType == 0)               // When loading compound data we can get a mix of numeric and non-numeric.
-                                String text
-                                Wave/T w = root:Packages:HDF5Browser:$nameOfGraphWave
-                                if (numpnts(w) > 0)
-                                        text = CleanupDump(w[0])
-                                else
-                                        text = ""
-                                endif
-                                if ( (strlen(text) > 256) || (numpnts(w)>1) )
-                                        text = "A snippet of the text:\r\r" + text[0,255]                       
-                                endif                   
-                                TextBox/C/N=browserTextbox/W=HDF5BrowserGraph/A=LT text
-                        endif
-                else
-                        TextBox/K/N=browserTextbox/W=HDF5BrowserGraph
-                endif
-                
-                index += 1
-        while(1)
-        
-        // Show Image Layer control if displaying a stack of images
-        Variable numDims = WaveDims(browserWave)
-        Variable isStack = 0
-        if (!newDataIsText && newRank>2)
-                if (DimSize(browserWave,2) == 3)
-                        // Igor assumes that this is an RGB wave using direct color.
-                        if (numDims > 3)
-                                isStack = 1                     // This is a stack of RGB images.
-                        endif
-                else
-                        isStack = 1                     // This is a stack of indexed color images.
-                endif
-        endif
-        
-        if (isStack)
-                Variable/G root:Packages:HDF5Browser:imageLayer = 0
-                Variable dim, numLayers
-                
-                numLayers = 1
-                for(dim=2; dim<numDims; dim+=1)
-                        numLayers *= DimSize(browserWave, dim)
-                endfor
-                
-                ControlBar/W=HDF5BrowserGraph 25
-                SetVariable ImageLayer win=HDF5BrowserGraph, title="Layer",size={100,20},format="%d"
-                SetVariable ImageLayer win=HDF5BrowserGraph, proc=HDF5Browser#SetImageLayer
-                SetVariable ImageLayer win=HDF5BrowserGraph, value=imageLayer, limits={0,numLayers-1,1}
-        else
-                KillControl/W=HDF5BrowserGraph ImageLayer
-                ControlBar/W=HDF5BrowserGraph 0
-        endif
-                
-        String title = "HDF5 Preview - "
-        if (isAttribute)
-                title += NI2_SelectedAttributeName(bd, objectType==1)
-        else
-                title += NI2_SelectedDatasetName(bd)
-        endif
-        title = title[0,39]                             // Unfortunately titles are limited to 40 characters.
-        DoWindow /T HDF5BrowserGraph, title
-        
-        SetDataFolder savedDataFolder
-End
-
-// *** DISPLAY IN TABLE ***
-
-Function NI2_HDF5BrowserTableIsVisible()                // Returns true if dump window exists and is visible.
-                                                                                // Returns false if it does not exist or is invisible.
-        DoWindow  HDF5BrowserTable
-        if (V_flag == 0)
-                return 0                                        // Does not exist
-        endif
-        
-        // Tables are always visible so we don't need to check that.
-        
-        return 1                                                // This will never execute.                                                     
-End
-
-Function NI2_HDF5BrowserTableHook(infoStr)
-        String infoStr
-
-        String event= StringByKey("EVENT",infoStr)
-
-        strswitch(event)
-                case "activate":                                // We do not get this on Windows when the panel is first created.
-                        break
-                        
-                case "resize":
-                case "moved":                                   // This message was added in Igor Pro 5.04B07.
-                        SetPrefWindowCoords("HDF5BrowserTable")
-                        break
-        endswitch
-        
-        return 0
-End
-
-Function NI2_HDF5CreateBrowserTable()
-        DoWindow HDF5BrowserTable
-        if (V_flag == 0)
-                Variable left, top, right, bottom
-                GetPrefWindowCoords("HDF5BrowserTable", left, top, right, bottom)
-                if (right > left)                                                                       // Were prefs ever set?
-                        Edit /K=1 /W=(left, top, right, bottom)
-                else
-                        Edit /K=1
-                endif
-                DoWindow/C HDF5BrowserTable
-                SetWindow HDF5BrowserTable,hook=HDF5BrowserTableHook
-        endif
-End
-
-static Function DisplayTableOfSelectedData(bd, isAttribute, objectType, listOfWavesLoaded)              // The data is already loaded into waves listed by listOfWavesLoaded
-        STRUCT NI2HDF5BrowserData &bd
-        Variable isAttribute
-        Variable objectType                             // Host object type of attribute. 1=group, 2=dataset
-        String listOfWavesLoaded
-        
-        NI2_HDF5CreateBrowserTable()
-
-        String waveLoaded
-        Variable index
-        
-        // Remove any waves in table not in listOfWavesLoaded
-        index = 0
-        do
-                Wave/Z tableWave = WaveRefIndexed("HDF5BrowserTable", index, 3)
-                if (!WaveExists(tableWave))
-                        break
-                endif
-                
-                String nameOfTableWave = NameOfWave(tableWave)
-                if (WhichListItem(nameOfTableWave, listOfWavesLoaded) < 0)
-                        RemoveFromTable /W=HDF5BrowserTable tableWave
-                        KillWaves/Z tableWave
-                        index -= 1
-                endif
-                
-                index += 1
-        while(1)
-
-        // Append any waves to table in listOfWavesLoaded
-        index = 0
-        do
-                waveLoaded = StringFromList(index, listOfWavesLoaded)
-                if (strlen(waveLoaded) == 0)
-                        break
-                endif
-                Wave browserWave = root:Packages:HDF5Browser:$waveLoaded
-        
-                CheckDisplayed /W=HDF5BrowserTable browserWave
-                if (V_flag == 0)
-                        AppendToTable /W=HDF5BrowserTable browserWave
-                endif
-                
-                index += 1
-        while(1)
-
-        String title = "HDF5 Preview - "
-        if (isAttribute)
-                title += NI2_SelectedAttributeName(bd, objectType==1)
-        else
-                title += NI2_SelectedDatasetName(bd)
-        endif
-        title = title[0,39]                             // Unfortunately titles are limited to 40 characters.
-        DoWindow /T HDF5BrowserTable, title
-End
-
-static Function RemoveFromGraphAndTable(w)
-        Wave w
-        
-        String name = NameOfWave(w)
-        
-        if (NI2_HDF5BrowserGraphIsVisible())
-                CheckDisplayed /W=HDF5BrowserGraph w
-                if (V_flag != 0)
-                        Variable isImage = strlen(ImageNameList("HDF5BrowserGraph", ";")) > 0
-                        if (isImage)
-                                RemoveImage /W=HDF5BrowserGraph $name
-                        else
-                                RemoveFromGraph /W=HDF5BrowserGraph $name
-                        endif
-                endif
-        endif
-        
-        if (NI2_HDF5BrowserTableIsVisible())
-                CheckDisplayed /W=HDF5BrowserTable w
-                if (V_flag != 0)
-                        RemoveFromTable /W=HDF5BrowserTable w
-                endif
-        endif
-End
-
-//      KillConflictingBrowserWaves(new_class_str, enumMode)
-//      "Conflicting" means that a wave is text and we are going
-// to use the same name to load a numeric wave or vice versa.
-// This function removes conflicting waves from the browser graph
-// and table and then kills them.
-static Function KillConflictingBrowserWaves(new_class_str, enumMode)
-        String new_class_str                            // Class of data we are about to load.
-        Variable enumMode
-
-        String browserDF = "root:Packages:HDF5Browser"
-        Variable numWaves = CountObjects(browserDF, 1)
-        Variable i
-
-        for(i=0; i<numWaves; i+=1)
-                String name = GetIndexedObjName(browserDF, 1, i)
-                if (strlen(name)>=11 && CmpStr(name[0,11],"browserWave")==0)    // Is this a browser display wave?
-                        Wave w = $(browserDF + ":" + name)
-
-                        Variable oldDataIsText
-                        oldDataIsText = WaveType(w) == 0
-        
-                        Variable newDataIsText
-                        
-                        newDataIsText = 0
-                        strswitch(new_class_str)
-                                case "H5T_STRING":
-                                case "H5T_REFERENCE":
-                                        newDataIsText = 1
-                                        break
-                                        
-                                case "H5T_ENUM":
-                                        if (enumMode == 1)
-                                                newDataIsText = 1
-                                        endif
-                                        break
-                                        
-                                case "H5T_COMPOUND":
-                                        // If we are loading all members of a compound dataset
-                                        // at this point we need to know the class of the compound
-                                        // member corresponding to the current wave. However, this
-                                        // is very complicated to do and I decided not to attempt it.
-                                        // The result is that, if we have an existing brower_<member>
-                                        // wave whose type is string and we try to load a numeric wave
-                                        // with the same name, HDF5LoadWave will get a "Can't overwrite
-                                        // text with numeric and vice versa" error.
-                                        break
-                        endswitch
-                        
-                        if (newDataIsText != oldDataIsText)
-                                RemoveFromGraphAndTable(w)
-                                KillWaves w
-                                // Printf "Killed %s\r", name
-                        endif
-                endif
-        endfor
-End
-
-static Function LoadSelectedDataForDisplay(bd, isAttribute, objectType, listOfWavesLoaded, errorMessage)
-        STRUCT NI2HDF5BrowserData &bd
-        Variable isAttribute
-        Variable objectType                                     // Host object type of attribute. 1=group, 2=dataset
-        String &listOfWavesLoaded               // Output: List of waves loaded.
-        String &errorMessage                            // Output: Error message or ""
-        
-#if Exists("HDF5OpenFile")      
-        Variable err = 0
-        errorMessage = ""
-
-        Wave/Z browserWave = root:Packages:HDF5Browser:browserWave
-        
-        String path
-        if (isAttribute)
-                if (objectType == 1)
-                        path = NI2_SelectedGroupPath(bd)
-                else
-                        path = NI2_SelectedDatasetPath(bd)
-                endif
-        else
-                path = NI2_SelectedDatasetPath(bd)
-        endif
-        if (strlen(path) == 0)
-                return -1
-        endif
-        
-        String attributeName = ""
-        if (isAttribute)
-                attributeName = NI2_SelectedAttributeName(bd, objectType==1)
-                if (strlen(attributeName) == 0)
-                        return -1
-                endif
-        endif
-
-        STRUCT NI2_HDF5DataInfo di
-        NI2_InitHDF5DataInfo(di)
-        if (isAttribute)
-                HDF5AttributeInfo(bd.fileID, path, objectType, attributeName, 0, di)
-        else
-                HDF5DatasetInfo(bd.fileID, path, 0, di)
-        endif
-        
-        String datatype_class_str = di.datatype_class_str
-
-        STRUCT NI2_HDF5DatatypeInfo dti
-        NI2_InitHDF5DatatypeInfo(dti)                                   // Sets input fields.
-
-        Variable isCompound = 0
-        Variable compMode = 0
-        String memberName = ""
-        if (!isAttribute)                       // We support viewing members only for datasets, not for attributes.
-                NI2_HDF5GetCompLoadInfo(bd, isCompound, compMode, memberName)
-        endif
-        
-        if (compMode != 0)                      // Are we loading a member of a compound datatype?
-                err = HDF5TypeInfo(bd.fileID, path, "", memberName, 1, dti)
-                if (err != 0)
-                        return err
-                endif
-                datatype_class_str = dti.type_class_str
-        else
-                // If array, we need to know about the base datatype of the array
-                if (CmpStr(datatype_class_str, "H5T_ARRAY") == 0)
-                        if (isAttribute)
-                                HDF5AttributeInfo(bd.fileID, path, objectType, attributeName, 2, di)            // 2 means get info on base datatype of array
-                        else
-                                HDF5DatasetInfo(bd.fileID, path, 2, di) // 2 means get info on base datatype of array
-                        endif
-                endif
-                datatype_class_str = di.datatype_class_str
-        endif
-
-        err = NI2_HDF5CheckDataClass(datatype_class_str, errorMessage)
-        if (err != 0)
-                if (WaveExists(browserWave))
-                        Redimension/N=(0) browserWave           // Don't leave browserWave around which a user might
-                endif                                                                                           // think goes with the selected item in the control panel
-                return err
-        endif
-        
-        String savedDataFolder = NI2_SetBrowserDataFolder("")                                   // tempClassAttribute goes in master HDF5Browser data folder
-        
-        // If isFormalImage is true, we are loading an image written
-        // according to the HDF5 Image and Palette Specification.
-        Variable isFormalImage = 0
-        if (!isAttribute && !isCompound)
-                HDF5LoadData /Z /O /N=tempClassAttribute /A="CLASS" /Q /VAR=1 bd.fileID, path
-                if (V_flag == 0)
-                        WAVE/T tempClassAttribute                       // HDF5LoadData will have created this string
-                        if (CmpStr(tempClassAttribute[0],"IMAGE") == 0)
-                                isFormalImage = 1
-                        endif   
-                        KillWaves/Z tempClassAttribute
-                endif
-        endif
-
-        SetDataFolder savedDataFolder
-        
-        Variable enumMode = 1                                           // 0: Load enum into numeric wave; 1: load enum into text wave.
-        
-        // If browserWave exists and we are switching from a text wave to a numeric wave
-        // or vice-versa then we must remove browserWave from the graph and table and
-        // kill it. Otherwise we will get an error when HDF5LoadData tries to overwrite
-        // a text wave with numeric or vice versa.
-        KillConflictingBrowserWaves(datatype_class_str, enumMode)       // Also removes them from graph and table.
-        
-        savedDataFolder = NI2_SetBrowserDataFolder("")                                  // browser waves go in master HDF5Browser data folder
-
-        String slabWaveStr = ""
-        ControlInfo /W=$bd.browserName UseHyperSelection
-        if (V_value)                                                            // Use Hyperselection is checked?
-                slabWaveStr = bd.hyperSelectionWavePath
-        endif
-        WAVE/Z slabWave = $slabWaveStr                  // It is OK if wave does not exist and slabWave is NULL. HDF5LoadData will simply ignore /SLAB.
-
-        if (isFormalImage)
-                String browserPaletteName = "browserPalette"
-                HDF5LoadImage /O /N=browserWave /PALN=browserPaletteName /Q bd.fileID, path
-                Variable/G formalImageType = 1          // Means formal image with no palette
-                listOfWavesLoaded = StringFromList(0, S_waveNames)      // We count only the image as loaded, not the palette.
-                if (WhichListItem(browserPaletteName, S_waveNames) >= 0)
-                        formalImageType = 2                                     // Means formal image with palette
-                endif
-        else
-                KillWaves/Z browserPalette
-
-                Variable transpose2D = NI2_HDF5GetTranspose2DSetting(bd.browserName)
-
-                // Note that when loading all members of a compound dataset this
-                // will create a family of waves named browserWave_<member>.
-                // Also when loading a VLEN dataset it will create a family of
-                // waves named browserWave<digit>. Otherwise it just creates
-                // one wave named browserWave.
-                HDF5LoadData /O /IGOR=-1 /N=browserWave /COMP={compMode,memberName} /TRAN=(transpose2D) /A=attributeName /TYPE=(objectType) /ENUM=(enumMode) /SLAB=slabWave /Q /VAR=0 bd.fileID, path
-
-                Variable/G formalImageType = 0          // Not a formal image
-                listOfWavesLoaded = S_waveNames
-        endif
-        
-        errorMessage = GetRTErrMessage()
-        err = GetRTError(1)
-
-        SetDataFolder savedDataFolder
-        return err
-#else
-        Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
-#endif
-End
-
-Function NI2_HDF5DisplaySelectedDataset(bd)
-        STRUCT NI2HDF5BrowserData &bd
-
-        if (NI2_HDF5BrowserDumpIsVisible())
-                DisplayDumpOfSelectedDataset(bd)
-        endif
-
-        String listOfWavesLoaded = ""   
-        
-        Variable needToLoadData = NI2_HDF5BrowserGraphIsVisible() || NI2_HDF5BrowserTableIsVisible()
-        if (needToLoadData)
-                String errorMessage
-                if (LoadSelectedDataForDisplay(bd, 0, 2, listOfWavesLoaded, errorMessage) != 0)
-                        DoAlert 0, errorMessage
-                        return -1
-                endif
-        endif
-
-        if (NI2_HDF5BrowserGraphIsVisible())
-                DisplayGraphOfSelectedData(bd, 0, 1, listOfWavesLoaded)
-        endif
-
-        if (NI2_HDF5BrowserTableIsVisible())
-                DisplayTableOfSelectedData(bd, 0, 1, listOfWavesLoaded)
-        endif
-End
-
-Function NI2_HDF5DisplaySelAttribute(bd,  isGroupAttribute)
-        STRUCT NI2HDF5BrowserData &bd
-        Variable isGroupAttribute
-        
-        if (NI2_HDF5BrowserDumpIsVisible())
-                DisplayDumpOfSelectedAttribute(bd, isGroupAttribute)
-        endif
-        
-        Variable objectType = isGroupAttribute ? 1:2
-        
-        String listOfWavesLoaded = ""
-        
-        Variable needToLoadData = NI2_HDF5BrowserGraphIsVisible() || NI2_HDF5BrowserTableIsVisible()
-        if (needToLoadData)
-                String errorMessage
-                if (LoadSelectedDataForDisplay(bd, 1, objectType, listOfWavesLoaded, errorMessage))
-                        DoAlert 0, errorMessage
-                        return -1
-                endif
-        endif
-
-        if (NI2_HDF5BrowserGraphIsVisible())
-                DisplayGraphOfSelectedData(bd, 1, objectType, listOfWavesLoaded)
-        endif
-
-        if (NI2_HDF5BrowserTableIsVisible())
-                DisplayTableOfSelectedData(bd, 1, objectType, listOfWavesLoaded)
-        endif
-End
-
-// ************* End of HDF5 Browser Display Routines ***************
-
-// ************* Start of HDF5 Browser Resize Routines ***************
-
-static Function MinWindowSize(winName,minwidth,minheight)
-        String winName
-        Variable minwidth,minheight
-
-        GetWindow $winName wsize
-        Variable width= max(V_right-V_left,minwidth)
-        Variable height= max(V_bottom-V_top,minheight)
-        MoveWindow/W=$winName V_left, V_top, V_left+width, V_top+height
-End
-
-Function NI2_PositionControlRelative(panelName, control, masterControl, xMode, yMode, dx, dy)
-        String panelName
-        String control, masterControl           // Positions control relative to masterControl.
-        Variable xMode          // 0 = relative to master left, 1 = relative to master right, 2 = do not set x position.
-        Variable yMode          // 0 = relative to master top, 1 = relative to master bottom, 2 = do not set y position.
-        Variable dx, dy
-        
-        ControlInfo/W=$panelName $masterControl
-        Variable masterLeft = V_left, masterTop = V_top
-        Variable masterRight = masterLeft+V_width, masterBottom=masterTop+V_height
-        
-        ControlInfo/W=$panelName $control
-        Variable controlLeft = V_left, controlTop = V_top
-        
-        Variable left, top
-        
-        switch(xMode)
-                case 0:
-                        left = masterLeft + dx
-                        break
-        
-                case 1:
-                        left = masterRight + dx
-                        break
-                
-                case 2:
-                        left = controlLeft
-                        break
-        endswitch
-        
-        switch(yMode)
-                case 0:
-                        top = masterTop + dy
-                        break
-        
-                case 1:
-                        top = masterBottom + dy
-                        break
-                
-                case 2:
-                        top = controlTop
-                        break
-        endswitch
-
-        ModifyControl $control, win=$panelName, pos={left, top}
-End
-
-Function NI2_OffsetControls(panelName, controlList, dx, dy)
-        String panelName
-        String controlList      // Semicolon-separated list of control names
-        Variable dx, dy
-        
-        String name
-        Variable index = 0
-        do
-                name = StringFromList(index, controlList)
-                if (strlen(name) == 0)
-                        break
-                endif
-                
-                ControlInfo/W=$panelName $name
-                ModifyControl $name, win=$panelName, pos={V_left+dx,V_top+dy}
-
-                index += 1
-        while(1)
-End
-
-Function NI2_HDF5ResizeBrowser(browserName)
-        String browserName
-
-        Variable statusCode= 0
-
-        String win = browserName
-
-        GetWindow $browserName wsizeDC
-        Variable winLeft=V_left, winTop=V_top, winRight=V_right, winBottom=V_bottom
-        Variable winWidth = winRight - winLeft, winHeight = winBottom - winTop
-
-        if (winWidth<800 || winHeight<500)
-                return 0                                                // Too small.
-        endif
-        
-        // Set preferred browser window size. We would like to also do this
-        // when the browser is moved without resizing but we get no message
-        // from Igor when a window is moved.
-        SetPrefWindowCoords(browserName)
-        
-        Variable leftBorder=15, hSpaceBetweenLists=20, rightBorder=15
-        Variable listsTop, vSpaceBetweenLists = 30, bottomBorder = 10
-        
-        ControlInfo/W=$browserName GroupsList
-        listsTop = V_top
-        
-        Variable hSpaceForLists = winRight - winLeft - leftBorder - hSpaceBetweenLists - rightBorder
-        Variable vSpaceForLists = winBottom - listsTop - vSpaceBetweenLists - bottomBorder
-        
-        Variable groupListsWidth = .3 * hSpaceForLists
-        Variable datasetListsWidth = .45 * hSpaceForLists
-        Variable NikaListsWidth = .23 * hSpaceForLists
-        
-        Variable groupListsHeight = .65 * vSpaceForLists
-        Variable attributeListsHeight = .35 * vSpaceForLists
-        
-        Variable left, top
-        
-        // Set Groups list coordinates
-        left = leftBorder
-        top = listsTop
-        ListBox GroupsList, win=$browserName, pos={left, top}, size={groupListsWidth, groupListsHeight}
-        
-        // Set Group Attributes list coordinates
-        left = leftBorder
-        top = listsTop + groupListsHeight + vSpaceBetweenLists
-        ListBox GroupAttributesList, win=$browserName, pos={left, top}, size={groupListsWidth, attributeListsHeight}
-        
-        top -= 20
-        TitleBox GroupAttributesTitle, win=$browserName, pos={left, top}
-
-        // Remember where DatasetsList is. it is used to position other control.
-        ControlInfo/W=$browserName DatasetsList
-        Variable oldDatasetsListRight = V_Left + V_Width
-        
-        // Set Datasets list coordinates
-        left = leftBorder + groupListsWidth + hSpaceBetweenLists
-        top = listsTop
-        ListBox DatasetsList, win=$browserName, pos={left, top}, size={datasetListsWidth, groupListsHeight}
-        
-        // Determine how DatasetsList right edge changed. This is used to position other control.
-        ControlInfo/W=$browserName DatasetsList
-        Variable changeInDatsetsListRight = (V_Left + V_Width) - oldDatasetsListRight
-        
-        // Set Datasets Title
-        top -= 20
-        TitleBox DatasetsTitle, win=$browserName, pos={left, top}
-        
-        // Set Load Dataset Button
-        NI2_PositionControlRelative(browserName, "LoadDataset", "DatasetsTitle", 1, 2, 20, 0)
-//      NI2_PositionControlRelative(browserName, "AddGrouptoList", "DatasetsTitle", 1, 2, 0, -20)
-
-
-        // Set Save Waves Button
-        NI2_PositionControlRelative(browserName, "SaveWaves", "LoadDataset", 1, 2, 20, 0)
-
-        // Set Members popup menu
-        NI2_PositionControlRelative(browserName, "Members", "DatasetsTitle", 0, 2, 0, 0)
-        
-        // Set Dataset Attributes list coordinates
-        left = leftBorder + groupListsWidth + hSpaceBetweenLists
-        top = listsTop + groupListsHeight + vSpaceBetweenLists
-        ListBox DatasetAttributesList, win=$browserName, pos={left, top}, size={datasetListsWidth, attributeListsHeight}
-        
-        top -= 20
-        TitleBox DatasetAttributesTitle, win=$browserName, pos={left, top}
-
-        // Set Preview Options
-        String list = "PreviewOptions;Graph;Table;Dump;ShowAttributesInDump;ShowDataInDump;"
-        NI2_OffsetControls(browserName, list, changeInDatsetsListRight, 0)
-
-        // Set Load Dataset Options
-        list = "LoadDatasetOptions;DisplayInTable;DisplayInGraph;"
-        NI2_OffsetControls(browserName, list, changeInDatsetsListRight, 0)
-
-        //Set Nika controls
-        // Set Datasets list coordinates
-        left = leftBorder + groupListsWidth + hSpaceBetweenLists+datasetListsWidth+hSpaceBetweenLists
-        top = listsTop
-
-        ListBox NikaGroupList, win=$browserName, pos={left, top}, size={NikaListsWidth, groupListsHeight}
-        // Set Load Dataset Button
-        NI2_PositionControlRelative(browserName, "NikaDataSetsTitle", "NikaGroupList", 0, 0, 30, -20)
-        Button AddGrouptoList,win=$browserName, pos={left, top-150}, size={NikaListsWidth, 20}
-        Button ClearDatasetList,win=$browserName, pos={left, top-100}, size={NikaListsWidth, 20}
-
+//
+//Static Function IsHDF5Browser(name)
+//      String name                     // Name of a window
+//      
+//      if (WinType(name) != 7)
+//              return 0                                // Not a control panel window
+//      endif
+//      
+//      String data = GetUserData(name, "", "HDF5BrowserName")  // HDF5BrowserName property is set by CreateHDF5BrowserPanel
+//      if (CmpStr(data,name) == 0)                     // Is this an HDF5Browser?
+//              return 1
+//      endif
+//      
+//      return 0
+//End
+//
+//Function/S NI2_HDF5GetIndxBrowserName(index)
+//      Variable index
+//      
+//      if (index < 0)
+//              return ""                               // Bad index
+//      endif
+//      
+//      String panelName
+//      
+//      Variable i = 0
+//      do
+//              panelName = WinName(i, 64)
+//              if (strlen(panelName) == 0)
+//                      break
+//              endif
+//              
+//              if (IsHDF5Browser(panelName))           // Is this an HDF5Browser?
+//                      if (index == 0)
+//                              return panelName
+//                      endif
+//                      index -= 1
+//              endif
+//              
+//              i += 1
+//      while(1)
+//      
+//      return ""               // No HDF5 browser with that index
+//End
+//
+//Function/S NI2_HDF5GetTopBrowserName()
+//      String browserName = NI2_HDF5GetIndxBrowserName(0)
+//      return browserName
+//End
+//
+//Function NI2_HDF5AreAnyBrowsersOpen()
+//      String browserName = NI2_HDF5GetIndxBrowserName(0)
+//      if (strlen(browserName) > 0)
+//              return 1
+//      endif
+//      return 0
+//End
+//
+//// FixCloseHDF5FileButtons()
+//// If experiment was saved with an HDF5 file open, it is no longer open but the panel's Open
+//// and Close buttons will be out-of-sync. This fixes that.
+//static Function FixCloseHDF5FileButtons()
+//
+//      STRUCT NI2HDF5BrowserData bd
+//      String browserName
+//      
+//      Variable index = 0
+//      do
+//              browserName = NI2_HDF5GetIndxBrowserName(index)
+//              if (strlen(browserName) == 0)
+//                      break
+//              endif
+//              
+//              SetNI2HDF5BrowserData(browserName, bd)
+//              if (NI2_FileWasUnexpectedlyClosed(bd))
+//                      FileWasClosed(bd)
+//              endif
+//              
+//              index += 1
+//      while(1)
+//End
+//
+//static Function AfterFileOpenHook(refNum,file,pathName,type,creator,kind)
+//      Variable refNum,kind
+//      String file,pathName,type,creator
+//
+//      // DoAlert 0, "AfterFileOpenHook"               // For debugging
+//      
+//      switch (kind)
+//              case 1:                                                                         // Packed experiment
+//              case 2:                                                                         // Unpacked experiment
+//                      FixCloseHDF5FileButtons()               // If experiment was saved with an HDF5 file open, it is no longer open
+//              break
+//      endswitch
+//
+//      return 0
+//End
+//
+//// ************* Start of HDF5 Browser Display Routines ***************
+//
+//static Function WaveRank(w)
+//      Wave w
+//      
+//      Variable dimension
+//      for(dimension=3; dimension>=0; dimension-=1)
+//              if (DimSize(w, dimension) > 0)
+//                      return dimension+1
+//              endif
+//      endfor
+//      
+//      return 0
+//End
+//
+//// *** DISPLAY IN DUMP WINDOW ***
+//
+//Function NI2_HDF5BrowserDumpIsVisible()       // Returns true if dump window exists and is visible.
+//                                                                      // Returns false if it does not exist or is invisible.
+//      DoWindow  HDF5DumpNotebook
+//      if (V_flag == 0)
+//              return 0                                        // Does not exist
+//      endif
+//      
+//      String name
+//      Variable index = 0
+//      do
+//              name = WinName(index, 16, 1)
+//              if (strlen(name) == 0)
+//                      return 0                                // Did not find HDF5DumpNotebook among visible notebooks.
+//              endif
+//              if (CmpStr(name, "HDF5DumpNotebook") == 0)
+//                      return 1                                // Found HDF5DumpNotebook among visible notebooks
+//              endif
+//              index += 1
+//      while(1)
+//      
+//      return 0                                                // This will never execute.                                                     
+//End
+//
+//Function NI2_HDF5BrowserDumpHook(infoStr)
+//      String infoStr
+//
+//      String event= StringByKey("EVENT",infoStr)
+//
+//      strswitch(event)
+//              case "activate":                                // We do not get this on Windows when the panel is first created.
+//                      break
+//                      
+//              case "resize":
+//              case "moved":                                   // This message was added in Igor Pro 5.04B07.
+//                      SetPrefWindowCoords("HDF5DumpNotebook")
+//                      break
+//      endswitch
+//      
+//      return 0
+//End
+//
+//Function NI2_HDF5CreateDumpWindow()
+//      DoWindow HDF5DumpNotebook
+//      if (V_flag == 0)
+//              Variable left, top, right, bottom
+//              GetPrefWindowCoords("HDF5DumpNotebook", left, top, right, bottom)
+//              if (right > left)                                                                                       // Were prefs ever set?
+//                      NewNotebook /F=0 /N=HDF5DumpNotebook/K=1 /W=(left, top, right, bottom)
+//              else
+//                      NewNotebook/F=0/N=HDF5DumpNotebook/K=1
+//              endif
+//              SetWindow HDF5DumpNotebook,hook=HDF5BrowserDumpHook
+//              if (NumType(FontSizeHeight("Courier New", 12, 0)) == 0)         // Courier New exists?
+//                      Notebook HDF5DumpNotebook font="Courier New", fSize=12
+//              endif
+//              Notebook HDF5DumpNotebook text="A dump will appear here when you click a dataset.\r"
+//      endif
+//End
+//
+//// CleanupDump(dump)
+//// Removes nulls, converts \n to CR, etc. Dump of NASA strings can contain lots of such "garbage".
+//// For an example, see the attribute /StructMetadata.O_GLOSDS in the NASA sample file MISRAERO.h5.
+//static Function/S CleanupDump(dump)
+//      String dump
+//      
+//      // Convert literal string "\000" to "". Null characters are represented in dump by "\000"
+//      dump = ReplaceString("\\000", dump, "", 1)
+//      
+//      // Convert literal string "\r\n" to CR
+//      dump = ReplaceString("\\r\\n", dump, "\r", 1)
+//      
+//      // Convert literal string "\r" to CR
+//      dump = ReplaceString("\\r", dump, "\r", 1)
+//      
+//      // Convert literal string "\n" to CR
+//      dump = ReplaceString("\\n", dump, "\r", 1)
+//      
+//      // Convert literal string "\t" to tab
+//      dump = ReplaceString("\\t", dump, "\t", 1)
+//      
+//      // Convert CRLF to CR
+//      dump = ReplaceString("\r\n", dump, "\r", 1)
+//      
+//      // Convert LF to CR
+//      dump = ReplaceString("\n", dump, "\r", 1)
+//      
+//      return dump
+//End
+//
+//Function NI2_HDF5DisplayDumpOfSelGroup(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//#if Exists("HDF5OpenFile")    
+//      String path = NI2_SelectedGroupPath(bd)
+//      if (strlen(path) == 0)
+//              return -1
+//      endif
+//      
+//      ControlInfo /W=$bd.browserName ShowAttributesInDump
+//      Variable showAttributes = V_value
+//      HDF5Dump /Q /H=1 /ATTR=(showAttributes) /G=path bd.fullPath                                     // This sets S_HDF5Dump.
+//      S_HDF5Dump = CleanupDump(S_HDF5Dump)    
+//      
+//      NI2_HDF5CreateDumpWindow()
+//      
+//      Notebook HDF5DumpNotebook selection={startOfFile, endOfFile}
+//      Notebook HDF5DumpNotebook text=S_HDF5Dump
+//      Notebook HDF5DumpNotebook selection={startOfFile, startOfFile}, findText={"",1}
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function DisplayDumpOfSelectedDataset(bd)
+//      STRUCT NI2HDF5BrowserData &bd
+//      
+//#if Exists("HDF5OpenFile")    
+//      String datasetPath = NI2_SelectedDatasetPath(bd)
+//      if (strlen(datasetPath) == 0)
+//              return -1
+//      endif
+//      
+//      ControlInfo /W=$bd.browserName ShowAttributesInDump
+//      Variable showAttributes = V_value
+//      ControlInfo /W=$bd.browserName ShowDataInDump
+//      Variable showData = V_value
+//      HDF5Dump /Q /ATTR=(showAttributes) /H=(!showData) /D=datasetPath bd.fullPath                    // This sets S_HDF5Dump.
+//      S_HDF5Dump = CleanupDump(S_HDF5Dump)    
+//      
+//      NI2_HDF5CreateDumpWindow()
+//      
+//      Notebook HDF5DumpNotebook selection={startOfFile, endOfFile}
+//      Notebook HDF5DumpNotebook text=S_HDF5Dump
+//      Notebook HDF5DumpNotebook selection={startOfFile, startOfFile}, findText={"",1}
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//static Function DisplayDumpOfSelectedAttribute(bd, isGroupAttribute)
+//      STRUCT NI2HDF5BrowserData &bd
+//      Variable isGroupAttribute
+//      
+//#if Exists("HDF5OpenFile")    
+//      String path = NI2_SelectedAttributePath(bd, isGroupAttribute)
+//      if (strlen(path) == 0)
+//              return -1
+//      endif
+//      
+//      HDF5Dump /Q /A=path bd.fullPath                                 // This sets S_HDF5Dump.
+//      S_HDF5Dump = CleanupDump(S_HDF5Dump)    
+//      
+//      NI2_HDF5CreateDumpWindow()
+//      
+//      Notebook HDF5DumpNotebook selection={startOfFile, endOfFile}
+//      Notebook HDF5DumpNotebook text=S_HDF5Dump
+//      Notebook HDF5DumpNotebook selection={startOfFile, startOfFile}, findText={"",1}
+//#else
+//      Abort "Hdf5 xop is not found. Reinstall xops using one of the Installers or link the hdf5.xop from Igor distribution to your Igor extensions folder"
+//#endif
+//End
+//
+//// *** DISPLAY IN GRAPH ***
+//
+//Function NI2_HDF5BrowserGraphIsVisible()              // Returns true if dump window exists and is visible.
+//                                                                              // Returns false if it does not exist or is invisible.
+//      DoWindow  HDF5BrowserGraph
+//      if (V_flag == 0)
+//              return 0                                        // Does not exist
+//      endif
+//      
+//      // Graphs are always visible so we don't need to check that.
+//      
+//      return 1                                                // This will never execute.                                                     
+//End
+//
+//Function NI2_HDF5BrowserGraphHook(infoStr)
+//      String infoStr
+//
+//      String event= StringByKey("EVENT",infoStr)
+//
+//      strswitch(event)
+//              case "activate":                                // We do not get this on Windows when the panel is first created.
+//                      break
+//                      
+//              case "resize":
+//              case "moved":                                   // This message was added in Igor Pro 5.04B07.
+//                      SetPrefWindowCoords("HDF5BrowserGraph")
+//                      break
+//      endswitch
+//      
+//      return 0
+//End
+//
+//Function NI2_HDF5CreateBrowserGraph()
+//      DoWindow HDF5BrowserGraph
+//      if (V_flag == 0)
+//              Variable left, top, right, bottom
+//              GetPrefWindowCoords("HDF5BrowserGraph", left, top, right, bottom)
+//              if (right > left)                                                                       // Were prefs ever set?
+//                      Display /K=1 /W=(left, top, right, bottom)
+//              else
+//                      Display /K=1
+//              endif
+//              DoWindow/C HDF5BrowserGraph
+//              SetWindow HDF5BrowserGraph,hook=HDF5BrowserGraphHook
+//      endif
+//End
+//
+//static Function SetImageLayer(ctrlName,varNum,varStr,varName) : SetVariableControl
+//      String ctrlName
+//      Variable varNum
+//      String varStr
+//      String varName
+//
+//      NVAR imageLayer = root:Packages:HDF5Browser:imageLayer
+//
+//      ModifyImage /W=HDF5BrowserGraph BrowserWave, plane=varNum
+//End
+//
+//static Function DisplayGraphOfSelectedData(bd, isAttribute, objectType, listOfWavesLoaded)            // The data is already loaded into waves specified by listOfWavesLoaded
+//      STRUCT NI2HDF5BrowserData &bd
+//      Variable isAttribute
+//      Variable objectType                             // Host object type of attribute. 1=group, 2=dataset
+//      String listOfWavesLoaded
+//
+//      NI2_HDF5CreateBrowserGraph()
+//
+//      String firstWaveLoaded = StringFromList(0, listOfWavesLoaded)
+//      Wave browserWave = root:Packages:HDF5Browser:$firstWaveLoaded
+//      Variable newDataIsText = WaveType(browserWave) == 0
+//
+//      Variable oldRank = 0, newRank = 0
+//      if (strlen(TraceNameList("HDF5BrowserGraph", ";", 1)) > 0)
+//              oldRank = 1                                     
+//      endif
+//      if (strlen(ImageNameList("HDF5BrowserGraph", ";")) > 0)
+//              oldRank = 2
+//      endif
+//      newRank = WaveRank(browserWave) // Will be zero for zero-point wave
+//
+//      String savedDataFolder = NI2_SetBrowserDataFolder("")                                   // browserWave goes in master HDF5Browser data folder
+//
+//      Variable displayedDimensionalityChanged = (oldRank <= 1) != (newRank <= 1)      // Switching between 1D and >1D ?
+//      Variable index, browserWaveIsDisplayed
+//      String waveLoaded, nameOfGraphWave
+//      
+//      // Remove any waves in graph not in listOfWavesLoaded or all waves if dimensionality changed
+//      index = 0
+//      do
+//              if (oldRank == 1)
+//                      Wave/Z graphWave = WaveRefIndexed("HDF5BrowserGraph", index, 1)
+//                      if (!WaveExists(graphWave))
+//                              break
+//                      endif
+//                      nameOfGraphWave = NameOfWave(graphWave)
+//              else
+//                      nameOfGraphWave = StringFromList(index, ImageNameList("HDF5BrowserGraph", ";" ))
+//                      if (strlen(nameOfGraphWave) == 0)
+//                              break
+//                      endif
+//              endif
+//              
+//              Variable waveIsInListOfLoadedWaves = WhichListItem(nameOfGraphWave, listOfWavesLoaded) >= 0
+//              if (displayedDimensionalityChanged || !waveIsInListOfLoadedWaves)
+//                      if (oldRank == 1)
+//                              RemoveFromGraph /W=HDF5BrowserGraph $nameOfGraphWave
+//                      endif
+//                      if (oldRank > 1)
+//                              RemoveImage /W=HDF5BrowserGraph $nameOfGraphWave
+//                      endif
+//                      index -= 1
+//              endif
+//              if (!waveIsInListOfLoadedWaves)
+//                      KillWaves/Z $nameOfGraphWave
+//              endif
+//              
+//              index += 1
+//      while(1)
+//
+//      // Append any waves to graph in listOfWavesLoaded
+//      index = 0
+//      do
+//              waveLoaded = StringFromList(index, listOfWavesLoaded)
+//              if (strlen(waveLoaded) == 0)
+//                      break
+//              endif
+//              Wave browserWave = root:Packages:HDF5Browser:$waveLoaded
+//              Variable browserWaveType = WaveType(browserWave)
+//              nameOfGraphWave = waveLoaded
+//
+//              CheckDisplayed /W=HDF5BrowserGraph browserWave
+//              browserWaveIsDisplayed = V_flag
+//              
+//              if (!newDataIsText)
+//                      if (browserWaveType != 0)