pearl-public/igor-public
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

igor 8 compatibility

Browse Source
This commit is contained in:
muntwiler_m
2019-08-14 17:56:14 +02:00
parent 58135e4f4f
commit 6ab1cefec2
8 changed files with 339 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pearl/pearl-area-display.ipf
View File

@ -2,6 +2,7 @@
#pragma IgorVersion = 6.2
#pragma ModuleName = PearlAreaDisplay
#pragma version = 1.04
#include "pearl-compat"
/// @file
/// @brief visualization tools for 2D and 3D data.
@ -63,7 +64,7 @@ static function /s graphname_from_dfref(df, prefix)
name = ReplaceString("root:", name, "")
name = name[0, strlen(name) - 2]
name = ReplaceString(" ", name, "")
name = CleanupName(prefix + name, 0)
name = PearlCleanupName(prefix + name)
if (CheckName(name, 6))
name = UniqueName(name, 6, 0)
endif
@ -179,7 +180,7 @@ function /s ad_display_profiles(image, [filter])
dfref imagedf = GetWavesDataFolderDFR(image)
string s_imagedf = GetDataFolder(1, imagedf)
setdatafolder imagedf
string s_viewdf = CleanupName("view_" + NameOfWave(image), 0)
string s_viewdf = PearlCleanupName("view_" + NameOfWave(image))
newdatafolder /o/s $s_viewdf
dfref viewdf = GetDataFolderDFR()
s_viewdf = GetDataFolder(1, viewdf)
@ -566,7 +567,7 @@ static function /df make_view_folder(source)
dfref imagedf = GetWavesDataFolderDFR(source)
string s_imagedf = GetDataFolder(1, imagedf)
setdatafolder imagedf
string s_viewdf = CleanupName("view_" + NameOfWave(source), 0)
string s_viewdf = PearlCleanupName("view_" + NameOfWave(source))
newdatafolder /o/s $s_viewdf
dfref viewdf = GetDataFolderDFR()
@ -590,7 +591,7 @@ static function /df get_view_folder(source)
dfref imagedf = GetWavesDataFolderDFR(source)
dfref viewdf
setdatafolder imagedf
string s_viewdf = CleanupName("view_" + NameOfWave(source), 0)
string s_viewdf = PearlCleanupName("view_" + NameOfWave(source))
if (DataFolderExists(s_viewdf))
setdatafolder $s_viewdf
viewdf = GetDataFolderDFR()
@ -1362,7 +1363,7 @@ function /s ad_display_slice(data)
if (exists("slice_graphname") != 2)
string /g slice_graphname = ""
endif
string /g slice_wavename = CleanupName("slice_" + NameOfWave(data), 0)
string /g slice_wavename = PearlCleanupName("slice_" + NameOfWave(data))
svar graphname = slice_graphname
svar slicename = slice_wavename