Changeset 11

Timestamp:

Mar 15, 2013 5:03:32 PM (9 years ago)

Author:

ilavsky

Message:

Added cleanup for weird characters in data wave and folder, such as (,),%,$,& etc.

File:

• User Procedures/Irena/IR1_ImportData.ipf (modified) (10 diffs)

User Procedures/Irena/IR1_ImportData.ipf

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
-#pragma version=2.15
+#pragma version=2.16
 Constant IR1IversionNumber = 2.15
 Constant IR1TrimNameLength = 28
@@ -9 +9 @@
 //*************************************************************************/
 
+//2.16 added cleanup of weird characters (,),%, {, } of names. Allowed by igor but cause problems to my opther code. 
 //2.15 added vertical scrolling for panel. 
 //2.14 added option to trunkate long names in front or end.
@@ -493 +494 @@
         //and print in history, so user has some feedback...
         print "Imported data from :"+DataPathName+selectedFile+"\r"
-        print "\tData stored in :\t\t\t"+NewFldrNm
+        print "\tData stored in :\t\t\t"+IR1I_RemoveBadCharacters(NewFldrNm)
         if(DataContainErrors || CreateSQRTErrors || CreatePercentErrors)
-                print  "\tNew Wave names are :\t"+ NewIntName+"\t"+NewQName+"\t"+NewEName+"\r"
+                print  "\tNew Wave names are :\t"+ IR1I_RemoveBadCharacters(NewIntName)+"\t"+IR1I_RemoveBadCharacters(NewQName)+"\t"+IR1I_RemoveBadCharacters(NewEName)+"\r"
         else //no errors...
                 print  "\tNew Wave names are :\t"+ NewIntName+"\t"+NewQName+"\r"
@@ -722 +723 @@
         
         if(stringMatch(NewIntensityWaveName,"*<fileName>*")==0)
+                NewIntName = IR1I_RemoveBadCharacters(NewIntName)
                 NewIntName = CleanupName(NewIntensityWaveName, 1 )
                 NewIntName=IR1I_TrunkateName(NewIntName,TrunkateStart,TrunkateEnd)
@@ -732 +734 @@
                         NewIntName = TempFirstPart+IR1I_TrunkateName(StringFromList(0,selectedFile,"."),TrunkateStart,TrunkateEnd)+tempLastPart
                 endif
+                NewIntName = IR1I_RemoveBadCharacters(NewIntName)
                 NewIntName = CleanupName(NewIntName, 1 )
         endif
         if(stringMatch(NewQwaveName,"*<fileName>*")==0)
+                NewQName =IR1I_RemoveBadCharacters(NewQName)
                 NewQName = CleanupName(NewQwaveName, 1 )
                 NewQName=IR1I_TrunkateName(NewQName,TrunkateStart,TrunkateEnd)
@@ -745 +749 @@
                         NewQName = TempFirstPart+IR1I_TrunkateName(StringFromList(0,selectedFile,"."),TrunkateStart,TrunkateEnd)+tempLastPart
                 endif
+                NewQName =IR1I_RemoveBadCharacters(NewQName)
                 NewQName = CleanupName(NewQName, 1 )
         endif
         if(stringMatch(NewErrorWaveName,"*<fileName>*")==0)
+                NewEName =IR1I_RemoveBadCharacters(NewEName)
                 NewEName = CleanupName(NewErrorWaveName, 1 )
                 NewEName=IR1I_TrunkateName(NewEName,TrunkateStart,TrunkateEnd)
@@ -758 +764 @@
                         NewEName = TempFirstPart+IR1I_TrunkateName(StringFromList(0,selectedFile,"."),TrunkateStart,TrunkateEnd)+tempLastPart
                 endif
+                NewEName =IR1I_RemoveBadCharacters(NewEName)
                 NewEName = CleanupName(NewEName, 1 )
         endif
         if(stringMatch(NewQErrorWaveName,"*<fileName>*")==0)
+                NewQEName =IR1I_RemoveBadCharacters(NewQEName)
                 NewQEName = CleanupName(NewQErrorWaveName, 1 )
                 NewQEName=IR1I_TrunkateName(NewQEName,TrunkateStart,TrunkateEnd)
@@ -771 +779 @@
                         NewQEName = TempFirstPart+IR1I_TrunkateName(StringFromList(0,selectedFile,"."),TrunkateStart,TrunkateEnd)+tempLastPart
                 endif
+                NewQEName =IR1I_RemoveBadCharacters(NewQEName)
                 NewQEName = CleanupName(NewQEName, 1 )
         endif
@@ -808 +817 @@
 
         IR1I_KillAutoWaves()
+end
+//************************************************************************************************************
+//************************************************************************************************************
+//************************************************************************************************************
+//************************************************************************************************************
+Function/S IR1I_RemoveBadCharacters(StringName)
+        string StringName
+        
+        //here we can clean up waht Igor allows but would be major problem with my code, such as ( or ) from names
+        make/Free/T/N=0 ListOfBadChars
+        ListOfBadChars = {"(", ")", "{","}","%","&","$","#","@"}
+        variable i
+        For (i=0;i<numpnts(ListOfBadChars);i+=1)
+                StringName = ReplaceString(ListOfBadChars[i], StringName, "_" )
+        endfor
+        return StringName
 end
 //************************************************************************************************************
@@ -908 +933 @@
                         endif
                         selectedFile=IR1I_TrunkateName(selectedFile,TrunkateStart,TrunkateEnd)
+                        selectedFile =IR1I_RemoveBadCharacters(selectedFile)
                         selectedFile = CleanupName(selectedFile, 1 )
                         NewDataFolder/O/S $selectedFile