From dff416f0a5bd2233e0b360316606a5a179709652 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Tue, 22 Oct 2024 21:57:37 +0200 Subject: [PATCH 1/4] MIES_Include.ipf: Clarify update instructions For the casual MIES administrator the instructions have a bit too much Igor Pro lingo, so let's try to make it easier to understand. --- Packages/MIES_Include.ipf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Packages/MIES_Include.ipf b/Packages/MIES_Include.ipf index 8b69e8f5b1..16c4e2684b 100644 --- a/Packages/MIES_Include.ipf +++ b/Packages/MIES_Include.ipf @@ -35,18 +35,20 @@ #ifdef TOO_OLD_IGOR +static StrConstant IP_DOCU_UPDATE_URL = "https://alleninstitute.github.io/MIES/installation.html#igor-pro-update-nightly" + Window OpenPanelWithDocumentationLink() : Panel PauseUpdate; Silent 1 // building window... NewPanel/K=1/W=(435, 461, 735, 661) as "OpenPanelWithDocumentationLink" Button button0, pos={38.00, 14.00}, size={223.00, 89.00}, proc=ButtonProc_OpenMiesDocuUpdateNightly, title="Open MIES documentation for\r update instructions" - Button button1, pos={51.00, 133.00}, size={195.00, 29.00}, proc=ButtonProc_DownloadNightly, title="Download Igor Pro nightly build" + Button button1, pos={51.00, 133.00}, size={195.00, 29.00}, proc=ButtonProc_DownloadNightly, title="Download required Igor Pro version" EndMacro Function ButtonProc_OpenMiesDocuUpdateNightly(STRUCT WMButtonAction &ba) : ButtonControl switch(ba.eventCode) case 2: // mouse up - BrowseURL "https://alleninstitute.github.io/MIES/installation.html#igor-pro-update-nightly" + BrowseURL IP_DOCU_UPDATE_URL break endswitch @@ -119,7 +121,7 @@ static Function AfterCompiledHook() #if defined(IGOR64) igorMajorVersion = StringByKey("IGORVERS", IgorInfo(0))[0] - printf "Your Igor Pro %s version is too old to be usable for MIES.\r", igorMajorVersion + printf "Your Igor Pro %s version is too old to be usable for MIES. Please follow the download instructions at: %s\r", igorMajorVersion, IP_DOCU_UPDATE_URL Execute "OpenPanelWithDocumentationLink()" #else printf "The 32bit version of Igor Pro is not supported anymore.\r" From 4da4618ef00f027af048302c77529c1ba629088d Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Tue, 22 Oct 2024 21:59:13 +0200 Subject: [PATCH 2/4] MIES_Include.ipf: Fix Igor Pro version handling We also need to take all digits of the IP major version. The fix is in the same spirit as 4cc6f2e94 (GetSymbolicPathForDiagnosticsDirectory: Fix invalid IP version handling, 2024-07-11). --- Packages/MIES_Include.ipf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/MIES_Include.ipf b/Packages/MIES_Include.ipf index 16c4e2684b..5875da944e 100644 --- a/Packages/MIES_Include.ipf +++ b/Packages/MIES_Include.ipf @@ -59,7 +59,7 @@ static Function/S GetDownloadLink() string igorMajorVersion, text, lineWithLink, url, os - igorMajorVersion = StringByKey("IGORVERS", IgorInfo(0))[0] + igorMajorVersion = num2istr(IgorVersion()) #if defined(WINDOWS) os = "Windows" @@ -120,7 +120,7 @@ static Function AfterCompiledHook() string igorMajorVersion #if defined(IGOR64) - igorMajorVersion = StringByKey("IGORVERS", IgorInfo(0))[0] + igorMajorVersion = num2istr(IgorVersion()) printf "Your Igor Pro %s version is too old to be usable for MIES. Please follow the download instructions at: %s\r", igorMajorVersion, IP_DOCU_UPDATE_URL Execute "OpenPanelWithDocumentationLink()" #else From be7554c867514a2f5572bb31428c704020d05309 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Wed, 23 Oct 2024 11:30:09 +0200 Subject: [PATCH 3/4] Packages/doc/doxygen-filter-ipf: Update it --- Packages/doc/doxygen-filter-ipf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/doc/doxygen-filter-ipf b/Packages/doc/doxygen-filter-ipf index ecdc0c6271..d43d686c83 160000 --- a/Packages/doc/doxygen-filter-ipf +++ b/Packages/doc/doxygen-filter-ipf @@ -1 +1 @@ -Subproject commit ecdc0c6271c96ce2101b626b1361ab242a30a2e7 +Subproject commit d43d686c8308aa19dfe4ed07f7683f6884376a1e From 634d0c918dc78ecbfa37d2b0725aad557695b054 Mon Sep 17 00:00:00 2001 From: Tim Jarsky Date: Mon, 18 Nov 2024 14:16:20 -0800 Subject: [PATCH 4/4] Igor is out of date panel updates --- Packages/MIES_Include.ipf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Packages/MIES_Include.ipf b/Packages/MIES_Include.ipf index 5875da944e..f0f6955510 100644 --- a/Packages/MIES_Include.ipf +++ b/Packages/MIES_Include.ipf @@ -39,9 +39,10 @@ static StrConstant IP_DOCU_UPDATE_URL = "https://alleninstitute.github.io/MIES/i Window OpenPanelWithDocumentationLink() : Panel PauseUpdate; Silent 1 // building window... - NewPanel/K=1/W=(435, 461, 735, 661) as "OpenPanelWithDocumentationLink" - Button button0, pos={38.00, 14.00}, size={223.00, 89.00}, proc=ButtonProc_OpenMiesDocuUpdateNightly, title="Open MIES documentation for\r update instructions" - Button button1, pos={51.00, 133.00}, size={195.00, 29.00}, proc=ButtonProc_DownloadNightly, title="Download required Igor Pro version" + NewPanel/K=1/W=(841, 378, 1150, 576) as "OpenPanelWithDocumentationLink" + DrawText 20, 60, "\\JC\\Zr200\\f01 MIES requires a newer \r version of Igor Pro" + Button button0, pos={74.00, 70.00}, size={150.00, 50.00}, proc=ButtonProc_OpenMiesDocuUpdateNightly, title="Open Igor \r update instructions" + Button button1, pos={74.00, 130.00}, size={150.00, 50.00}, proc=ButtonProc_DownloadNightly, title="Download approved \r Igor Pro version" EndMacro Function ButtonProc_OpenMiesDocuUpdateNightly(STRUCT WMButtonAction &ba) : ButtonControl