1. Richard Gerkin
  2. Recording Artist

Commits

Richard Gerkin  committed a4359e5

ORCID id now shows correctly

  • Participants
  • Parent commits 83b5386
  • Branches default

Comments (0)

Files changed (2)

File Core/Profiles.ipf

View file
  • Ignore whitespace
 // to a directory (Core) containing Symbols.ipf already exists in the Igor Procedures folder.  
 
 static strconstant editor="EditProfilesWin"
-static strconstant moduleInfo_="root:Packages:Profiles"
 strconstant FLAGS_LONG="Developer;Acquisition;Neuralynx"
 constant DEV=0
 constant ACQ=1
 	TitleBox $("Title_Orcid"), pos={xMargin,yy-5}, title="ORCID id"
 	Button $Hash32("orcid_expand_"+profileName) pos={xx-25,yy}, size={15,15}, title="+", proc=Core#EditProfilesButtons
 	Button $Hash32("orcid_expand_"+profileName) userData="NAME:"+profileName+";EXPANDED:0;ACTION:Expand;TARGET:"+Hash32("orcid_"+profileName)
-	SetVariable $Hash32("orcid_"+profileName), pos={xx-10,yy}, size={55,20}, value=_STR:"", title=" "
+	SetVariable $Hash32("orcid_"+profileName), pos={xx-10,yy}, size={55,20}, value=_STR:profile.orcid, title=" "
 	yy+=yJump
 	TitleBox $("Title_Modules"), pos={xMargin,yy-5}, title="Modules:"
 	yy+=yJump

File Core/Settings.ipf

View file
  • Ignore whitespace
 
 //#ifdef Dev
 strconstant moduleEditor="EditModuleWin"
-strconstant moduleInfo="root:Packages:Profiles"
+strconstant moduleInfo_="root:Packages:Profiles"
 strconstant moduleHome_="root:parameters"
 strconstant defaultInstanceName="Generic"
 
 	variable quiet,load
 	
 	sub=selectstring(!paramisdefault(sub),"",sub)
-	string loc=moduleInfo+":"+module+":Manifest:"+package
+	string loc=ModuleInfo_+":"+module+":Manifest:"+package
 	loc=JoinPath({loc,sub})
 	dfref manifest=$loc
 	if(!datafolderrefstatus(manifest))
 	variable quiet
 	
 	load=paramisdefault(load) ? 1 : load
-	string loc=joinpath({moduleInfo,module,"Manifest"})
+	string loc=joinpath({ModuleInfo(),module,"Manifest"})
 	dfref df=$loc
 	if(!datafolderrefstatus(df))
 		string str=""
 		duplicatedatafolder source dest:$name // Copy it into its new home in memory.  
 		
 		// If it was scheduled to be deleted in the next save, remove it from the deletion queue.  
-		dfref deleted=$joinpath({moduleInfo,module,"Deleted"})
+		dfref deleted=$joinpath({ModuleInfo(),module,"Deleted"})
 		if(datafolderrefstatus(deleted))
 			svar /z/sdfr=deleted deletedInstances=$package
 			if(svar_exists(deletedInstances))
 			printf "Could not kill existing package instance %s of the same name.  Make sure it is not in use.\r",instance
 			return -2
 		endif	
-		dfref deleted=NewFolder(joinpath({moduleInfo,module,"Deleted"}))
+		dfref deleted=NewFolder(joinpath({ModuleInfo(),module,"Deleted"}))
 		svar /z/sdfr=deleted deletedInstances=$package
 		if(!svar_exists(deletedInstances))
 			string /g deleted:$package=""
 			string instance=StringFromList(i,instances)
 			err+=SavePackageInstance(module,package,instance)
 		endfor
-		dfref deleted=$joinpath({moduleInfo,module,"Deleted"})
+		dfref deleted=$joinpath({ModuleInfo(),module,"Deleted"})
 		if(datafolderrefstatus(deleted))
 			svar /z/sdfr=deleted deletedInstances=$package
 			if(svar_exists(deletedInstances))
 	string module
 	variable create,go
 	
-	string path = joinpath({moduleinfo,module,"Manifest"})
+	string path = joinpath({Moduleinfo(),module,"Manifest"})
 	if(create)
 		NewFolder(path,go=go)
 	endif
 	variable scratch,quiet
 	
 	sub=selectstring(!paramisdefault(sub),"",sub)
-	string loc=joinpath({moduleInfo,module,"New",sub})
+	string loc=joinpath({moduleInfo_,module,"New",sub})
 	if(scratch)
 		killdatafolder /z $loc
 	endif