From 82967e08bb70708c8f1e7925f1c97fe1855f2866 Mon Sep 17 00:00:00 2001 From: Max Brauer Date: Fri, 28 Jul 2023 14:25:56 +0200 Subject: [PATCH] Code Style: Ensure that each operation argument is separated by a comma Igor Pro does allow omitting the comma between the first and second argument of an operation and also allows adding extranous commas before the first argument. This isn't considered as good coding style [1]. [1]: https://github.com/byte-physics/igor-pro-coding-conventions/issues/33 --- Packages/MIES/ACL_TabUtilities.ipf | 16 +- Packages/MIES/ACL_UserdataEditor.ipf | 12 +- Packages/MIES/MIES_AmplifierInteraction.ipf | 2 +- Packages/MIES/MIES_AnalysisBrowser.ipf | 14 +- ...ES_AnalysisBrowser_SweepBrowser_Export.ipf | 2 +- Packages/MIES/MIES_AnalysisFunctions.ipf | 4 +- Packages/MIES/MIES_BackgroundWatchdog.ipf | 16 +- Packages/MIES/MIES_Blowout.ipf | 4 +- Packages/MIES/MIES_BrowserSettingsPanel.ipf | 20 +- Packages/MIES/MIES_CheckInstallation.ipf | 2 +- Packages/MIES/MIES_Configuration.ipf | 20 +- Packages/MIES/MIES_DAC-Hardware.ipf | 2 +- Packages/MIES/MIES_DAEphys.ipf | 924 +++++++++--------- Packages/MIES/MIES_DataBrowser.ipf | 210 ++-- Packages/MIES/MIES_DataConfigurator.ipf | 6 +- Packages/MIES/MIES_DebugPanel.ipf | 2 +- Packages/MIES/MIES_Debugging.ipf | 2 +- .../MIES/MIES_ExperimentDocumentation.ipf | 10 +- Packages/MIES/MIES_GuiUtilities.ipf | 56 +- Packages/MIES/MIES_IgorHooks.ipf | 2 +- Packages/MIES/MIES_LogbookViewer.ipf | 4 +- Packages/MIES/MIES_Menu.ipf | 40 +- Packages/MIES/MIES_MiesUtilities.ipf | 12 +- .../MIES/MIES_NeuroDataWithoutBorders.ipf | 2 +- Packages/MIES/MIES_Oscilloscope.ipf | 14 +- Packages/MIES/MIES_PackageSettings.ipf | 2 +- Packages/MIES/MIES_PressureControl.ipf | 46 +- Packages/MIES/MIES_ProgrammaticGUIControl.ipf | 10 +- Packages/MIES/MIES_PulseAveraging.ipf | 14 +- Packages/MIES/MIES_RepeatedAcquisition.ipf | 4 +- Packages/MIES/MIES_StimsetAPI.ipf | 6 +- Packages/MIES/MIES_SweepFormula.ipf | 6 +- Packages/MIES/MIES_TestPulse.ipf | 8 +- Packages/MIES/MIES_Utilities.ipf | 8 +- Packages/MIES/MIES_WaveBuilder.ipf | 4 +- Packages/MIES/MIES_WaveBuilderPanel.ipf | 34 +- Packages/MIES/MIES_WaveDataFolderGetters.ipf | 4 +- Packages/tests/Basic/UTF_Configuration.ipf | 32 +- .../Basic/UTF_PGCSetAndActivateControl.ipf | 4 +- Packages/tests/Basic/UTF_SweepFormula.ipf | 6 +- Packages/tests/Basic/UTF_Utils.ipf | 28 +- .../tests/HardwareBasic/UTF_Databrowser.ipf | 4 +- .../UTF_SweepFormulaHardware.ipf | 4 +- Packages/tests/UTF_HelperFunctions.ipf | 2 +- 44 files changed, 812 insertions(+), 812 deletions(-) diff --git a/Packages/MIES/ACL_TabUtilities.ipf b/Packages/MIES/ACL_TabUtilities.ipf index 40cd8aee7c..525c8df1ed 100644 --- a/Packages/MIES/ACL_TabUtilities.ipf +++ b/Packages/MIES/ACL_TabUtilities.ipf @@ -52,7 +52,7 @@ Function ACL_SetControlDisableStatus(panel, currentControl, tabControlName, newT ControlInfo/W=$(panel) $(currentControl) // tabs are a special case since we want to change the value, not the disable status if (abs(V_flag == 8) && cmpstr(currentControl, tabControlName) == 0) // this control is a tab - TabControl $(currentControl) win=$(panel), value=(newTabNum) + TabControl $(currentControl), win=$(panel), value=(newTabNum) elseif (abs(V_flag) > 0) // the control exists--this should always be positive unless it's a window // see if this control is "controlled" by the current tab control // and if so, change it's disable status. If it's not controlled by the current @@ -107,22 +107,22 @@ Function ACL_SetControlDisableStatus(panel, currentControl, tabControlName, newT default: controllingTab = GetUserData(potentialWindowName, "", "tabcontrol") tabNumber = str2num(GetUserData(potentialWindowName, "", "tabnum")) - GetWindow $(potentialWindowName) hide + GetWindow $(potentialWindowName), hide windowHide = V_Value if (cmpstr(tabControlName, controllingTab) == 0) if (numtype(tabNumber) == 0) // tabnumber userdata is defined - SetWindow $(potentialWindowName) hide=((tabNumber == newTabNum) ? (windowHide & ~0x1) : (windowHide | 0x1)), needUpdate=1 // clear the hide bit/set the hide bit and force update of window + SetWindow $(potentialWindowName), hide=((tabNumber == newTabNum) ? (windowHide & ~0x1) : (windowHide | 0x1)), needUpdate=1 // clear the hide bit/set the hide bit and force update of window else // display the control since it's controlled by this tab but should be visible whenever the controlling tab control is visible - SetWindow $(potentialWindowName) hide=(windowHide & ~0x1), needUpdate=1 // clear the hide bit and force update of window + SetWindow $(potentialWindowName), hide=(windowHide & ~0x1), needUpdate=1 // clear the hide bit and force update of window endif elseif (cmpstr(controllingTab, "") != 0) // determine status of controlling tab ControlInfo/W=$(panel) $(controllingTab) if (abs(V_Flag == 8)) // this is really a tab if (V_disable & 0x1) // if hide bit is set - SetWindow $(potentialWindowName) hide=(windowHide | 0x1), needUpdate=1 // set the hide bit and force update of window + SetWindow $(potentialWindowName), hide=(windowHide | 0x1), needUpdate=1 // set the hide bit and force update of window else - SetWindow $(potentialWindowName) hide=((tabNumber == V_Value) ? (windowHide & ~0x1) : (windowHide | 0x1)), needUpdate=1 // clear the hide bit/set the hide bit and force update of window + SetWindow $(potentialWindowName), hide=((tabNumber == V_Value) ? (windowHide & ~0x1) : (windowHide | 0x1)), needUpdate=1 // clear the hide bit/set the hide bit and force update of window endif endif EndIf @@ -214,7 +214,7 @@ Function ACL_DisplayTab(tca): TabControl // the tab itself has already changed, so we have to reset the selected tab to the value // stored in the tab controls userdata(currenttab) Variable originalTab = str2num(GetUserData(panel, tabControlName, "currenttab")) - TabControl $(tabControlName) win=$(panel), value=originalTab // reset selected tab + TabControl $(tabControlName), win=$(panel), value=originalTab // reset selected tab return 1 endif EndIf @@ -251,7 +251,7 @@ Function ACL_DisplayTab(tca): TabControl EndFor // write the value of the currently displayed tab into the userdata(currenttab) of tab control if (newTabNum >= 0) - TabControl $(tabControlName) win=$(panel), userdata(currenttab)=num2str(newTabNum) + TabControl $(tabControlName), win=$(panel), userdata(currenttab)=num2str(newTabNum) EndIf // This function supports setting a separate hook function for a tab control that will be executed after the diff --git a/Packages/MIES/ACL_UserdataEditor.ipf b/Packages/MIES/ACL_UserdataEditor.ipf index d21c85c29a..10bcc2dae0 100644 --- a/Packages/MIES/ACL_UserdataEditor.ipf +++ b/Packages/MIES/ACL_UserdataEditor.ipf @@ -209,7 +209,7 @@ Function PopMenuSelectPanel(pa) : PopupMenuControl ACL_SetupListControlWaves(pa.win, pa.popStr) // put value of selected panel in the (unnamed) userdata of the window that contains the PopMenu box - SetWindow $(pa.win) userdata=pa.popStr + SetWindow $(pa.win), userdata=pa.popStr break endswitch @@ -457,7 +457,7 @@ Function PopMenuSelectControlType(pa) : PopupMenuControl // put V_flag type of newly selected control type into userdata of this popup control Variable controlType = str2num(controlTypes[pa.popNum][1]) - PopupMenu $(pa.ctrlName) win=$(pa.win), userdata(controlType) = num2str(controlType) + PopupMenu $(pa.ctrlName), win=$(pa.win), userdata(controlType) = num2str(controlType) // simulate a click on the Select Panel popmenu that will force a refresh of the list of controls @@ -515,7 +515,7 @@ Function ListBoxPanelControls(lba) : ListBoxControl if (numtype(lastSortCol) != 0) lastSortCol = -1 endif - ListBox $(lba.ctrlName) win=$(lba.win), userdata(sortCol) = num2str(lba.col) // indicate which column to sort by + ListBox $(lba.ctrlName), win=$(lba.win), userdata(sortCol) = num2str(lba.col) // indicate which column to sort by // now, toggle the ascending/descending sort flag for this column (but only if this column was already selected) Variable sortOrder = str2num(GetUserData(lba.win, lba.ctrlName, "order"+num2str(lba.col))) @@ -524,7 +524,7 @@ Function ListBoxPanelControls(lba) : ListBoxControl elseif (lastSortCol == lba.col) sortOrder = !sortOrder endif - ListBox $(lba.ctrlName) win=$(lba.win), userdata($("order" + num2str(lba.col)))=num2str(sortOrder) + ListBox $(lba.ctrlName), win=$(lba.win), userdata($("order" + num2str(lba.col)))=num2str(sortOrder) // now change the dimension labels of the list box text wave so that the column controlling the // sort has the up or down arrow icon on it, depending on the order of the sort @@ -674,7 +674,7 @@ Function ACL_FitListToWindow(win, ctrlName) // modified from original Wavemetrics function String win, ctrlName - GetWindow $win wsize + GetWindow $win, wsize Variable winHeight= V_bottom-V_top // points Variable winWidth = V_right-V_left winHeight *= ScreenResolution/72 // points to pixels @@ -716,7 +716,7 @@ Function ACL_MinWindowSize(winName,minwidth,minheight) String winName Variable minwidth,minheight - GetWindow $winName wsize + 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 diff --git a/Packages/MIES/MIES_AmplifierInteraction.ipf b/Packages/MIES/MIES_AmplifierInteraction.ipf index e4fa904c48..5ef03e42bf 100644 --- a/Packages/MIES/MIES_AmplifierInteraction.ipf +++ b/Packages/MIES/MIES_AmplifierInteraction.ipf @@ -869,7 +869,7 @@ Function AI_OpenMCCs(ampSerialNumList, [ampTitleList]) endfor if(failedToOpenCount > 0) - printf "%g MCCs failed to open on attempt count %g\r" failedTOopenCount, j + printf "%g MCCs failed to open on attempt count %g\r", failedTOopenCount, j ControlWindowToFront() endif diff --git a/Packages/MIES/MIES_AnalysisBrowser.ipf b/Packages/MIES/MIES_AnalysisBrowser.ipf index a6c62a7f9c..d7c50d32a9 100644 --- a/Packages/MIES/MIES_AnalysisBrowser.ipf +++ b/Packages/MIES/MIES_AnalysisBrowser.ipf @@ -1982,7 +1982,7 @@ static Function AB_LoadSweepFromNWBgeneric(h5_groupID, nwbVersion, channelList, // always fake TTL base wave (bitwise sum of all TTL channels) wave/Z/I base = sweepDFR:$channelName if(!WaveExists(base)) - Duplicate loaded sweepDFR:$channelName/wave=base + Duplicate loaded, sweepDFR:$channelName/wave=base base = 0 fakeConfigWave = 1 SetNumberInWaveNote(base, "fake", 1) @@ -2285,7 +2285,7 @@ static Function AB_LoadStimsetRAW(expFilePath, stimset, overwrite) return 1 endif - MoveWave newDFR:$stimset setDFR + MoveWave newDFR:$stimset, setDFR KillOrMoveToTrash(dfr=newDFR) return 0 @@ -2517,7 +2517,7 @@ static Function AB_AddExperimentEntries(string win, WAVE/T entries) if(FolderExists(entry)) symbPath = GetUniqueSymbolicPath() - NewPath/O/Q/Z $symbPath entry + NewPath/O/Q/Z $symbPath, entry pxpList = GetAllFilesRecursivelyFromPath(symbPath, extension=".pxp") uxpList = GetAllFilesRecursivelyFromPath(symbPath, extension=".uxp") nwbList = GetAllFilesRecursivelyFromPath(symbPath, extension=".nwb") @@ -2538,14 +2538,14 @@ static Function AB_AddExperimentEntries(string win, WAVE/T entries) endif if(sTime < stopMSTimer(-2) * MILLI_TO_ONE) sprintf title, "%s, Reading %s", panel, GetFile(fName) - DoWindow/T $panel title + DoWindow/T $panel, title DoUpdate/W=$panel sTime = stopMSTimer(-2) * MILLI_TO_ONE + 1 endif AB_AddFile(fName, entry) endfor endfor - DoWindow/T $panel panel + DoWindow/T $panel, panel AB_ResetListBoxWaves() End @@ -2815,7 +2815,7 @@ Function AB_ButtonProc_OpenFolders(ba) : ButtonControl else continue endif - NewPath/O/Q/Z $symbPath folder + NewPath/O/Q/Z $symbPath, folder PathInfo/SHOW $symbPath endif endfor @@ -2914,7 +2914,7 @@ Function AB_ButtonProc_AddFiles(ba) : ButtonControl endif symbPath = GetUniqueSymbolicPath() - NewPath/O/Q/Z $symbPath baseFolder + NewPath/O/Q/Z $symbPath, baseFolder fileFilters = "Data Files (*.pxp,*.nwb,*.uxp):.pxp,.nwb,.uxp;All Files:.*;" message = "Select data file(s)" diff --git a/Packages/MIES/MIES_AnalysisBrowser_SweepBrowser_Export.ipf b/Packages/MIES/MIES_AnalysisBrowser_SweepBrowser_Export.ipf index 8f980935f1..ad987823e7 100644 --- a/Packages/MIES/MIES_AnalysisBrowser_SweepBrowser_Export.ipf +++ b/Packages/MIES/MIES_AnalysisBrowser_SweepBrowser_Export.ipf @@ -239,7 +239,7 @@ Function SBE_ShowExportPanel(sourceWindow) endif ControlUpdate/W=$panel popup_sweep_export_source_graph - PopupMenu popup_sweep_export_source_graph win=$panel, popmatch=GetMainWindow(sourceWindow) + PopupMenu popup_sweep_export_source_graph, win=$panel, popmatch=GetMainWindow(sourceWindow) End /// @brief Return a list of possible target graphs for the export panel diff --git a/Packages/MIES/MIES_AnalysisFunctions.ipf b/Packages/MIES/MIES_AnalysisFunctions.ipf index 08a70fd4ad..d25f03c5ae 100644 --- a/Packages/MIES/MIES_AnalysisFunctions.ipf +++ b/Packages/MIES/MIES_AnalysisFunctions.ipf @@ -308,7 +308,7 @@ Function Enforce_VC(device, eventType, DAQDataWave, headStage, realDataLength) variable DAC = AFH_GetDACFromHeadstage(device, headstage) string stimSetName = AFH_GetStimSetName(device, DAC, CHANNEL_TYPE_DAC) - printf "%s on DAC %d of headstage %d requires voltage clamp mode. Change clamp mode to voltage clamp to allow data acquistion\r" stimSetName, DAC, headStage + printf "%s on DAC %d of headstage %d requires voltage clamp mode. Change clamp mode to voltage clamp to allow data acquistion\r", stimSetName, DAC, headStage return 1 endif @@ -328,7 +328,7 @@ Function Enforce_IC(device, eventType, DAQDataWave, headStage, realDataLength) if(DAG_GetHeadstageMode(device, headStage) != I_CLAMP_MODE) variable DAC = AFH_GetDACFromHeadstage(device, headstage) string stimSetName = AFH_GetStimSetName(device, DAC, CHANNEL_TYPE_DAC) - printf "Stimulus set: %s on DAC: %d of headstage: %d requires current clamp mode. Change clamp mode to current clamp to allow data acquistion\r" stimSetName, DAC, headStage + printf "Stimulus set: %s on DAC: %d of headstage: %d requires current clamp mode. Change clamp mode to current clamp to allow data acquistion\r", stimSetName, DAC, headStage return 1 endif diff --git a/Packages/MIES/MIES_BackgroundWatchdog.ipf b/Packages/MIES/MIES_BackgroundWatchdog.ipf index e60ce9f633..482b5dc556 100644 --- a/Packages/MIES/MIES_BackgroundWatchdog.ipf +++ b/Packages/MIES/MIES_BackgroundWatchdog.ipf @@ -59,7 +59,7 @@ static Function SetValDisplay(win, control, [var, str, format]) return NaN endif - ValDisplay $control win=$win, value=#formattedString + ValDisplay $control, win=$win, value=#formattedString End static Function/S GetValDisplayAsString(win, control) @@ -131,13 +131,13 @@ Function BW_PanelUpdate() colb = basecol * 0.4 endif ctrl = base + "_NAME" - TitleBox $ctrl win=$PANEL, pos={0, ypos}, anchor=lc, fixedsize=1, size={6 * XGRID, YGRID}, labelBack=(colr, colg, colb), title=StringByKey("NAME", taskinfo), help={"name of task\rgreen - currently running\rred - stopped"} + TitleBox $ctrl, win=$PANEL, pos={0, ypos}, anchor=lc, fixedsize=1, size={6 * XGRID, YGRID}, labelBack=(colr, colg, colb), title=StringByKey("NAME", taskinfo), help={"name of task\rgreen - currently running\rred - stopped"} ctrl = base + "_PROCESS" - Button $ctrl win=$PANEL, pos={6 * XGRID, ypos}, size={9 * XGRID, YGRID}, fColor=(colr, colg, colb), title=StringByKey("PROC", taskinfo), proc=BW_ButtonProc_ShowTask, help={"function of task\rpress to open code"} + Button $ctrl, win=$PANEL, pos={6 * XGRID, ypos}, size={9 * XGRID, YGRID}, fColor=(colr, colg, colb), title=StringByKey("PROC", taskinfo), proc=BW_ButtonProc_ShowTask, help={"function of task\rpress to open code"} state = NumberByKey("PERIOD", taskinfo) ctrl = base + "_PERIOD" - ValDisplay $ctrl win=$PANEL, format="%1d", pos={3 * xgrid + xoffs, ypos}, size={2.5 * XGRID, YGRID}, title="Period", value= #"0", help={"task is executed every period ticks"} + ValDisplay $ctrl, win=$PANEL, format="%1d", pos={3 * xgrid + xoffs, ypos}, size={2.5 * XGRID, YGRID}, title="Period", value= #"0", help={"task is executed every period ticks"} SetValDisplay(PANEL, ctrl, var=state) state = NumberByKey("NEXT", taskinfo) @@ -156,7 +156,7 @@ Function BW_PanelUpdate() colb = basecol helpstr = "task was last run at <> ticks" endif - ValDisplay $ctrl win=$PANEL, format="%1d", pos={6 * xgrid + xoffs, ypos},size={3.5 * XGRID, YGRID}, valueBackColor=(colr, colg, colb), title=title,value= #"0", help={helpstr} + ValDisplay $ctrl, win=$PANEL, format="%1d", pos={6 * xgrid + xoffs, ypos},size={3.5 * XGRID, YGRID}, valueBackColor=(colr, colg, colb), title=title,value= #"0", help={helpstr} SetValDisplay(PANEL, ctrl, var=state) if(NumberByKey("QUIT", taskinfo)) @@ -169,7 +169,7 @@ Function BW_PanelUpdate() colb = basecol * 0.7 endif ctrl = base + "_QUIT" - Button $ctrl win=$PANEL ,pos={10 * XGRID + XOFFS, ypos}, size={2 * XGRID, YGRID}, fColor=(colr, colg, colb), title="QUIT", proc=BW_ButtonProc_QuitTask, help={"red - task returned nonzero value\rgrey - task returned zero (OK)"} + Button $ctrl, win=$PANEL ,pos={10 * XGRID + XOFFS, ypos}, size={2 * XGRID, YGRID}, fColor=(colr, colg, colb), title="QUIT", proc=BW_ButtonProc_QuitTask, help={"red - task returned nonzero value\rgrey - task returned zero (OK)"} if(NumberByKey("FUNCERR", taskinfo)) colr = basecol @@ -181,9 +181,9 @@ Function BW_PanelUpdate() colb = basecol * 0.7 endif ctrl = base + "_ERROR" - TitleBox $ctrl win=$PANEL, anchor=mc, fixedsize=1, pos={12 * XGRID + XOFFS, ypos}, size={2 * XGRID, YGRID}, labelBack=(colr, colg, colb), title="ERROR", help={"red - task function was not or could not be executed\rgrey - task function could be executed"} + TitleBox $ctrl, win=$PANEL, anchor=mc, fixedsize=1, pos={12 * XGRID + XOFFS, ypos}, size={2 * XGRID, YGRID}, labelBack=(colr, colg, colb), title="ERROR", help={"red - task function was not or could not be executed\rgrey - task function could be executed"} endfor - GetWindow $PANEL wsize + GetWindow $PANEL, wsize MoveWindow /W=$PANEL V_Left, V_Top, V_Left + 14 * XGRID + XOFFS, V_Top + ypos + YGRID End diff --git a/Packages/MIES/MIES_Blowout.ipf b/Packages/MIES/MIES_Blowout.ipf index 441df6e81b..6e0eaa4d38 100644 --- a/Packages/MIES/MIES_Blowout.ipf +++ b/Packages/MIES/MIES_Blowout.ipf @@ -76,7 +76,7 @@ static Function BWO_CheckGlobalSettings(device) // check that data acquisition is not running NVAR dataAcqRunMode = $GetDataAcqRunMode(device) if(dataAcqRunMode != DAQ_NOT_RUNNING) - printf "Please terminate ongoing data acquisition on %s \r" device + printf "Please terminate ongoing data acquisition on %s \r", device return 0 endif // check that blowout protocol exists @@ -209,7 +209,7 @@ static Function BWO_CheckAndClearPipettes(device) PGC_SetAndActivateControl(device, "setvar_DataAcq_SSPressure", val = 0) if(TPResults[%ResistanceSteadyState][i] > BWO_MAX_RESISTANCE) - printf "Unable to clear pipette on headstage %d with %g psi\r" i, PressureTracking[i] + printf "Unable to clear pipette on headstage %d with %g psi\r", i, PressureTracking[i] endif endfor End diff --git a/Packages/MIES/MIES_BrowserSettingsPanel.ipf b/Packages/MIES/MIES_BrowserSettingsPanel.ipf index 12d82f60c6..2ec04e1439 100644 --- a/Packages/MIES/MIES_BrowserSettingsPanel.ipf +++ b/Packages/MIES/MIES_BrowserSettingsPanel.ipf @@ -114,7 +114,7 @@ static Function BSP_UnHideSettingsPanel(mainPanel) bsPanel = BSP_GetPanel(mainPanel) - SetWindow $bsPanel hide=0, needUpdate=1 + SetWindow $bsPanel, hide=0, needUpdate=1 End /// @brief open bottom Panel @@ -130,7 +130,7 @@ static Function BSP_UnHideSweepControls(mainPanel) scPanel = BSP_GetSweepControlsPanel(mainPanel) ASSERT(WindowExists(scPanel), "SweepControl panel does not exist") - SetWindow $scPanel hide=0, needUpdate=1 + SetWindow $scPanel, hide=0, needUpdate=1 End /// @brief dynamic settings for bottom panel at initialization @@ -154,7 +154,7 @@ static Function BSP_DynamicSweepControls(mainPanel) EnableControls(scPanel, SWEEPCONTROL_CONTROLS_DATABROWSER) DisableControls(scPanel, SWEEPCONTROL_CONTROLS_SWEEPBROWSER) else - PopupMenu popup_SweepControl_Selector win=$scPanel, value= #("SB_GetSweepList(\"" + mainPanel + "\")") + PopupMenu popup_SweepControl_Selector, win=$scPanel, value= #("SB_GetSweepList(\"" + mainPanel + "\")") SetControlProcedures(scPanel, "popup_SweepControl_Selector;", "SB_PopupMenuSelectSweep") EnableControls(scPanel, SWEEPCONTROL_CONTROLS_SWEEPBROWSER) DisableControls(scPanel, SWEEPCONTROL_CONTROLS_DATABROWSER) @@ -234,7 +234,7 @@ Function BSP_DynamicStartupSettings(mainPanel) else DisableControls(bsPanel, BROWSERSETTINGS_CONTROLS_DATABROWSER) endif - PopupMenu popup_TimeAlignment_Master win=$bsPanel, value = #("TimeAlignGetAllTraces(\"" + mainPanel + "\")") + PopupMenu popup_TimeAlignment_Master, win=$bsPanel, value = #("TimeAlignGetAllTraces(\"" + mainPanel + "\")") BSP_InitMainCheckboxes(bsPanel) @@ -293,7 +293,7 @@ Function BSP_UnsetDynamicStartupSettings(mainPanel) ASSERT(WindowExists(bsPanel), "external BrowserSettings panel not found") SetWindow $bsPanel, userData(panelVersion) = "" PopupMenu popup_overlaySweeps_select, win=$bsPanel, value="" - PopupMenu popup_TimeAlignment_Master win=$bsPanel, value = "" + PopupMenu popup_TimeAlignment_Master, win=$bsPanel, value = "" ListBox list_of_ranges, win=$bsPanel, listWave=$"", selWave=$"" ListBox list_of_ranges1, win=$bsPanel, listWave=$"", selWave=$"" ListBox list_dashboard, win=$bsPanel, listWave=$"", colorWave=$"", selWave=$"", helpWave=$"" @@ -680,7 +680,7 @@ static Function BSP_HidePanel(string win) currentWindow = GetMainWindow(GetCurrentWindow()) mainPanel = GetMainWindow(win) - SetWindow $win hide=1 + SetWindow $win, hide=1 DoWindow/F $currentWindow @@ -1077,7 +1077,7 @@ End Function/S BSP_GetFormulaGraphTitle(string win) - GetWindow $win wtitle + GetWindow $win, wtitle return SF_PLOT_NAME_TEMPLATE + " from <" + S_Value + ">" End @@ -1581,7 +1581,7 @@ static Function BSP_UnHideSettingsHistory(win) settingsHistoryPanel = LBV_GetSettingsHistoryPanel(win) if(WindowExists(settingsHistoryPanel)) - SetWindow $settingsHistoryPanel hide=0, needUpdate=1 + SetWindow $settingsHistoryPanel, hide=0, needUpdate=1 endif End @@ -1754,7 +1754,7 @@ Function BSP_AddTracesForEpochs(string win) ModifyGraph/W=$win marker($level_x_trace)=10, mode($level_x_trace)=4, rgb($level_x_trace)=(c.red, c.green, c.blue) endfor - SetWindow $win tooltipHook(hook) = BSP_EpochGraphToolTip + SetWindow $win, tooltipHook(hook) = BSP_EpochGraphToolTip SetAxis/W=$win/A endfor @@ -1840,7 +1840,7 @@ Function BSP_SFHelpWindowHook(s) contentCRC = GetNotebookCRC(sfWin) if(!CmpStr(sfWin, s.winName) && refContentCRC != contentCRC) BSP_SFFormulaColoring(sfWin) - SetWindow $mainWin userData($BSP_USER_DATA_SF_CONTENT_CRC)=num2istr(contentCRC) + SetWindow $mainWin, userData($BSP_USER_DATA_SF_CONTENT_CRC)=num2istr(contentCRC) endif break endswitch diff --git a/Packages/MIES/MIES_CheckInstallation.ipf b/Packages/MIES/MIES_CheckInstallation.ipf index 96f40fcfb0..bef4f681a9 100644 --- a/Packages/MIES/MIES_CheckInstallation.ipf +++ b/Packages/MIES/MIES_CheckInstallation.ipf @@ -189,7 +189,7 @@ Function CHI_CheckInstallation() printf "Windows 10: %s\r", ToTrueFalse(IsWindows10()) if(IsWindows10() && archBits == 64) aslrEnabled = GetASLREnabledState() - printf "ASLR: %s (%s)\r" ToTrueFalse(aslrEnabled), SelectString(aslrEnabled, "Nice!", "Very Bad") + printf "ASLR: %s (%s)\r", ToTrueFalse(aslrEnabled), SelectString(aslrEnabled, "Nice!", "Very Bad") if(aslrEnabled != 0) state.numErrors += 1 endif diff --git a/Packages/MIES/MIES_Configuration.ipf b/Packages/MIES/MIES_Configuration.ipf index 262182589c..19e4461809 100644 --- a/Packages/MIES/MIES_Configuration.ipf +++ b/Packages/MIES/MIES_Configuration.ipf @@ -662,7 +662,7 @@ Function/S CONF_RestoreDAEphys(jsonID, fullFilePath, [middleOfExperiment, forceN if(middleOfExperiment) PGC_SetAndActivateControl(device, "check_Settings_SyncMiesToMCC", val = CHECKBOX_UNSELECTED) rStateSync = GetUserData(device, "check_Settings_SyncMiesToMCC", EXPCONFIG_UDATA_EXCLUDE_RESTORE) - ModifyControl $"check_Settings_SyncMiesToMCC" win=$device, userdata($EXPCONFIG_UDATA_EXCLUDE_RESTORE)="1" + ModifyControl $"check_Settings_SyncMiesToMCC", win=$device, userdata($EXPCONFIG_UDATA_EXCLUDE_RESTORE)="1" winConfigChanged = 1 endif @@ -688,7 +688,7 @@ Function/S CONF_RestoreDAEphys(jsonID, fullFilePath, [middleOfExperiment, forceN endif if(middleOfExperiment) - ModifyControl $"check_Settings_SyncMiesToMCC" win=$device, userdata($EXPCONFIG_UDATA_EXCLUDE_RESTORE)=rStateSync + ModifyControl $"check_Settings_SyncMiesToMCC", win=$device, userdata($EXPCONFIG_UDATA_EXCLUDE_RESTORE)=rStateSync endif CONF_RestoreHeadstageAssociation(device, jsonID, middleOfExperiment) @@ -731,7 +731,7 @@ Function/S CONF_RestoreDAEphys(jsonID, fullFilePath, [middleOfExperiment, forceN if(!IsEmpty(device) && WindowExists(device)) SetWindow $device, userdata($DAEPHYS_UDATA_WINHANDLE) = "" if(middleOfExperiment & winConfigChanged) - ModifyControl $"check_Settings_SyncMiesToMCC" win=$device, userdata($EXPCONFIG_UDATA_EXCLUDE_RESTORE)=rStateSync + ModifyControl $"check_Settings_SyncMiesToMCC", win=$device, userdata($EXPCONFIG_UDATA_EXCLUDE_RESTORE)=rStateSync endif SetWindow $device, hide=0, needUpdate=1 endif @@ -1300,7 +1300,7 @@ static Function CONF_RestoreControl(wName, restoreMask, jsonID, ctrlName[, jsonP VTop = JSON_GetVariable(jsonID, jsonPath + EXPCONFIG_FIELD_CTRLPOSTOP) VPos = JSON_GetVariable(jsonID, jsonPath + EXPCONFIG_FIELD_CTRLPOSPOS) VAlign = JSON_GetVariable(jsonID, jsonPath + EXPCONFIG_FIELD_CTRLPOSALIGN) - ModifyControl $ctrlName win=$wName, align=VAlign, size={VWidth, VHeight}, pos={VPos, VTop} + ModifyControl $ctrlName, win=$wName, align=VAlign, size={VWidth, VHeight}, pos={VPos, VTop} endif if(restoreMask & EXPCONFIG_SAVE_DISABLED) FindValue/TXOP=4/TEXT=EXPCONFIG_FIELD_CTRLDISABLED ctrlPropList @@ -1344,9 +1344,9 @@ static Function CONF_RestoreControl(wName, restoreMask, jsonID, ctrlName[, jsonP uData = Base64Decode(uData) endif if(IsEmpty(uKey)) - ModifyControl $ctrlName win=$wName, userdata=uData + ModifyControl $ctrlName, win=$wName, userdata=uData else - ModifyControl $ctrlName win=$wName, userdata($uKey)=uData + ModifyControl $ctrlName, win=$wName, userdata($uKey)=uData endif endfor endif @@ -1366,11 +1366,11 @@ static Function CONF_RestoreControl(wName, restoreMask, jsonID, ctrlName[, jsonP else str = JSON_GetString(jsonID, jsonPath + EXPCONFIG_FIELD_CTRLSDF) if(IsEmpty(str)) - SetVariable $ctrlName win=$wName, value=$"" + SetVariable $ctrlName, win=$wName, value=$"" else varTypeGlobal = exists(str) if(varTypeGlobal == EXISTS_AS_WAVE || varTypeGlobal == EXISTS_AS_VAR_OR_STR) - SetVariable $ctrlName win=$wName, value=$str + SetVariable $ctrlName, win=$wName, value=$str endif endif endif @@ -1424,11 +1424,11 @@ static Function CONF_RestoreControl(wName, restoreMask, jsonID, ctrlName[, jsonP if(setVarType == SET_VARIABLE_BUILTIN_STR) PGC_SetAndActivateControl(wName, ctrlName, str = str, mode = PGC_MODE_SKIP_ON_DISABLED) elseif(IsEmpty(str)) - SetVariable $ctrlName win=$wName, value=$"" + SetVariable $ctrlName, win=$wName, value=$"" else varTypeGlobal = exists(str) if(varTypeGlobal == EXISTS_AS_WAVE || varTypeGlobal == EXISTS_AS_VAR_OR_STR) - SetVariable $ctrlName win=$wName, value=$str + SetVariable $ctrlName, win=$wName, value=$str endif endif endif diff --git a/Packages/MIES/MIES_DAC-Hardware.ipf b/Packages/MIES/MIES_DAC-Hardware.ipf index ab9ae183a4..997366eb93 100644 --- a/Packages/MIES/MIES_DAC-Hardware.ipf +++ b/Packages/MIES/MIES_DAC-Hardware.ipf @@ -2847,7 +2847,7 @@ Function HW_NI_KillFifo(deviceID) AssertOnAndClearRTError() try if(V_FIFORunning) - CtrlFIFO $fifoName stop; AbortOnRTE + CtrlFIFO $fifoName, stop; AbortOnRTE endif DoXOPIdle KillFIFO $fifoName; AbortOnRTE diff --git a/Packages/MIES/MIES_DAEphys.ipf b/Packages/MIES/MIES_DAEphys.ipf index 34cb120692..1bb5296ccb 100644 --- a/Packages/MIES/MIES_DAEphys.ipf +++ b/Packages/MIES/MIES_DAEphys.ipf @@ -187,463 +187,463 @@ Function DAP_EphysPanelStartUpSettings() SetWindow $device, userdata(Config_FileName) = "" SetWindow $device, userdata(Config_FileHash) = "" - CheckBox Check_AD_00 WIN = $device,value= 0 - CheckBox Check_AD_01 WIN = $device,value= 0 - CheckBox Check_AD_02 WIN = $device,value= 0 - CheckBox Check_AD_03 WIN = $device,value= 0 - CheckBox Check_AD_04 WIN = $device,value= 0 - CheckBox Check_AD_05 WIN = $device,value= 0 - CheckBox Check_AD_06 WIN = $device,value= 0 - CheckBox Check_AD_07 WIN = $device,value= 0 - CheckBox Check_AD_08 WIN = $device,value= 0 - CheckBox Check_AD_09 WIN = $device,value= 0 - CheckBox Check_AD_10 WIN = $device,value= 0 - CheckBox Check_AD_11 WIN = $device,value= 0 - CheckBox Check_AD_12 WIN = $device,value= 0 - CheckBox Check_AD_13 WIN = $device,value= 0 - CheckBox Check_AD_14 WIN = $device,value= 0 - CheckBox Check_AD_15 WIN = $device,value= 0 - CheckBox Check_AD_All WIN = $device,value= 0 - - CheckBox Check_DA_00 WIN = $device,value= 0 - CheckBox Check_DA_01 WIN = $device,value= 0 - CheckBox Check_DA_02 WIN = $device,value= 0 - CheckBox Check_DA_03 WIN = $device,value= 0 - CheckBox Check_DA_04 WIN = $device,value= 0 - CheckBox Check_DA_05 WIN = $device,value= 0 - CheckBox Check_DA_06 WIN = $device,value= 0 - CheckBox Check_DA_07 WIN = $device,value= 0 - CheckBox Check_DA_All WIN = $device,value= 0 - CheckBox Check_DA_AllVClamp WIN = $device,value= 0 - CheckBox Check_DA_AllIClamp WIN = $device,value= 0 - - CheckBox Check_TTL_00 WIN = $device,value= 0 - CheckBox Check_TTL_01 WIN = $device,value= 0 - CheckBox Check_TTL_02 WIN = $device,value= 0 - CheckBox Check_TTL_03 WIN = $device,value= 0 - CheckBox Check_TTL_04 WIN = $device,value= 0 - CheckBox Check_TTL_05 WIN = $device,value= 0 - CheckBox Check_TTL_06 WIN = $device,value= 0 - CheckBox Check_TTL_07 WIN = $device,value= 0 - CheckBox Check_TTL_All WIN = $device,value= 0 - - CheckBox Check_DataAcqHS_00 WIN = $device,value= 0 - CheckBox Check_DataAcqHS_01 WIN = $device,value= 0 - CheckBox Check_DataAcqHS_02 WIN = $device,value= 0 - CheckBox Check_DataAcqHS_03 WIN = $device,value= 0 - CheckBox Check_DataAcqHS_04 WIN = $device,value= 0 - CheckBox Check_DataAcqHS_05 WIN = $device,value= 0 - CheckBox Check_DataAcqHS_06 WIN = $device,value= 0 - CheckBox Check_DataAcqHS_07 WIN = $device,value= 0 - CheckBox Check_DataAcqHS_All WIN = $device,value= 0 + CheckBox Check_AD_00, WIN = $device,value= 0 + CheckBox Check_AD_01, WIN = $device,value= 0 + CheckBox Check_AD_02, WIN = $device,value= 0 + CheckBox Check_AD_03, WIN = $device,value= 0 + CheckBox Check_AD_04, WIN = $device,value= 0 + CheckBox Check_AD_05, WIN = $device,value= 0 + CheckBox Check_AD_06, WIN = $device,value= 0 + CheckBox Check_AD_07, WIN = $device,value= 0 + CheckBox Check_AD_08, WIN = $device,value= 0 + CheckBox Check_AD_09, WIN = $device,value= 0 + CheckBox Check_AD_10, WIN = $device,value= 0 + CheckBox Check_AD_11, WIN = $device,value= 0 + CheckBox Check_AD_12, WIN = $device,value= 0 + CheckBox Check_AD_13, WIN = $device,value= 0 + CheckBox Check_AD_14, WIN = $device,value= 0 + CheckBox Check_AD_15, WIN = $device,value= 0 + CheckBox Check_AD_All, WIN = $device,value= 0 + + CheckBox Check_DA_00, WIN = $device,value= 0 + CheckBox Check_DA_01, WIN = $device,value= 0 + CheckBox Check_DA_02, WIN = $device,value= 0 + CheckBox Check_DA_03, WIN = $device,value= 0 + CheckBox Check_DA_04, WIN = $device,value= 0 + CheckBox Check_DA_05, WIN = $device,value= 0 + CheckBox Check_DA_06, WIN = $device,value= 0 + CheckBox Check_DA_07, WIN = $device,value= 0 + CheckBox Check_DA_All, WIN = $device,value= 0 + CheckBox Check_DA_AllVClamp, WIN = $device,value= 0 + CheckBox Check_DA_AllIClamp, WIN = $device,value= 0 + + CheckBox Check_TTL_00, WIN = $device,value= 0 + CheckBox Check_TTL_01, WIN = $device,value= 0 + CheckBox Check_TTL_02, WIN = $device,value= 0 + CheckBox Check_TTL_03, WIN = $device,value= 0 + CheckBox Check_TTL_04, WIN = $device,value= 0 + CheckBox Check_TTL_05, WIN = $device,value= 0 + CheckBox Check_TTL_06, WIN = $device,value= 0 + CheckBox Check_TTL_07, WIN = $device,value= 0 + CheckBox Check_TTL_All, WIN = $device,value= 0 + + CheckBox Check_DataAcqHS_00, WIN = $device,value= 0 + CheckBox Check_DataAcqHS_01, WIN = $device,value= 0 + CheckBox Check_DataAcqHS_02, WIN = $device,value= 0 + CheckBox Check_DataAcqHS_03, WIN = $device,value= 0 + CheckBox Check_DataAcqHS_04, WIN = $device,value= 0 + CheckBox Check_DataAcqHS_05, WIN = $device,value= 0 + CheckBox Check_DataAcqHS_06, WIN = $device,value= 0 + CheckBox Check_DataAcqHS_07, WIN = $device,value= 0 + CheckBox Check_DataAcqHS_All, WIN = $device,value= 0 PGC_SetAndActivateControl(device, "ADC", val = 6) DoUpdate/W=$device - SetVariable Gain_AD_00 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_01 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_02 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_03 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_04 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_05 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_06 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_07 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_08 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_09 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_10 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_11 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_12 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_13 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_14 WIN = $device, value = _NUM:0.00 - SetVariable Gain_AD_15 WIN = $device, value = _NUM:0.00 - - SetVariable Gain_DA_00 WIN = $device, value = _NUM:0.00 - SetVariable Gain_DA_01 WIN = $device, value = _NUM:0.00 - SetVariable Gain_DA_02 WIN = $device, value = _NUM:0.00 - SetVariable Gain_DA_03 WIN = $device, value = _NUM:0.00 - SetVariable Gain_DA_04 WIN = $device, value = _NUM:0.00 - SetVariable Gain_DA_05 WIN = $device, value = _NUM:0.00 - SetVariable Gain_DA_06 WIN = $device, value = _NUM:0.00 - SetVariable Gain_DA_07 WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_00, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_01, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_02, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_03, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_04, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_05, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_06, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_07, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_08, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_09, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_10, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_11, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_12, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_13, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_14, WIN = $device, value = _NUM:0.00 + SetVariable Gain_AD_15, WIN = $device, value = _NUM:0.00 + + SetVariable Gain_DA_00, WIN = $device, value = _NUM:0.00 + SetVariable Gain_DA_01, WIN = $device, value = _NUM:0.00 + SetVariable Gain_DA_02, WIN = $device, value = _NUM:0.00 + SetVariable Gain_DA_03, WIN = $device, value = _NUM:0.00 + SetVariable Gain_DA_04, WIN = $device, value = _NUM:0.00 + SetVariable Gain_DA_05, WIN = $device, value = _NUM:0.00 + SetVariable Gain_DA_06, WIN = $device, value = _NUM:0.00 + SetVariable Gain_DA_07, WIN = $device, value = _NUM:0.00 popValue = DAP_FormatStimSetPopupValue(CHANNEL_TYPE_DAC) - PopupMenu Wave_DA_00 WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_01 WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_02 WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_03 WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_04 WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_05 WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_06 WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_07 WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_All WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_AllVClamp WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_DA_AllIClamp WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue - - SetVariable Scale_DA_00 WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_01 WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_02 WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_03 WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_04 WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_05 WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_06 WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_07 WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_All WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_AllVClamp WIN = $device, value = _NUM:1,limits={-inf,inf,10} - SetVariable Scale_DA_AllIClamp WIN = $device, value = _NUM:1,limits={-inf,inf,10} - - SetVariable SetVar_DataAcq_Comment WIN = $device,value= _STR:"" - - CheckBox Check_DataAcq1_RepeatAcq Win = $device, value = 1 - CheckBox Check_DataAcq1_DistribDaq Win = $device, value = 0 - CheckBox Check_DataAcq1_dDAQOptOv Win = $device, value = 0 - - SetVariable SetVar_DataAcq_ITI WIN = $device, value = _NUM:0 - - SetVariable SetVar_DataAcq_TPDuration WIN = $device,value= _NUM:10 - SetVariable SetVar_DataAcq_TPBaselinePerc WIN = $device,value= _NUM:35 - - Checkbox Check_TP_SendToAllHS WIN = $device, value=1 + PopupMenu Wave_DA_00, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_01, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_02, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_03, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_04, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_05, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_06, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_07, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_All, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_AllVClamp, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_DA_AllIClamp, WIN = $device,mode=1, userdata(MenuExp) = "", value=#popValue + + SetVariable Scale_DA_00, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_01, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_02, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_03, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_04, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_05, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_06, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_07, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_All, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_AllVClamp, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + SetVariable Scale_DA_AllIClamp, WIN = $device, value = _NUM:1,limits={-inf,inf,10} + + SetVariable SetVar_DataAcq_Comment, WIN = $device,value= _STR:"" + + CheckBox Check_DataAcq1_RepeatAcq, Win = $device, value = 1 + CheckBox Check_DataAcq1_DistribDaq, Win = $device, value = 0 + CheckBox Check_DataAcq1_dDAQOptOv, Win = $device, value = 0 + + SetVariable SetVar_DataAcq_ITI, WIN = $device, value = _NUM:0 + + SetVariable SetVar_DataAcq_TPDuration, WIN = $device,value= _NUM:10 + SetVariable SetVar_DataAcq_TPBaselinePerc, WIN = $device,value= _NUM:35 + + Checkbox Check_TP_SendToAllHS, WIN = $device, value=1 /// needs to be in sync with GetTPSettings() /// @{ WAVE TPSettingsRef = GetTPSettingsFree() - SetVariable SetVar_DataAcq_TPAmplitude WIN = $device,value= _NUM:TPSettingsRef[%amplitudeVC][0] - SetVariable SetVar_DataAcq_TPAmplitudeIC WIN = $device,value= _NUM:TPSettingsRef[%amplitudeIC][0] + SetVariable SetVar_DataAcq_TPAmplitude, WIN = $device,value= _NUM:TPSettingsRef[%amplitudeVC][0] + SetVariable SetVar_DataAcq_TPAmplitudeIC, WIN = $device,value= _NUM:TPSettingsRef[%amplitudeIC][0] - Checkbox check_DataAcq_AutoTP WIN = $device, labelBack=0, value=TPSettingsRef[%autoTPEnable][0] - SetVariable setvar_DataAcq_IinjMax WIN = $device, value= _NUM:TPSettingsRef[%autoAmpMaxCurrent][0] - SetVariable setvar_DataAcq_targetVoltage WIN = $device, value= _NUM:TPSettingsRef[%autoAmpVoltage][0] - SetVariable setvar_DataAcq_targetVoltageRange WIN = $device, value= _NUM:TPSettingsRef[%autoAmpVoltageRange][0] + Checkbox check_DataAcq_AutoTP, WIN = $device, labelBack=0, value=TPSettingsRef[%autoTPEnable][0] + SetVariable setvar_DataAcq_IinjMax, WIN = $device, value= _NUM:TPSettingsRef[%autoAmpMaxCurrent][0] + SetVariable setvar_DataAcq_targetVoltage, WIN = $device, value= _NUM:TPSettingsRef[%autoAmpVoltage][0] + SetVariable setvar_DataAcq_targetVoltageRange, WIN = $device, value= _NUM:TPSettingsRef[%autoAmpVoltageRange][0] /// @} - SetVariable setvar_Settings_autoTP_int WIN = $device, value = _NUM:0 - SetVariable setvar_Settings_autoTP_perc WIN = $device, value = _NUM:90 + SetVariable setvar_Settings_autoTP_int, WIN = $device, value = _NUM:0 + SetVariable setvar_Settings_autoTP_perc, WIN = $device, value = _NUM:90 popValue = DAP_FormatStimSetPopupValue(CHANNEL_TYPE_TTL) - PopupMenu Wave_TTL_00 Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_TTL_01 Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_TTL_02 Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_TTL_03 Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_TTL_04 Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_TTL_05 Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_TTL_06 Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_TTL_07 Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu Wave_TTL_All Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue - - CheckBox Check_Settings_TrigOut Win = $device, value = 0 - CheckBox Check_Settings_TrigIn Win = $device, value = 0 - - SetVariable SetVar_DataAcq_SetRepeats WIN = $device,value= _NUM:1 - - CheckBox Check_Settings_UseDoublePrec WIN = $device, value= 0 - CheckBox Check_Settings_SkipAnalysFuncs WIN = $device, value= 0 - PopupMenu Popup_Settings_SampIntMult WIN = $device, mode = 1 - - CheckBox Check_AsyncAD_00 WIN = $device,value= 0 - CheckBox Check_AsyncAD_01 WIN = $device,value= 0 - CheckBox Check_AsyncAD_02 WIN = $device,value= 0 - CheckBox Check_AsyncAD_03 WIN = $device,value= 0 - CheckBox Check_AsyncAD_04 WIN = $device,value= 0 - CheckBox Check_AsyncAD_05 WIN = $device,value= 0 - CheckBox Check_AsyncAD_06 WIN = $device,value= 0 - CheckBox Check_AsyncAD_07 WIN = $device,value= 0 - - SetVariable Gain_AsyncAD_00 WIN = $device,value= _NUM:1 - SetVariable Gain_AsyncAD_01 WIN = $device,value= _NUM:1 - SetVariable Gain_AsyncAD_02 WIN = $device,value= _NUM:1 - SetVariable Gain_AsyncAD_03 WIN = $device,value= _NUM:1 - SetVariable Gain_AsyncAD_04 WIN = $device,value= _NUM:1 - SetVariable Gain_AsyncAD_05 WIN = $device,value= _NUM:1 - SetVariable Gain_AsyncAD_06 WIN = $device,value= _NUM:1 - SetVariable Gain_AsyncAD_07 WIN = $device,value= _NUM:1 - - SetVariable Title_AsyncAD_00 WIN = $device,value= _STR:"" - SetVariable Title_AsyncAD_01 WIN = $device,value= _STR:"" - SetVariable Title_AsyncAD_02 WIN = $device,value= _STR:"" - SetVariable Title_AsyncAD_03 WIN = $device,value= _STR:"" - SetVariable Title_AsyncAD_04 WIN = $device,value= _STR:"" - SetVariable Title_AsyncAD_05 WIN = $device,value= _STR:"" - SetVariable Title_AsyncAD_06 WIN = $device,value= _STR:"" - SetVariable Title_AsyncAD_07 WIN = $device,value= _STR:"" - - SetVariable Unit_AsyncAD_00 WIN = $device,value= _STR:"" - SetVariable Unit_AsyncAD_01 WIN = $device,value= _STR:"" - SetVariable Unit_AsyncAD_02 WIN = $device,value= _STR:"" - SetVariable Unit_AsyncAD_03 WIN = $device,value= _STR:"" - SetVariable Unit_AsyncAD_04 WIN = $device,value= _STR:"" - SetVariable Unit_AsyncAD_05 WIN = $device,value= _STR:"" - SetVariable Unit_AsyncAD_06 WIN = $device,value= _STR:"" - SetVariable Unit_AsyncAD_07 WIN = $device,value= _STR:"" - - CheckBox Radio_ClampMode_0 WIN = $device,value= 1,mode=1 + PopupMenu Wave_TTL_00, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_TTL_01, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_TTL_02, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_TTL_03, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_TTL_04, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_TTL_05, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_TTL_06, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_TTL_07, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu Wave_TTL_All, Win = $device ,mode=1, userdata(MenuExp) = "", value=#popValue + + CheckBox Check_Settings_TrigOut, Win = $device, value = 0 + CheckBox Check_Settings_TrigIn, Win = $device, value = 0 + + SetVariable SetVar_DataAcq_SetRepeats, WIN = $device,value= _NUM:1 + + CheckBox Check_Settings_UseDoublePrec, WIN = $device, value= 0 + CheckBox Check_Settings_SkipAnalysFuncs, WIN = $device, value= 0 + PopupMenu Popup_Settings_SampIntMult, WIN = $device, mode = 1 + + CheckBox Check_AsyncAD_00, WIN = $device,value= 0 + CheckBox Check_AsyncAD_01, WIN = $device,value= 0 + CheckBox Check_AsyncAD_02, WIN = $device,value= 0 + CheckBox Check_AsyncAD_03, WIN = $device,value= 0 + CheckBox Check_AsyncAD_04, WIN = $device,value= 0 + CheckBox Check_AsyncAD_05, WIN = $device,value= 0 + CheckBox Check_AsyncAD_06, WIN = $device,value= 0 + CheckBox Check_AsyncAD_07, WIN = $device,value= 0 + + SetVariable Gain_AsyncAD_00, WIN = $device,value= _NUM:1 + SetVariable Gain_AsyncAD_01, WIN = $device,value= _NUM:1 + SetVariable Gain_AsyncAD_02, WIN = $device,value= _NUM:1 + SetVariable Gain_AsyncAD_03, WIN = $device,value= _NUM:1 + SetVariable Gain_AsyncAD_04, WIN = $device,value= _NUM:1 + SetVariable Gain_AsyncAD_05, WIN = $device,value= _NUM:1 + SetVariable Gain_AsyncAD_06, WIN = $device,value= _NUM:1 + SetVariable Gain_AsyncAD_07, WIN = $device,value= _NUM:1 + + SetVariable Title_AsyncAD_00, WIN = $device,value= _STR:"" + SetVariable Title_AsyncAD_01, WIN = $device,value= _STR:"" + SetVariable Title_AsyncAD_02, WIN = $device,value= _STR:"" + SetVariable Title_AsyncAD_03, WIN = $device,value= _STR:"" + SetVariable Title_AsyncAD_04, WIN = $device,value= _STR:"" + SetVariable Title_AsyncAD_05, WIN = $device,value= _STR:"" + SetVariable Title_AsyncAD_06, WIN = $device,value= _STR:"" + SetVariable Title_AsyncAD_07, WIN = $device,value= _STR:"" + + SetVariable Unit_AsyncAD_00, WIN = $device,value= _STR:"" + SetVariable Unit_AsyncAD_01, WIN = $device,value= _STR:"" + SetVariable Unit_AsyncAD_02, WIN = $device,value= _STR:"" + SetVariable Unit_AsyncAD_03, WIN = $device,value= _STR:"" + SetVariable Unit_AsyncAD_04, WIN = $device,value= _STR:"" + SetVariable Unit_AsyncAD_05, WIN = $device,value= _STR:"" + SetVariable Unit_AsyncAD_06, WIN = $device,value= _STR:"" + SetVariable Unit_AsyncAD_07, WIN = $device,value= _STR:"" + + CheckBox Radio_ClampMode_0, WIN = $device,value= 1,mode=1 // Sets MIES headstage to V-Clamp - CheckBox Radio_ClampMode_0 WIN = $device, value= 1,mode=1 - CheckBox Radio_ClampMode_1 WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_2 WIN = $device, value= 1,mode=1 - CheckBox Radio_ClampMode_3 WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_4 WIN = $device, value= 1,mode=1 - CheckBox Radio_ClampMode_5 WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_6 WIN = $device, value= 1,mode=1 - CheckBox Radio_ClampMode_7 WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_8 WIN = $device, value= 1,mode=1 - CheckBox Radio_ClampMode_9 WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_10 WIN = $device, value= 1,mode=1 - CheckBox Radio_ClampMode_11 WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_12 WIN = $device, value= 1,mode=1 - CheckBox Radio_ClampMode_13 WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_14 WIN = $device, value= 1,mode=1 - CheckBox Radio_ClampMode_15 WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_1IZ WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_3IZ WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_5IZ WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_7IZ WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_9IZ WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_11IZ WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_13IZ WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_15IZ WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_0, WIN = $device, value= 1,mode=1 + CheckBox Radio_ClampMode_1, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_2, WIN = $device, value= 1,mode=1 + CheckBox Radio_ClampMode_3, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_4, WIN = $device, value= 1,mode=1 + CheckBox Radio_ClampMode_5, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_6, WIN = $device, value= 1,mode=1 + CheckBox Radio_ClampMode_7, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_8, WIN = $device, value= 1,mode=1 + CheckBox Radio_ClampMode_9, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_10, WIN = $device, value= 1,mode=1 + CheckBox Radio_ClampMode_11, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_12, WIN = $device, value= 1,mode=1 + CheckBox Radio_ClampMode_13, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_14, WIN = $device, value= 1,mode=1 + CheckBox Radio_ClampMode_15, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_1IZ, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_3IZ, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_5IZ, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_7IZ, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_9IZ, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_11IZ, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_13IZ, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_15IZ, WIN = $device, value= 0,mode=1 // clamp mode sub tab PGC_SetAndActivateControl(device, "tab_DataAcq_Amp", val = 0) PGC_SetAndActivateControl(device, "ADC", val = 6) - CheckBox Radio_ClampMode_AllVClamp WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_AllIClamp WIN = $device, value= 0,mode=1 - CheckBox Radio_ClampMode_AllIZero WIN = $device, value= 0,mode=1 - - CheckBox Check_DataAcq_SendToAllAmp WIN = $device, value= 0 - - SetVariable SetVar_Settings_VC_DAgain WIN = $device, value= _NUM:20 - SetVariable SetVar_Settings_VC_ADgain WIN = $device, value= _NUM:0.00999999977648258 - SetVariable SetVar_Settings_IC_ADgain WIN = $device, value= _NUM:0.00999999977648258 - - PopupMenu Popup_Settings_VC_DA WIN = $device, mode=1 - PopupMenu Popup_Settings_VC_AD WIN = $device, mode=1 - PopupMenu Popup_Settings_IC_AD WIN = $device, mode=1 - PopupMenu Popup_Settings_HeadStage WIN = $device, mode=1 - PopupMenu Popup_Settings_IC_DA WIN = $device, mode=1 - PopupMenu Popup_Settings_IC_DA WIN = $device, mode=1 - - SetVariable SetVar_Settings_IC_DAgain WIN = $device, value= _NUM:400 - - SetVariable Search_DA_00 WIN = $device, value= _STR:"" - SetVariable Search_DA_01 WIN = $device, value= _STR:"" - SetVariable Search_DA_02 WIN = $device, value= _STR:"" - SetVariable Search_DA_03 WIN = $device, value= _STR:"" - SetVariable Search_DA_04 WIN = $device, value= _STR:"" - SetVariable Search_DA_05 WIN = $device, value= _STR:"" - SetVariable Search_DA_06 WIN = $device, value= _STR:"" - SetVariable Search_DA_07 WIN = $device, value= _STR:"" - SetVariable Search_DA_All WIN = $device, value= _STR:"" - SetVariable Search_DA_AllVClamp WIN = $device, value= _STR:"" - SetVariable Search_DA_AllIClamp WIN = $device, value= _STR:"" - - SetVariable Search_TTL_00 WIN = $device, value= _STR:"" - SetVariable Search_TTL_01 WIN = $device, value= _STR:"" - SetVariable Search_TTL_02 WIN = $device, value= _STR:"" - SetVariable Search_TTL_03 WIN = $device, value= _STR:"" - SetVariable Search_TTL_04 WIN = $device, value= _STR:"" - SetVariable Search_TTL_05 WIN = $device, value= _STR:"" - SetVariable Search_TTL_06 WIN = $device, value= _STR:"" - SetVariable Search_TTL_07 WIN = $device, value= _STR:"" - SetVariable Search_TTL_All WIN = $device, value= _STR:"" + CheckBox Radio_ClampMode_AllVClamp, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_AllIClamp, WIN = $device, value= 0,mode=1 + CheckBox Radio_ClampMode_AllIZero, WIN = $device, value= 0,mode=1 + + CheckBox Check_DataAcq_SendToAllAmp, WIN = $device, value= 0 + + SetVariable SetVar_Settings_VC_DAgain, WIN = $device, value= _NUM:20 + SetVariable SetVar_Settings_VC_ADgain, WIN = $device, value= _NUM:0.00999999977648258 + SetVariable SetVar_Settings_IC_ADgain, WIN = $device, value= _NUM:0.00999999977648258 + + PopupMenu Popup_Settings_VC_DA, WIN = $device, mode=1 + PopupMenu Popup_Settings_VC_AD, WIN = $device, mode=1 + PopupMenu Popup_Settings_IC_AD, WIN = $device, mode=1 + PopupMenu Popup_Settings_HeadStage, WIN = $device, mode=1 + PopupMenu Popup_Settings_IC_DA, WIN = $device, mode=1 + PopupMenu Popup_Settings_IC_DA, WIN = $device, mode=1 + + SetVariable SetVar_Settings_IC_DAgain, WIN = $device, value= _NUM:400 + + SetVariable Search_DA_00, WIN = $device, value= _STR:"" + SetVariable Search_DA_01, WIN = $device, value= _STR:"" + SetVariable Search_DA_02, WIN = $device, value= _STR:"" + SetVariable Search_DA_03, WIN = $device, value= _STR:"" + SetVariable Search_DA_04, WIN = $device, value= _STR:"" + SetVariable Search_DA_05, WIN = $device, value= _STR:"" + SetVariable Search_DA_06, WIN = $device, value= _STR:"" + SetVariable Search_DA_07, WIN = $device, value= _STR:"" + SetVariable Search_DA_All, WIN = $device, value= _STR:"" + SetVariable Search_DA_AllVClamp, WIN = $device, value= _STR:"" + SetVariable Search_DA_AllIClamp, WIN = $device, value= _STR:"" + + SetVariable Search_TTL_00, WIN = $device, value= _STR:"" + SetVariable Search_TTL_01, WIN = $device, value= _STR:"" + SetVariable Search_TTL_02, WIN = $device, value= _STR:"" + SetVariable Search_TTL_03, WIN = $device, value= _STR:"" + SetVariable Search_TTL_04, WIN = $device, value= _STR:"" + SetVariable Search_TTL_05, WIN = $device, value= _STR:"" + SetVariable Search_TTL_06, WIN = $device, value= _STR:"" + SetVariable Search_TTL_07, WIN = $device, value= _STR:"" + SetVariable Search_TTL_All, WIN = $device, value= _STR:"" popValue = DAP_FormatStimSetPopupValue(CHANNEL_TYPE_DAC) - PopupMenu IndexEnd_DA_00 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_01 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_02 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_03 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_04 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_05 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_06 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_07 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_All WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_AllVClamp WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_DA_AllICLamp WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_00, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_01, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_02, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_03, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_04, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_05, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_06, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_07, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_All, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_AllVClamp, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_DA_AllICLamp, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue popValue = DAP_FormatStimSetPopupValue(CHANNEL_TYPE_TTL) - PopupMenu IndexEnd_TTL_00 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_TTL_01 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_TTL_02 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_TTL_03 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_TTL_04 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_TTL_05 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_TTL_06 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_TTL_07 WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue - PopupMenu IndexEnd_TTL_All WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_00, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_01, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_02, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_03, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_04, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_05, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_06, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_07, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue + PopupMenu IndexEnd_TTL_All, WIN = $device, mode=1, userdata(MenuExp) = "", value=#popValue PopupMenu popup_Settings_Amplifier,mode=1,popvalue="- none -" // don't make the scope subwindow part of the recreation macro - CheckBox check_Settings_ShowScopeWindow WIN = $device, value= 0 + CheckBox check_Settings_ShowScopeWindow, WIN = $device, value= 0 SCOPE_KillScopeWindowIfRequest(device) - CheckBox check_Settings_ShowScopeWindow WIN = $device, value= 1 + CheckBox check_Settings_ShowScopeWindow, WIN = $device, value= 1 - CheckBox check_Settings_ITITP WIN = $device, value= 1 - CheckBox check_Settings_TPAfterDAQ WIN = $device, value= 0 + CheckBox check_Settings_ITITP, WIN = $device, value= 1 + CheckBox check_Settings_TPAfterDAQ, WIN = $device, value= 0 - CheckBox Check_Settings_NwbExport WIN = $device,value= 0 - PopupMenu Popup_Settings_NwbVersion WIN = $device, mode=2, popvalue="2" + CheckBox Check_Settings_NwbExport, WIN = $device,value= 0 + PopupMenu Popup_Settings_NwbVersion, WIN = $device, mode=2, popvalue="2" PopupMenu Popup_Settings_DecMethod, mode=2, popvalue="MinMax" - SetVariable min_AsyncAD_00 WIN = $device,value= _NUM:0 - SetVariable max_AsyncAD_00 WIN = $device,value= _NUM:0 - CheckBox check_AsyncAlarm_00 WIN = $device,value= 0 - - SetVariable min_AsyncAD_01 WIN = $device,value= _NUM:0 - SetVariable max_AsyncAD_01 WIN = $device,value= _NUM:0 - CheckBox check_AsyncAlarm_01 WIN = $device,value= 0 - - SetVariable min_AsyncAD_02 WIN = $device,value= _NUM:0 - SetVariable max_AsyncAD_02 WIN = $device,value= _NUM:0 - CheckBox check_AsyncAlarm_02 WIN = $device,value= 0 - - SetVariable min_AsyncAD_03 WIN = $device,value= _NUM:0 - SetVariable max_AsyncAD_03 WIN = $device,value= _NUM:0 - CheckBox check_AsyncAlarm_03 WIN = $device,value= 0 - - SetVariable min_AsyncAD_04 WIN = $device,value= _NUM:0 - SetVariable max_AsyncAD_04 WIN = $device,value= _NUM:0 - CheckBox check_AsyncAlarm_04 WIN = $device,value= 0 - - SetVariable min_AsyncAD_05 WIN = $device,value= _NUM:0 - SetVariable max_AsyncAD_05 WIN = $device,value= _NUM:0 - CheckBox check_AsyncAlarm_05 WIN = $device,value= 0 - - SetVariable min_AsyncAD_06 WIN = $device,value= _NUM:0 - SetVariable max_AsyncAD_06 WIN = $device,value= _NUM:0 - CheckBox check_AsyncAlarm_06 WIN = $device,value= 0 - - SetVariable min_AsyncAD_07 WIN = $device,value= _NUM:0 - SetVariable max_AsyncAD_07 WIN = $device,value= _NUM:0 - CheckBox check_AsyncAlarm_07 WIN = $device,value= 0 - - CheckBox check_DataAcq_RepAcqRandom WIN = $device,value= 0 - CheckBox check_Settings_Option_3 WIN = $device,value= 0 - CheckBox check_Settings_ScalingZero WIN = $device,value= 0 - CheckBox check_Settings_SetOption_04 WIN = $device,fColor=(65280,43520,0),value= 0 - - PopupMenu popup_MoreSettings_Devices WIN=$device, mode=1 - - SetVariable SetVar_Sweep WIN = $device, value= _NUM:0 - - SetVariable SetVar_DataAcq_dDAQDelay WIN = $device,value= _NUM:0 - SetVariable setvar_DataAcq_dDAQOptOvPost WIN = $device,value= _NUM:0 - SetVariable setvar_DataAcq_dDAQOptOvPre WIN = $device,value= _NUM:0 - SetVariable SetVar_DataAcq_OnsetDelayUser WIN = $device,value= _NUM:0 - ValDisplay valdisp_DataAcq_OnsetDelayAuto WIN = $device,value= _NUM:0 - ValDisplay valdisp_DataAcq_SweepsInSet WIN = $device,value= _NUM:1 - ValDisplay valdisp_DataAcq_SweepsActiveSet WIN = $device,value= _NUM:1 - ValDisplay valdisp_DataAcq_TrialsCountdown WIN = $device,value= _NUM:1 - ValDisplay valdisp_DataAcq_ITICountdown WIN = $device,value= _NUM:0 - - SetVariable SetVar_DataAcq_TerminationDelay WIN = $device,value= _NUM:0 - - CheckBox check_Settings_SetOption_5 WIN = $device,value= 1 - CheckBox Check_DataAcq1_IndexingLocked WIN = $device, value= 0 - CheckBox Check_DataAcq_Indexing WIN = $device, value= 0 - - SetVariable SetVar_DataAcq_ListRepeats WIN = $device,limits={1,inf,1},value= _NUM:1 - - SetVariable setvar_Settings_TPBuffer WIN = $device, value= _NUM:1 - - CheckBox check_DataAcq_IndexRandom WIN = $device, fColor=(65280,43520,0),value= 0 - - ValDisplay ValDisp_DataAcq_SamplingInt win = $device, value= _NUM:0 - - SetVariable SetVar_Hardware_VC_DA_Unit WIN = $device,value= _STR:"mV" - SetVariable SetVar_Hardware_IC_DA_Unit WIN = $device,value= _STR:"pA" - SetVariable SetVar_Hardware_VC_AD_Unit WIN = $device,value= _STR:"pA" - SetVariable SetVar_Hardware_IC_AD_Unit WIN = $device,value= _STR:"mV" - - SetVariable Unit_DA_00 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_DA_01 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_DA_02 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_DA_03 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_DA_04 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_DA_05 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_DA_06 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_DA_07 WIN = $device,limits={0,inf,1},value= _STR:"" - - SetVariable Unit_AD_00 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_01 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_02 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_03 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_04 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_05 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_06 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_07 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_08 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_09 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_10 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_11 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_12 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_13 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_14 WIN = $device,limits={0,inf,1},value= _STR:"" - SetVariable Unit_AD_15 WIN = $device,limits={0,inf,1},value= _STR:"" - - SetVariable SetVar_DataAcq_Hold_IC WIN = $device, value= _NUM:0 - SetVariable Setvar_DataAcq_PipetteOffset_VC WIN = $device, value= _NUM:0 - SetVariable Setvar_DataAcq_PipetteOffset_IC WIN = $device, value= _NUM:0 - SetVariable SetVar_DataAcq_BB WIN = $device,limits={0,inf,1},value= _NUM:0 - SetVariable SetVar_DataAcq_CN WIN = $device,limits={-8,16,1},value= _NUM:0 - - CheckBox check_DatAcq_HoldEnable WIN = $device,value= 0 - CheckBox check_DatAcq_RsCompEnable WIN = $device,value= 0 - CheckBox check_DatAcq_CNEnable WIN = $device,value= 0 - - Slider slider_DataAcq_ActiveHeadstage WIN = $device,value= 0 - CheckBox check_DataAcq_AutoBias WIN = $device,value= 0 + SetVariable min_AsyncAD_00, WIN = $device,value= _NUM:0 + SetVariable max_AsyncAD_00, WIN = $device,value= _NUM:0 + CheckBox check_AsyncAlarm_00, WIN = $device,value= 0 + + SetVariable min_AsyncAD_01, WIN = $device,value= _NUM:0 + SetVariable max_AsyncAD_01, WIN = $device,value= _NUM:0 + CheckBox check_AsyncAlarm_01, WIN = $device,value= 0 + + SetVariable min_AsyncAD_02, WIN = $device,value= _NUM:0 + SetVariable max_AsyncAD_02, WIN = $device,value= _NUM:0 + CheckBox check_AsyncAlarm_02, WIN = $device,value= 0 + + SetVariable min_AsyncAD_03, WIN = $device,value= _NUM:0 + SetVariable max_AsyncAD_03, WIN = $device,value= _NUM:0 + CheckBox check_AsyncAlarm_03, WIN = $device,value= 0 + + SetVariable min_AsyncAD_04, WIN = $device,value= _NUM:0 + SetVariable max_AsyncAD_04, WIN = $device,value= _NUM:0 + CheckBox check_AsyncAlarm_04, WIN = $device,value= 0 + + SetVariable min_AsyncAD_05, WIN = $device,value= _NUM:0 + SetVariable max_AsyncAD_05, WIN = $device,value= _NUM:0 + CheckBox check_AsyncAlarm_05, WIN = $device,value= 0 + + SetVariable min_AsyncAD_06, WIN = $device,value= _NUM:0 + SetVariable max_AsyncAD_06, WIN = $device,value= _NUM:0 + CheckBox check_AsyncAlarm_06, WIN = $device,value= 0 + + SetVariable min_AsyncAD_07, WIN = $device,value= _NUM:0 + SetVariable max_AsyncAD_07, WIN = $device,value= _NUM:0 + CheckBox check_AsyncAlarm_07, WIN = $device,value= 0 + + CheckBox check_DataAcq_RepAcqRandom, WIN = $device,value= 0 + CheckBox check_Settings_Option_3, WIN = $device,value= 0 + CheckBox check_Settings_ScalingZero, WIN = $device,value= 0 + CheckBox check_Settings_SetOption_04, WIN = $device,fColor=(65280,43520,0),value= 0 + + PopupMenu popup_MoreSettings_Devices, WIN=$device, mode=1 + + SetVariable SetVar_Sweep, WIN = $device, value= _NUM:0 + + SetVariable SetVar_DataAcq_dDAQDelay, WIN = $device,value= _NUM:0 + SetVariable setvar_DataAcq_dDAQOptOvPost, WIN = $device,value= _NUM:0 + SetVariable setvar_DataAcq_dDAQOptOvPre, WIN = $device,value= _NUM:0 + SetVariable SetVar_DataAcq_OnsetDelayUser, WIN = $device,value= _NUM:0 + ValDisplay valdisp_DataAcq_OnsetDelayAuto, WIN = $device,value= _NUM:0 + ValDisplay valdisp_DataAcq_SweepsInSet, WIN = $device,value= _NUM:1 + ValDisplay valdisp_DataAcq_SweepsActiveSet, WIN = $device,value= _NUM:1 + ValDisplay valdisp_DataAcq_TrialsCountdown, WIN = $device,value= _NUM:1 + ValDisplay valdisp_DataAcq_ITICountdown, WIN = $device,value= _NUM:0 + + SetVariable SetVar_DataAcq_TerminationDelay, WIN = $device,value= _NUM:0 + + CheckBox check_Settings_SetOption_5, WIN = $device,value= 1 + CheckBox Check_DataAcq1_IndexingLocked, WIN = $device, value= 0 + CheckBox Check_DataAcq_Indexing, WIN = $device, value= 0 + + SetVariable SetVar_DataAcq_ListRepeats, WIN = $device,limits={1,inf,1},value= _NUM:1 + + SetVariable setvar_Settings_TPBuffer, WIN = $device, value= _NUM:1 + + CheckBox check_DataAcq_IndexRandom, WIN = $device, fColor=(65280,43520,0),value= 0 + + ValDisplay ValDisp_DataAcq_SamplingInt, win = $device, value= _NUM:0 + + SetVariable SetVar_Hardware_VC_DA_Unit, WIN = $device,value= _STR:"mV" + SetVariable SetVar_Hardware_IC_DA_Unit, WIN = $device,value= _STR:"pA" + SetVariable SetVar_Hardware_VC_AD_Unit, WIN = $device,value= _STR:"pA" + SetVariable SetVar_Hardware_IC_AD_Unit, WIN = $device,value= _STR:"mV" + + SetVariable Unit_DA_00, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_DA_01, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_DA_02, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_DA_03, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_DA_04, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_DA_05, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_DA_06, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_DA_07, WIN = $device,limits={0,inf,1},value= _STR:"" + + SetVariable Unit_AD_00, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_01, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_02, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_03, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_04, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_05, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_06, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_07, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_08, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_09, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_10, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_11, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_12, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_13, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_14, WIN = $device,limits={0,inf,1},value= _STR:"" + SetVariable Unit_AD_15, WIN = $device,limits={0,inf,1},value= _STR:"" + + SetVariable SetVar_DataAcq_Hold_IC, WIN = $device, value= _NUM:0 + SetVariable Setvar_DataAcq_PipetteOffset_VC, WIN = $device, value= _NUM:0 + SetVariable Setvar_DataAcq_PipetteOffset_IC, WIN = $device, value= _NUM:0 + SetVariable SetVar_DataAcq_BB, WIN = $device,limits={0,inf,1},value= _NUM:0 + SetVariable SetVar_DataAcq_CN, WIN = $device,limits={-8,16,1},value= _NUM:0 + + CheckBox check_DatAcq_HoldEnable, WIN = $device,value= 0 + CheckBox check_DatAcq_RsCompEnable, WIN = $device,value= 0 + CheckBox check_DatAcq_CNEnable, WIN = $device,value= 0 + + Slider slider_DataAcq_ActiveHeadstage, WIN = $device,value= 0 + CheckBox check_DataAcq_AutoBias, WIN = $device,value= 0 // auto bias default: -70 plus/minus 0.5 mV @ 200 pA - SetVariable SetVar_DataAcq_AutoBiasV WIN = $device, value = _NUM:-70 - SetVariable SetVar_DataAcq_AutoBiasVrange WIN = $device, value = _NUM:0.5 - SetVariable setvar_DataAcq_IbiasMax WIN = $device, value = _NUM:200 + SetVariable SetVar_DataAcq_AutoBiasV, WIN = $device, value = _NUM:-70 + SetVariable SetVar_DataAcq_AutoBiasVrange, WIN = $device, value = _NUM:0.5 + SetVariable setvar_DataAcq_IbiasMax, WIN = $device, value = _NUM:200 // settings tab - SetVariable setvar_Settings_AutoBiasPerc WIN = $device, value = _NUM:15 - SetVariable setvar_Settings_AutoBiasInt WIN = $device, value = _NUM:1 - - SetVariable SetVar_DataAcq_Hold_VC WIN = $device,value= _NUM:0 - CheckBox check_DatAcq_HoldEnableVC WIN = $device,value= 0 - SetVariable SetVar_DataAcq_WCR WIN = $device,value= _NUM:0 - CheckBox check_DatAcq_WholeCellEnable WIN = $device,value= 0 - SetVariable SetVar_DataAcq_WCC WIN = $device,value= _NUM:0 - SetVariable SetVar_DataAcq_RsCorr WIN = $device,value= _NUM:0 - SetVariable SetVar_DataAcq_RsPred WIN = $device,value= _NUM:0 - CheckBox Check_Settings_AlarmPauseAcq WIN = $device,value= 0 - CheckBox Check_Settings_AlarmAutoRepeat WIN = $device,value= 0 - CheckBox check_Settings_AmpMCCdefault WIN = $device,value= 0 - CheckBox check_Settings_SyncMiesToMCC WIN = $device,value= 0 - CheckBox check_DataAcq_Amp_Chain WIN = $device,value= 0 - CheckBox check_DatAcq_BBEnable WIN = $device,value= 0 - CheckBox check_Settings_MD WIN = $device,value= 1 + SetVariable setvar_Settings_AutoBiasPerc, WIN = $device, value = _NUM:15 + SetVariable setvar_Settings_AutoBiasInt, WIN = $device, value = _NUM:1 + + SetVariable SetVar_DataAcq_Hold_VC, WIN = $device,value= _NUM:0 + CheckBox check_DatAcq_HoldEnableVC, WIN = $device,value= 0 + SetVariable SetVar_DataAcq_WCR, WIN = $device,value= _NUM:0 + CheckBox check_DatAcq_WholeCellEnable, WIN = $device,value= 0 + SetVariable SetVar_DataAcq_WCC, WIN = $device,value= _NUM:0 + SetVariable SetVar_DataAcq_RsCorr, WIN = $device,value= _NUM:0 + SetVariable SetVar_DataAcq_RsPred, WIN = $device,value= _NUM:0 + CheckBox Check_Settings_AlarmPauseAcq, WIN = $device,value= 0 + CheckBox Check_Settings_AlarmAutoRepeat, WIN = $device,value= 0 + CheckBox check_Settings_AmpMCCdefault, WIN = $device,value= 0 + CheckBox check_Settings_SyncMiesToMCC, WIN = $device,value= 0 + CheckBox check_DataAcq_Amp_Chain, WIN = $device,value= 0 + CheckBox check_DatAcq_BBEnable, WIN = $device,value= 0 + CheckBox check_Settings_MD, WIN = $device,value= 1 EnableControls(device, "check_Settings_MD") - SetVariable setvar_Settings_TP_RTolerance WIN = $device,value= _NUM:1 - CheckBox check_Settings_SaveAmpSettings WIN = $device,value= 0 - CheckBox check_Settings_AmpIEQZstep WIN = $device,value= 0 - CheckBox Check_Settings_ITImanualStart WIN = $device,value= 0 + SetVariable setvar_Settings_TP_RTolerance, WIN = $device,value= _NUM:1 + CheckBox check_Settings_SaveAmpSettings, WIN = $device,value= 0 + CheckBox check_Settings_AmpIEQZstep, WIN = $device,value= 0 + CheckBox Check_Settings_ITImanualStart, WIN = $device,value= 0 SetControlUserData(device, "Check_Settings_BkgTP", "oldState", "") SetControlUserData(device, "Check_Settings_BackgrndDataAcq", "oldState", "") SetControlUserData(device, "check_Settings_TP_SaveTP", "oldState", "") SetControlUserData(device, "check_Settings_SaveAmpSettings", "oldState", "") - CheckBox Check_Settings_BkgTP WIN = $device,value= 1 - CheckBox Check_Settings_BackgrndDataAcq WIN = $device, value= 1 + CheckBox Check_Settings_BkgTP, WIN = $device,value= 1 + CheckBox Check_Settings_BackgrndDataAcq, WIN = $device, value= 1 - CheckBox Check_Settings_InsertTP WIN = $device,value= 1 - CheckBox Check_DataAcq_Get_Set_ITI WIN = $device, value = 1 - CheckBox check_Settings_TP_SaveTP WIN = $device, value = 0 - CheckBox check_settings_TP_show_steady WIN = $device, value = 1 - CheckBox check_settings_TP_show_peak WIN = $device, value = 1 - CheckBox check_Settings_DisablePressure WIN = $device, value = 0 - CheckBox check_Settings_RequireAmpConn WIN = $device, value = 1 + CheckBox Check_Settings_InsertTP, WIN = $device,value= 1 + CheckBox Check_DataAcq_Get_Set_ITI, WIN = $device, value = 1 + CheckBox check_Settings_TP_SaveTP, WIN = $device, value = 0 + CheckBox check_settings_TP_show_steady, WIN = $device, value = 1 + CheckBox check_settings_TP_show_peak, WIN = $device, value = 1 + CheckBox check_Settings_DisablePressure, WIN = $device, value = 0 + CheckBox check_Settings_RequireAmpConn, WIN = $device, value = 1 // Oscilloscope section in setting tab - CheckBox check_settings_show_power WIN = $device, value = 0 + CheckBox check_settings_show_power, WIN = $device, value = 0 SetVariable setvar_Settings_OsciUpdInt, win=$device, value= _NUM:500 SetVariable setvar_Settings_OsciUpdExt, win=$device, value= _NUM:10 - PopupMenu Popup_Settings_OsciUpdMode WIN = $device, value=DAP_GetOsciUpdModes(), mode=3 + PopupMenu Popup_Settings_OsciUpdMode, WIN = $device, value=DAP_GetOsciUpdModes(), mode=3 EnableControls(device, "Popup_Settings_OsciUpdMode") // defaults are also hardcoded in P_GetPressureDataWaveRef @@ -682,22 +682,22 @@ Function DAP_EphysPanelStartUpSettings() // user pressure PGC_SetAndActivateControl(device, "tab_DataAcq_Pressure", val = 0, switchtab = 1) - PopupMenu popup_Settings_UserPressure WIN = $device, mode=1,value= #"\"- none -;\"" + PopupMenu popup_Settings_UserPressure, WIN = $device, mode=1,value= #"\"- none -;\"" EnableControl(device, "popup_Settings_UserPressure") - PopupMenu Popup_Settings_UserPressure_ADC WIN = $device, mode=1 + PopupMenu Popup_Settings_UserPressure_ADC, WIN = $device, mode=1 EnableControl(device, "Popup_Settings_UserPressure_ADC") EnableControl(device, "button_Hardware_PUser_Enable") DisableControl(device, "button_Hardware_PUser_Disable") PGC_SetAndActivateControl(device, "ADC", val = 6) - ValDisplay valdisp_DataAcq_P_LED_0 WIN = $device, value= _NUM:-1 - ValDisplay valdisp_DataAcq_P_LED_1 WIN = $device, value= _NUM:-1 - ValDisplay valdisp_DataAcq_P_LED_2 WIN = $device, value= _NUM:-1 - ValDisplay valdisp_DataAcq_P_LED_3 WIN = $device, value= _NUM:-1 - ValDisplay valdisp_DataAcq_P_LED_4 WIN = $device, value= _NUM:-1 - ValDisplay valdisp_DataAcq_P_LED_5 WIN = $device, value= _NUM:-1 - ValDisplay valdisp_DataAcq_P_LED_6 WIN = $device, value= _NUM:-1 - ValDisplay valdisp_DataAcq_P_LED_7 WIN = $device, value= _NUM:-1 + ValDisplay valdisp_DataAcq_P_LED_0, WIN = $device, value= _NUM:-1 + ValDisplay valdisp_DataAcq_P_LED_1, WIN = $device, value= _NUM:-1 + ValDisplay valdisp_DataAcq_P_LED_2, WIN = $device, value= _NUM:-1 + ValDisplay valdisp_DataAcq_P_LED_3, WIN = $device, value= _NUM:-1 + ValDisplay valdisp_DataAcq_P_LED_4, WIN = $device, value= _NUM:-1 + ValDisplay valdisp_DataAcq_P_LED_5, WIN = $device, value= _NUM:-1 + ValDisplay valdisp_DataAcq_P_LED_6, WIN = $device, value= _NUM:-1 + ValDisplay valdisp_DataAcq_P_LED_7, WIN = $device, value= _NUM:-1 ValDisplay valdisp_DataAcq_P_LED_0,limits={-1,2,0},barmisc={0,0},mode= 2,highColor= (65535,49000,49000),lowColor= (65535,65535,65535),zeroColor= (49151,53155,65535) ValDisplay valdisp_DataAcq_P_LED_1,limits={-1,2,0},barmisc={0,0},mode= 2,highColor= (65535,49000,49000),lowColor= (65535,65535,65535),zeroColor= (49151,53155,65535) @@ -725,24 +725,24 @@ Function DAP_EphysPanelStartUpSettings() ValDisplay valdisp_DataAcq_P_7,valueBackColor=(65535,65535,65535,0) ValDisplay valdisp_DataAcq_P_7,limits={0,0,0},barmisc={0,1000},value= #"0.00" - ValDisplay valdisp_DataAcq_P_LED_Approach WIN = $device, value= _NUM:0 - ValDisplay valdisp_DataAcq_P_LED_Seal WIN = $device, value= _NUM:0 - ValDisplay valdisp_DataAcq_P_LED_Breakin WIN = $device, value= _NUM:0 - ValDisplay valdisp_DataAcq_P_LED_Clear WIN = $device, value= _NUM:0 - - CheckBox check_Settings_UserP_Approach WIN = $device, value=0 - CheckBox check_Settings_UserP_BreakIn WIN = $device, value=0 - CheckBox check_Settings_UserP_Seal WIN = $device, value=0 - CheckBox check_Settings_UserP_Clear WIN = $device, value=0 - CheckBox check_DataACq_Pressure_AutoOFF WIN = $device, value=0 - CheckBox check_DataACq_Pressure_User WIN = $device, value=0 - CheckBox check_DA_applyOnModeSwitch WIN = $device, value=0 - - PopupMenu Popup_Settings_SampIntMult WIN = $device, mode=1 - PopupMenu Popup_Settings_FixedFreq WIN = $device, mode=1 + ValDisplay valdisp_DataAcq_P_LED_Approach, WIN = $device, value= _NUM:0 + ValDisplay valdisp_DataAcq_P_LED_Seal, WIN = $device, value= _NUM:0 + ValDisplay valdisp_DataAcq_P_LED_Breakin, WIN = $device, value= _NUM:0 + ValDisplay valdisp_DataAcq_P_LED_Clear, WIN = $device, value= _NUM:0 + + CheckBox check_Settings_UserP_Approach, WIN = $device, value=0 + CheckBox check_Settings_UserP_BreakIn, WIN = $device, value=0 + CheckBox check_Settings_UserP_Seal, WIN = $device, value=0 + CheckBox check_Settings_UserP_Clear, WIN = $device, value=0 + CheckBox check_DataACq_Pressure_AutoOFF, WIN = $device, value=0 + CheckBox check_DataACq_Pressure_User, WIN = $device, value=0 + CheckBox check_DA_applyOnModeSwitch, WIN = $device, value=0 + + PopupMenu Popup_Settings_SampIntMult, WIN = $device, mode=1 + PopupMenu Popup_Settings_FixedFreq, WIN = $device, mode=1 EnableControls(device, "Popup_Settings_SampIntMult;Popup_Settings_FixedFreq") - SetVariable setvar_dataAcq_skipAhead win=$device,limits={0,0,1},value= _NUM:0 + SetVariable setvar_dataAcq_skipAhead, win=$device,limits={0,0,1},value= _NUM:0 EnableControl(device, "button_Hardware_P_Enable") DisableControl(device, "button_Hardware_P_Disable") EnableControls(device, "Button_DataAcq_SkipBackwards;Button_DataAcq_SkipForward") @@ -885,14 +885,14 @@ Function DAP_SetVarProc_Channel_Search(sva) : SetVariableControl popupValue = DAP_FormatStimSetPopupValue(channelType, searchString = searchString) ctrl = GetPanelControl(channelIndex, channelType, CHANNEL_CONTROL_WAVE) - PopupMenu $ctrl win=$device, value=#popupValue, userdata($USER_DATA_MENU_EXP)=listOfWaves + PopupMenu $ctrl, win=$device, value=#popupValue, userdata($USER_DATA_MENU_EXP)=listOfWaves sel = GetPopupMenuString(device, ctrl) - PopupMenu $ctrl win=$device, popmatch=sel + PopupMenu $ctrl, win=$device, popmatch=sel ctrl = GetPanelControl(channelIndex, channelType, CHANNEL_CONTROL_INDEX_END) - PopupMenu $ctrl win=$device, value=#popupValue + PopupMenu $ctrl, win=$device, value=#popupValue sel = GetPopupMenuString(device, ctrl) - PopupMenu $ctrl win=$device, popmatch=sel + PopupMenu $ctrl, win=$device, popmatch=sel if(DAP_IsAllControl(channelIndex)) numSuppChannels = GetNumberFromType(var=channelType) @@ -908,14 +908,14 @@ Function DAP_SetVarProc_Channel_Search(sva) : SetVariableControl DAG_Update(device, ctrl, str = str) ctrl = GetPanelControl(i, channelType, CHANNEL_CONTROL_WAVE) - PopupMenu $ctrl win=$device, value=#popupValue, userdata($USER_DATA_MENU_EXP)=listOfWaves + PopupMenu $ctrl, win=$device, value=#popupValue, userdata($USER_DATA_MENU_EXP)=listOfWaves sel = GetPopupMenuString(device, ctrl) - PopupMenu $ctrl win=$device, popmatch=sel + PopupMenu $ctrl, win=$device, popmatch=sel ctrl = GetPanelControl(i, channelType, CHANNEL_CONTROL_INDEX_END) - PopupMenu $ctrl win=$device, value=#popupValue + PopupMenu $ctrl, win=$device, value=#popupValue sel = GetPopupMenuString(device, ctrl) - PopupMenu $ctrl win=$device, popmatch=sel + PopupMenu $ctrl, win=$device, popmatch=sel endfor endif break @@ -2837,7 +2837,7 @@ static Function DAP_CheckStimset(device, channelType, channel, headstage) "row dimension offset of zero and row unit \"ms\".\r", device, setName, channelTypeStr, headstage, WAVEBUILDER_MIN_SAMPINT DEBUGPRINT(str) DEBUGPRINT("The stim set is now automatically fixed") - SetScale/P x 0, WAVEBUILDER_MIN_SAMPINT, "ms", stimSet + SetScale/P x, 0, WAVEBUILDER_MIN_SAMPINT, "ms", stimSet endif if(DAG_GetNumericalValue(device, "Check_Settings_SkipAnalysFuncs") || channelType != CHANNEL_TYPE_DAC) @@ -3346,9 +3346,9 @@ static Function DAP_UpdateClampmodeTabs(device, headStage, clampMode) AI_SyncGUIToAmpStorageAndMCCApp(device, headStage, clampMode) endif - TabControl tab_DataAcq_Amp win=$device, tabLabel(V_CLAMP_MODE) = SelectString(clampMode == V_CLAMP_MODE, "", highlightSpec) + "V-Clamp" - TabControl tab_DataAcq_Amp win=$device, tabLabel(I_CLAMP_MODE) = SelectString(clampMode == I_CLAMP_MODE, "", highlightSpec) + "I-Clamp" - TabControl tab_DataAcq_Amp win=$device, tabLabel(I_EQUAL_ZERO_MODE) = SelectString(clampMode == I_EQUAL_ZERO_MODE, "", highlightSpec) + "I = 0" + TabControl tab_DataAcq_Amp, win=$device, tabLabel(V_CLAMP_MODE) = SelectString(clampMode == V_CLAMP_MODE, "", highlightSpec) + "V-Clamp" + TabControl tab_DataAcq_Amp, win=$device, tabLabel(I_CLAMP_MODE) = SelectString(clampMode == I_CLAMP_MODE, "", highlightSpec) + "I-Clamp" + TabControl tab_DataAcq_Amp, win=$device, tabLabel(I_EQUAL_ZERO_MODE) = SelectString(clampMode == I_EQUAL_ZERO_MODE, "", highlightSpec) + "I = 0" End static Function DAP_ChangeHeadstageState(device, headStageCtrl, enabled) @@ -3438,7 +3438,7 @@ Function DAP_ToggleAcquisitionButton(device, mode) text = "\\Z14\\f01Acquire\rData" endif - Button DataAcquireButton title=text, win = $device + Button DataAcquireButton, title=text, win = $device End /// @brief Set the testpulse button text @@ -3459,7 +3459,7 @@ Function DAP_ToggleTestpulseButton(device, mode) text = "\\Z14\\f01Start Test \rPulse" endif - Button StartTestPulseButton title=text, win = $device + Button StartTestPulseButton, title=text, win = $device End Function DAP_ButtonProc_AutoFillGain(ba) : ButtonControl @@ -4370,7 +4370,7 @@ static Function DAP_UpdateDataFolderDisplay(device, locked) title = "Lock a device to generate device folder structure" endif - GroupBox group_Hardware_FolderPath win = $device, title = title + GroupBox group_Hardware_FolderPath, win = $device, title = title End Function DAP_LockDevice(string win) @@ -4805,35 +4805,35 @@ static Function DAP_UpdateChanAmpAssignPanel(device) // VC DA settings channel = ChanAmpAssign[%VC_DA][HeadStageNo] - Popupmenu Popup_Settings_VC_DA win = $device, mode = (IsFinite(channel) ? channel : NUM_MAX_CHANNELS) + 1 - Setvariable setvar_Settings_VC_DAgain win = $device, value = _num:ChanAmpAssign[%VC_DAGain][HeadStageNo] - Setvariable SetVar_Hardware_VC_DA_Unit win = $device, value = _str:ChanAmpAssignUnit[%VC_DAUnit][HeadStageNo] + Popupmenu Popup_Settings_VC_DA, win = $device, mode = (IsFinite(channel) ? channel : NUM_MAX_CHANNELS) + 1 + Setvariable setvar_Settings_VC_DAgain, win = $device, value = _num:ChanAmpAssign[%VC_DAGain][HeadStageNo] + Setvariable SetVar_Hardware_VC_DA_Unit, win = $device, value = _str:ChanAmpAssignUnit[%VC_DAUnit][HeadStageNo] // VC AD settings channel = ChanAmpAssign[%VC_AD][HeadStageNo] - Popupmenu Popup_Settings_VC_AD win = $device, mode = (IsFinite(channel) ? channel : NUM_MAX_CHANNELS) + 1 - Setvariable setvar_Settings_VC_ADgain win = $device, value = _num:ChanAmpAssign[%VC_ADGain][HeadStageNo] - Setvariable SetVar_Hardware_VC_AD_Unit win = $device, value = _str:ChanAmpAssignUnit[%VC_ADUnit][HeadStageNo] + Popupmenu Popup_Settings_VC_AD, win = $device, mode = (IsFinite(channel) ? channel : NUM_MAX_CHANNELS) + 1 + Setvariable setvar_Settings_VC_ADgain, win = $device, value = _num:ChanAmpAssign[%VC_ADGain][HeadStageNo] + Setvariable SetVar_Hardware_VC_AD_Unit, win = $device, value = _str:ChanAmpAssignUnit[%VC_ADUnit][HeadStageNo] // IC DA settings channel = ChanAmpAssign[%IC_DA][HeadStageNo] - Popupmenu Popup_Settings_IC_DA win = $device, mode = (IsFinite(channel) ? channel : NUM_MAX_CHANNELS) + 1 - Setvariable setvar_Settings_IC_DAgain win = $device, value = _num:ChanAmpAssign[%IC_DAGain][HeadStageNo] - Setvariable SetVar_Hardware_IC_DA_Unit win = $device, value = _str:ChanAmpAssignUnit[%IC_DAUnit][HeadStageNo] + Popupmenu Popup_Settings_IC_DA, win = $device, mode = (IsFinite(channel) ? channel : NUM_MAX_CHANNELS) + 1 + Setvariable setvar_Settings_IC_DAgain, win = $device, value = _num:ChanAmpAssign[%IC_DAGain][HeadStageNo] + Setvariable SetVar_Hardware_IC_DA_Unit, win = $device, value = _str:ChanAmpAssignUnit[%IC_DAUnit][HeadStageNo] // IC AD settings channel = ChanAmpAssign[%IC_AD][HeadStageNo] - Popupmenu Popup_Settings_IC_AD win = $device, mode = (IsFinite(channel) ? channel : NUM_MAX_CHANNELS) + 1 - Setvariable setvar_Settings_IC_ADgain win = $device, value = _num:ChanAmpAssign[%IC_ADGain][HeadStageNo] - Setvariable SetVar_Hardware_IC_AD_Unit win = $device, value = _str:ChanAmpAssignUnit[%IC_ADUnit][HeadStageNo] + Popupmenu Popup_Settings_IC_AD, win = $device, mode = (IsFinite(channel) ? channel : NUM_MAX_CHANNELS) + 1 + Setvariable setvar_Settings_IC_ADgain, win = $device, value = _num:ChanAmpAssign[%IC_ADGain][HeadStageNo] + Setvariable SetVar_Hardware_IC_AD_Unit, win = $device, value = _str:ChanAmpAssignUnit[%IC_ADUnit][HeadStageNo] ampSerial = ChanAmpAssign[%AmpSerialNo][HeadStageNo] ampChannelID = ChanAmpAssign[%AmpChannelID][HeadStageNo] if(isFinite(ampSerial) && isFinite(ampChannelID)) entry = DAP_GetAmplifierDef(ampSerial, ampChannelID) - Popupmenu popup_Settings_Amplifier win = $device, popmatch=entry + Popupmenu popup_Settings_Amplifier, win = $device, popmatch=entry else - Popupmenu popup_Settings_Amplifier win = $device, popmatch=NONE + Popupmenu popup_Settings_Amplifier, win = $device, popmatch=NONE endif End diff --git a/Packages/MIES/MIES_DataBrowser.ipf b/Packages/MIES/MIES_DataBrowser.ipf index 7d5f2389af..84c469894c 100644 --- a/Packages/MIES/MIES_DataBrowser.ipf +++ b/Packages/MIES/MIES_DataBrowser.ipf @@ -87,7 +87,7 @@ Function DB_ResetAndStoreCurrentDBPanel() DB_ClearAllGraphs() LBV_ClearGraph(device) - Checkbox check_BrowserSettings_OVS WIN = $bsPanel, value= 0 + Checkbox check_BrowserSettings_OVS, WIN = $bsPanel, value= 0 BSP_InitPanel(device) BSP_RemoveWindowHooks(device) @@ -110,120 +110,120 @@ Function DB_ResetAndStoreCurrentDBPanel() SetWindow $device,tooltiphook(hook)=$"" // static defaults for SweepControl subwindow - PopupMenu Popup_SweepControl_Selector WIN = $scPanel, mode=1,popvalue=" ", value= #"\" \"" - CheckBox check_SweepControl_AutoUpdate WIN = $scPanel, value= 1 + PopupMenu Popup_SweepControl_Selector, WIN = $scPanel, mode=1,popvalue=" ", value= #"\" \"" + CheckBox check_SweepControl_AutoUpdate, WIN = $scPanel, value= 1 // static defaults for BrowserSettings subwindow PGC_SetAndActivateControl(bsPanel, "Settings", val = 0) - CheckBox check_overlaySweeps_disableHS WIN = $bsPanel, value= 0 - CheckBox check_overlaySweeps_non_commula WIN = $bsPanel, value= 0 + CheckBox check_overlaySweeps_disableHS, WIN = $bsPanel, value= 0 + CheckBox check_overlaySweeps_non_commula, WIN = $bsPanel, value= 0 PopupMenu popup_overlaySweeps_select, WIN = $bsPanel, mode=1 - SetVariable setvar_overlaySweeps_offset WIN = $bsPanel, value= _NUM:0 - SetVariable setvar_overlaySweeps_step WIN = $bsPanel, value= _NUM:1 - CheckBox check_channelSel_DA_0 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_DA_1 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_DA_2 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_DA_3 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_DA_4 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_DA_5 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_DA_6 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_DA_7 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_DA_ALL WIN = $bsPanel, value= 0 - CheckBox check_channelSel_HEADSTAGE_0 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_HEADSTAGE_1 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_HEADSTAGE_2 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_HEADSTAGE_3 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_HEADSTAGE_4 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_HEADSTAGE_5 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_HEADSTAGE_6 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_HEADSTAGE_7 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_HEADSTAGE_ALL WIN = $bsPanel, value= 0 - CheckBox check_channelSel_AD_0 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_1 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_2 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_3 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_4 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_5 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_6 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_7 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_8 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_9 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_10 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_11 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_12 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_13 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_14 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_15 WIN = $bsPanel, value= 1 - CheckBox check_channelSel_AD_ALL WIN = $bsPanel, value= 0 - SetVariable setvar_cutoff_length_after WIN = $bsPanel, value= _NUM:0.2 - SetVariable setvar_cutoff_length_before WIN = $bsPanel, value= _NUM:0.1 - CheckBox check_auto_remove WIN = $bsPanel, value= 0 - CheckBox check_highlightRanges WIN = $bsPanel, value= 0 + SetVariable setvar_overlaySweeps_offset, WIN = $bsPanel, value= _NUM:0 + SetVariable setvar_overlaySweeps_step, WIN = $bsPanel, value= _NUM:1 + CheckBox check_channelSel_DA_0, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_DA_1, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_DA_2, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_DA_3, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_DA_4, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_DA_5, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_DA_6, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_DA_7, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_DA_ALL, WIN = $bsPanel, value= 0 + CheckBox check_channelSel_HEADSTAGE_0, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_HEADSTAGE_1, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_HEADSTAGE_2, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_HEADSTAGE_3, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_HEADSTAGE_4, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_HEADSTAGE_5, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_HEADSTAGE_6, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_HEADSTAGE_7, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_HEADSTAGE_ALL, WIN = $bsPanel, value= 0 + CheckBox check_channelSel_AD_0, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_1, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_2, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_3, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_4, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_5, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_6, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_7, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_8, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_9, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_10, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_11, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_12, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_13, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_14, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_15, WIN = $bsPanel, value= 1 + CheckBox check_channelSel_AD_ALL, WIN = $bsPanel, value= 0 + SetVariable setvar_cutoff_length_after, WIN = $bsPanel, value= _NUM:0.2 + SetVariable setvar_cutoff_length_before, WIN = $bsPanel, value= _NUM:0.1 + CheckBox check_auto_remove, WIN = $bsPanel, value= 0 + CheckBox check_highlightRanges, WIN = $bsPanel, value= 0 // BEGIN PA - CheckBox check_pulseAver_showTraces WIN = $bsPanel, value= 1 - SetVariable setvar_pulseAver_vert_scale_bar WIN = $bsPanel, value= _NUM:1 - - CheckBox check_pulseAver_ShowImage WIN = $bsPanel, value= 0 - CheckBox check_pulseAver_drawXZeroLine WIN = $bsPanel, value= 0 - SetVariable setvar_pulseAver_overridePulseLength WIN = $bsPanel, value= _NUM:10 - PopupMenu popup_pulseAver_colorscales WIN= $bsPanel, mode=8 // Terrain - PopupMenu popup_pulseAver_pulseSortOrder WIN= $bsPanel, mode=1 - - CheckBox check_pulseAver_deconv WIN = $bsPanel, value= 0 - SetVariable setvar_pulseAver_deconv_tau WIN = $bsPanel, value= _NUM:15 - SetVariable setvar_pulseAver_deconv_smth WIN = $bsPanel, value= _NUM:1000 - SetVariable setvar_pulseAver_deconv_range WIN = $bsPanel, value= _NUM:inf - - CheckBox check_pulseAver_zero WIN = $bsPanel, value= 0 - CheckBox check_pulseAver_timeAlign WIN = $bsPanel, value= 0 - CheckBox check_pulseAver_showAver WIN = $bsPanel, value= 0 - CheckBox check_pulseAver_multGraphs WIN = $bsPanel, value= 0 - CheckBox check_pulseAver_indPulses WIN = $bsPanel, value= 1 - - SetVariable setvar_pulseAver_startPulse WIN = $bsPanel, value= _NUM:0 - SetVariable setvar_pulseAver_endPulse WIN = $bsPanel, value= _NUM:inf - CheckBox check_pulseAver_fixedPulseLength WIN = $bsPanel, value= 0 - SetVariable setvar_pulseAver_overridePulseLength WIN = $bsPanel, value= _NUM:10 - - CheckBox check_pulseAver_searchFailedPulses WIN = $bsPanel, value= 0 - CheckBox check_pulseAver_hideFailedPulses WIN = $bsPanel, value= 0 - SetVariable setvar_pulseAver_failedPulses_level WIN = $bsPanel, value= _NUM:0 - SetVariable setvar_pulseAver_numberOfSpikes WIN = $bsPanel, value= _NUM:NaN + CheckBox check_pulseAver_showTraces, WIN = $bsPanel, value= 1 + SetVariable setvar_pulseAver_vert_scale_bar, WIN = $bsPanel, value= _NUM:1 + + CheckBox check_pulseAver_ShowImage, WIN = $bsPanel, value= 0 + CheckBox check_pulseAver_drawXZeroLine, WIN = $bsPanel, value= 0 + SetVariable setvar_pulseAver_overridePulseLength, WIN = $bsPanel, value= _NUM:10 + PopupMenu popup_pulseAver_colorscales, WIN= $bsPanel, mode=8 // Terrain + PopupMenu popup_pulseAver_pulseSortOrder, WIN= $bsPanel, mode=1 + + CheckBox check_pulseAver_deconv, WIN = $bsPanel, value= 0 + SetVariable setvar_pulseAver_deconv_tau, WIN = $bsPanel, value= _NUM:15 + SetVariable setvar_pulseAver_deconv_smth, WIN = $bsPanel, value= _NUM:1000 + SetVariable setvar_pulseAver_deconv_range, WIN = $bsPanel, value= _NUM:inf + + CheckBox check_pulseAver_zero, WIN = $bsPanel, value= 0 + CheckBox check_pulseAver_timeAlign, WIN = $bsPanel, value= 0 + CheckBox check_pulseAver_showAver, WIN = $bsPanel, value= 0 + CheckBox check_pulseAver_multGraphs, WIN = $bsPanel, value= 0 + CheckBox check_pulseAver_indPulses, WIN = $bsPanel, value= 1 + + SetVariable setvar_pulseAver_startPulse, WIN = $bsPanel, value= _NUM:0 + SetVariable setvar_pulseAver_endPulse, WIN = $bsPanel, value= _NUM:inf + CheckBox check_pulseAver_fixedPulseLength, WIN = $bsPanel, value= 0 + SetVariable setvar_pulseAver_overridePulseLength, WIN = $bsPanel, value= _NUM:10 + + CheckBox check_pulseAver_searchFailedPulses, WIN = $bsPanel, value= 0 + CheckBox check_pulseAver_hideFailedPulses, WIN = $bsPanel, value= 0 + SetVariable setvar_pulseAver_failedPulses_level, WIN = $bsPanel, value= _NUM:0 + SetVariable setvar_pulseAver_numberOfSpikes, WIN = $bsPanel, value= _NUM:NaN // END PA - CheckBox check_BrowserSettings_OVS WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_AR WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_PA WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_DAC WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_ADC WIN = $bsPanel, value= 1 - CheckBox check_BrowserSettings_TTL WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_splitTTL WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT - CheckBox check_BrowserSettings_OChan WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_dDAQ WIN = $bsPanel, value= 0 - CheckBox check_Calculation_ZeroTraces WIN = $bsPanel, value= 0 - CheckBox check_Calculation_AverageTraces WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_TA WIN = $bsPanel, value= 0 - CheckBox check_ovs_clear_on_new_ra_cycle WIN = $bsPanel, value= 0 - CheckBox check_ovs_clear_on_new_stimset_cycle WIN = $bsPanel, value= 0 - PopupMenu popup_TimeAlignment_Mode WIN = $bsPanel, mode=1, popvalue="Level (Raising)",value= #"\"Level (Raising);Level (Falling);Min;Max\"" - SetVariable setvar_TimeAlignment_LevelCross WIN = $bsPanel, value= _NUM:0 - CheckBox check_Display_VisibleXrange WIN = $bsPanel, value= 0 - CheckBox check_Display_EqualYrange WIN = $bsPanel, value= 0, disable=0 - CheckBox check_Display_EqualYignore WIN = $bsPanel, value= 0, disable=0 - SetVariable setvar_Display_EqualYlevel WIN = $bsPanel, value= _NUM:0 - Slider slider_BrowserSettings_dDAQ WIN = $bsPanel, value= -1,disable=DISABLE_CONTROL_BIT - CheckBox check_SweepControl_HideSweep WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_DS WIN = $bsPanel, value= 0 - CheckBox check_BrowserSettings_DB_Passed WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT | HIDDEN_CONTROL_BIT - CheckBox check_BrowserSettings_DB_Failed WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT | HIDDEN_CONTROL_BIT - CheckBox check_BrowserSettings_SF WIN = $bsPanel, value= 0 - - CheckBox check_BrowserSettings_VisEpochs WIN = $bsPanel, value=0, disable=0 + CheckBox check_BrowserSettings_OVS, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_AR, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_PA, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_DAC, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_ADC, WIN = $bsPanel, value= 1 + CheckBox check_BrowserSettings_TTL, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_splitTTL, WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT + CheckBox check_BrowserSettings_OChan, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_dDAQ, WIN = $bsPanel, value= 0 + CheckBox check_Calculation_ZeroTraces, WIN = $bsPanel, value= 0 + CheckBox check_Calculation_AverageTraces, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_TA, WIN = $bsPanel, value= 0 + CheckBox check_ovs_clear_on_new_ra_cycle, WIN = $bsPanel, value= 0 + CheckBox check_ovs_clear_on_new_stimset_cycle, WIN = $bsPanel, value= 0 + PopupMenu popup_TimeAlignment_Mode, WIN = $bsPanel, mode=1, popvalue="Level (Raising)",value= #"\"Level (Raising);Level (Falling);Min;Max\"" + SetVariable setvar_TimeAlignment_LevelCross, WIN = $bsPanel, value= _NUM:0 + CheckBox check_Display_VisibleXrange, WIN = $bsPanel, value= 0 + CheckBox check_Display_EqualYrange, WIN = $bsPanel, value= 0, disable=0 + CheckBox check_Display_EqualYignore, WIN = $bsPanel, value= 0, disable=0 + SetVariable setvar_Display_EqualYlevel, WIN = $bsPanel, value= _NUM:0 + Slider slider_BrowserSettings_dDAQ, WIN = $bsPanel, value= -1,disable=DISABLE_CONTROL_BIT + CheckBox check_SweepControl_HideSweep, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_DS, WIN = $bsPanel, value= 0 + CheckBox check_BrowserSettings_DB_Passed, WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT | HIDDEN_CONTROL_BIT + CheckBox check_BrowserSettings_DB_Failed, WIN = $bsPanel, value= 0,disable=DISABLE_CONTROL_BIT | HIDDEN_CONTROL_BIT + CheckBox check_BrowserSettings_SF, WIN = $bsPanel, value= 0 + + CheckBox check_BrowserSettings_VisEpochs, WIN = $bsPanel, value=0, disable=0 // settings history - CheckBox check_limit_x_selected_sweeps WIN = $shPanel, value=0 + CheckBox check_limit_x_selected_sweeps, WIN = $shPanel, value=0 SF_SetFormula(device, "data(\rcursors(A,B),\rselect(channels(AD),sweeps())\r)") @@ -241,7 +241,7 @@ Function DB_ResetAndStoreCurrentDBPanel() SetWindow $descNB, userdata($EXPCONFIG_UDATA_EXCLUDE_RESTORE)="1" SetWindow $descNB, userdata($EXPCONFIG_UDATA_EXCLUDE_SAVE)="1" - SetVariable setvar_sweepFormula_parseResult WIN = $bsPanel, value=_STR:"" + SetVariable setvar_sweepFormula_parseResult, WIN = $bsPanel, value=_STR:"" ValDisplay status_sweepFormula_parser, WIN = $bsPanel, value=1 SearchForInvalidControlProcs(device) diff --git a/Packages/MIES/MIES_DataConfigurator.ipf b/Packages/MIES/MIES_DataConfigurator.ipf index ad3bd114c8..53778a6631 100644 --- a/Packages/MIES/MIES_DataConfigurator.ipf +++ b/Packages/MIES/MIES_DataConfigurator.ipf @@ -342,7 +342,7 @@ static Function [WAVE/Z DAQDataWave, WAVE/WAVE NIDataWave] DC_MakeAndGetDAQDataW Redimension/N=(numRows, numActiveChannels) ITCDataWave FastOp ITCDataWave = 0 - SetScale/P x 0, samplingInterval * MICRO_TO_MILLI, "ms", ITCDataWave + SetScale/P x, 0, samplingInterval * MICRO_TO_MILLI, "ms", ITCDataWave return [ITCDataWave, $""] break @@ -350,7 +350,7 @@ static Function [WAVE/Z DAQDataWave, WAVE/WAVE NIDataWave] DC_MakeAndGetDAQDataW WAVE/WAVE NIDataWave = GetDAQDataWave(device, dataAcqOrTP) Redimension/N=(numActiveChannels) NIDataWave - SetScale/P x 0, samplingInterval * MICRO_TO_MILLI, "ms", NIDataWave + SetScale/P x, 0, samplingInterval * MICRO_TO_MILLI, "ms", NIDataWave Make/FREE/N=(numActiveChannels) type = SWS_GetRawDataFPType(device) WAVE config = GetDAQConfigWave(device) @@ -381,7 +381,7 @@ static Function/WAVE DC_MakeNIChannelWave(device, numRows, samplingInterval, ind WAVE NIChannel = GetNIDAQChannelWave(device, index, dataAcqOrTP) Redimension/N=(numRows)/Y=(type) NIChannel FastOp NIChannel= 0 - SetScale/P x 0, samplingInterval * MICRO_TO_MILLI, "ms", NIChannel + SetScale/P x, 0, samplingInterval * MICRO_TO_MILLI, "ms", NIChannel return NIChannel End diff --git a/Packages/MIES/MIES_DebugPanel.ipf b/Packages/MIES/MIES_DebugPanel.ipf index 5700dff88a..21efeab1ef 100644 --- a/Packages/MIES/MIES_DebugPanel.ipf +++ b/Packages/MIES/MIES_DebugPanel.ipf @@ -65,7 +65,7 @@ Function/S DP_OpenDebugPanel() WAVE/T listWave = GetDebugPanelListWave() WAVE listSelWave = GetDebugPanelListSelWave() - ListBox listbox_mies_files win=$PANEL, listWave=listWave, selWave=listSelWave + ListBox listbox_mies_files, win=$PANEL, listWave=listWave, selWave=listSelWave debugMode = QuerySetIgorOption("DEBUGGING_ENABLED", globalSymbol = 1) SetCheckBoxState(PANEL, "check_debug_mode", debugMode == 1) diff --git a/Packages/MIES/MIES_Debugging.ipf b/Packages/MIES/MIES_Debugging.ipf index 87ef7afb6a..ed0100a94c 100644 --- a/Packages/MIES/MIES_Debugging.ipf +++ b/Packages/MIES/MIES_Debugging.ipf @@ -706,7 +706,7 @@ Function DEBUG_STOREFUNCTION() WAVE/Z wv = root:functionids if(!WaveExists(wv)) WAVE/T functionids = ListToTextWave(FunctionList("*", ";", "KIND:18,WIN:"), ";") - Duplicate functionids root:functionids/WAVE=wv + Duplicate functionids, root:functionids/WAVE=wv endif WAVE/Z count = root:functioncount if(!WaveExists(count)) diff --git a/Packages/MIES/MIES_ExperimentDocumentation.ipf b/Packages/MIES/MIES_ExperimentDocumentation.ipf index a8ac0e7c4b..ac713b5e37 100644 --- a/Packages/MIES/MIES_ExperimentDocumentation.ipf +++ b/Packages/MIES/MIES_ExperimentDocumentation.ipf @@ -372,15 +372,15 @@ static Function ED_WriteChangedValuesToNote(device, sweepNo) endif if(i < NUM_HEADSTAGES) - sprintf frontLabel, "HS#%d:" i + sprintf frontLabel, "HS#%d:", i else frontLabel = "" endif if (!cmpstr(factor, LABNOTEBOOK_NO_TOLERANCE)) - sprintf text, "%s%s: %s\r" frontLabel, key, SelectString(currentSetting[i], "Off", "On") + sprintf text, "%s%s: %s\r", frontLabel, key, SelectString(currentSetting[i], "Off", "On") else - sprintf text, "%s%s: %.2f %s\r" frontLabel, key, currentSetting[i], unit + sprintf text, "%s%s: %.2f %s\r", frontLabel, key, currentSetting[i], unit endif str += text @@ -453,12 +453,12 @@ static Function ED_WriteChangedValuesToNoteText(device, sweepNo) endif if(i < NUM_HEADSTAGES) - sprintf frontLabel, "HS#%d:" i + sprintf frontLabel, "HS#%d:", i else frontLabel = "" endif - sprintf text, "%s%s: " frontLabel, key + sprintf text, "%s%s: ", frontLabel, key str += text + currentSetting[i] + "\r" endfor endfor diff --git a/Packages/MIES/MIES_GuiUtilities.ipf b/Packages/MIES/MIES_GuiUtilities.ipf index 57aba529a2..2fbcc1ed93 100644 --- a/Packages/MIES/MIES_GuiUtilities.ipf +++ b/Packages/MIES/MIES_GuiUtilities.ipf @@ -25,7 +25,7 @@ Function ShowControl(win, control) return NaN endif - ModifyControl $control win=$win, disable=(V_disable & ~HIDDEN_CONTROL_BIT) + ModifyControl $control, win=$win, disable=(V_disable & ~HIDDEN_CONTROL_BIT) End /// @brief Show a list of GUI controls in the given window @@ -52,7 +52,7 @@ Function HideControl(win, control) return NaN endif - ModifyControl $control win=$win, disable=(V_disable | HIDDEN_CONTROL_BIT) + ModifyControl $control, win=$win, disable=(V_disable | HIDDEN_CONTROL_BIT) End /// @brief Hide a list of GUI controls in the given window @@ -79,7 +79,7 @@ Function EnableControl(win, control) return NaN endif - ModifyControl $control win=$win, disable=(V_disable & ~DISABLE_CONTROL_BIT) + ModifyControl $control, win=$win, disable=(V_disable & ~DISABLE_CONTROL_BIT) End /// @brief Enable a list of GUI controls in the given window @@ -106,7 +106,7 @@ Function DisableControl(win, control) return NaN endif - ModifyControl $control win=$win, disable=(V_disable | DISABLE_CONTROL_BIT) + ModifyControl $control, win=$win, disable=(V_disable | DISABLE_CONTROL_BIT) End /// @brief Disable a list of GUI controls in the given window @@ -144,7 +144,7 @@ Function SetControlTitle(win, controlName, newTitle) ControlInfo/W=$win $controlName ASSERT(V_flag != 0, "Non-existing control or window") - ModifyControl $ControlName WIN = $win, title = newTitle + ModifyControl $ControlName, WIN = $win, title = newTitle End /// @brief Set the procedure of a list of controls @@ -168,7 +168,7 @@ Function SetControlProcedure(win, controlName, newProcedure) ControlInfo/W=$win $controlName ASSERT(V_flag != 0, "Non-existing control or window") - ModifyControl $ControlName WIN = $win, proc = $newProcedure + ModifyControl $ControlName, WIN = $win, proc = $newProcedure End /// @brief Return the title of a control @@ -222,7 +222,7 @@ Function SetControlTitleColor(win, controlName, R, G, B) ///@todo store color in ControlInfo/W=$win $controlName ASSERT(V_flag != 0, "Non-existing control or window") - ModifyControl $ControlName WIN = $win, fColor = (R,G,B) + ModifyControl $ControlName, WIN = $win, fColor = (R,G,B) End /// @brief Change color of a control @@ -233,7 +233,7 @@ Function ChangeControlColor(win, controlName, R, G, B) ControlInfo/W=$win $controlName ASSERT(V_flag != 0, "Non-existing control or window") - ModifyControl $ControlName WIN = $win, fColor = (R,G,B) + ModifyControl $ControlName, WIN = $win, fColor = (R,G,B) End @@ -245,7 +245,7 @@ Function ChangeControlValueColor(win, controlName, R, G, B) ControlInfo/W=$win $controlName ASSERT(V_flag != 0, "Non-existing control or window") - ModifyControl $ControlName WIN = $win, valueColor = (R,G,B) + ModifyControl $ControlName, WIN = $win, valueColor = (R,G,B) End @@ -287,7 +287,7 @@ Function SetControlBckgColor(win, controlName, R, G, B, [Alpha]) ControlInfo/W=$win $controlName ASSERT(V_flag != 0, "Non-existing control or window") - ModifyControl $ControlName WIN = $win, valueBackColor = (R,G,B,Alpha) + ModifyControl $ControlName, WIN = $win, valueBackColor = (R,G,B,Alpha) End /// @brief Change the background color of a list of controls @@ -458,7 +458,7 @@ Function SetPopupMenuIndex(win, control, index) ASSERT(V_flag != 0, "Non-existing control or window") ASSERT(abs(V_flag) == CONTROL_TYPE_POPUPMENU, "Control is not a popupmenu") ASSERT(index >= 0,"Invalid index") - PopupMenu $control win=$win, mode=index + PopupMenu $control, win=$win, mode=index End /// @brief Sets the popupmenu value @@ -470,7 +470,7 @@ Function SetPopupMenuVal(string win, string control, [string list, string func]) ASSERT(abs(V_flag) == CONTROL_TYPE_POPUPMENU, "Control is not a popupmenu") if(!ParamIsDefault(list)) - sprintf output, "\"%s\"" List + sprintf output, "\"%s\"", List ASSERT(strlen(output) < MAX_COMMANDLINE_LENGTH, "Popup menu list is greater than MAX_COMMANDLINE_LENGTH characters") elseif(!ParamIsDefault(func)) output = func @@ -478,7 +478,7 @@ Function SetPopupMenuVal(string win, string control, [string list, string func]) ASSERT(!IsEmpty(allEntries), "func does not generate a non-empty string list.") endif - PopupMenu $control win=$win, value=#output + PopupMenu $control, win=$win, value=#output End /// @brief Sets the popupmenu string @@ -497,7 +497,7 @@ Function/S SetPopupMenuString(win, control, str) ControlInfo/W=$win $control ASSERT(V_flag != 0, "Non-existing control or window") ASSERT(abs(V_flag) == CONTROL_TYPE_POPUPMENU, "Control is not a popupmenu") - PopupMenu $control win=$win, popmatch = str + PopupMenu $control, win=$win, popmatch = str result = GetPopupMenuString(win, control) @@ -548,7 +548,7 @@ Function SetSliderPositionIndex(win, control, index) ControlInfo/W=$win $control ASSERT(V_flag != 0, "Non-existing control or window") ASSERT(abs(V_flag) == CONTROL_TYPE_SLIDER, "Control is not a slider") - Slider $control win=$win, value = index + Slider $control, win=$win, value = index End /// @brief Set a ValDisplay @@ -591,7 +591,7 @@ Function SetValDisplay(win, control, [var, str, format]) return NaN endif - ValDisplay $control win=$win, value=#formattedString + ValDisplay $control, win=$win, value=#formattedString End /// @brief Check if a given control exists @@ -688,7 +688,7 @@ Function SetControlUserData(win, control, key, value) ControlInfo/W=$win $control ASSERT(V_flag != 0, "Non-existing control or window") - ModifyControl $control win=$win, userdata($key)=value + ModifyControl $control, win=$win, userdata($key)=value End /// @brief Get distinctive trace colors for a given index @@ -1728,7 +1728,7 @@ Function/S GetNotebookText(string win, [variable mode]) mode = 1 endif - Notebook $win getData=mode + Notebook $win, getData=mode return S_Value End @@ -1739,10 +1739,10 @@ Function ReplaceNotebookText(win, text) ASSERT(WinType(win) == 5, "Passed win is not a notebook") - Notebook $win selection={startOfFile, endOfFile} + Notebook $win, selection={startOfFile, endOfFile} ASSERT(!V_Flag, "Illegal selection") - Notebook $win setData=text + Notebook $win, setData=text End /// @brief Append to a notebook @@ -1751,10 +1751,10 @@ Function AppendToNotebookText(win, text) ASSERT(WinType(win) == 5, "Passed win is not a notebook") - Notebook $win selection={endOfFile, endOfFile} + Notebook $win, selection={endOfFile, endOfFile} ASSERT(!V_Flag, "Illegal selection") - Notebook $win setData=text + Notebook $win, setData=text End /// @brief Select the end in the given notebook. @@ -1765,7 +1765,7 @@ Function NotebookSelectionAtEnd(win) ASSERT(WinType(win) == 5, "Passed win is not a notebook") - Notebook $win selection={endOfFile,endOfFile}, findText={"",1} + Notebook $win, selection={endOfFile,endOfFile}, findText={"",1} End /// @brief Retrieves named userdata keys from a recreation macro string @@ -2282,20 +2282,20 @@ End Function ReflowNotebookText(string win) variable width - GetWindow $win wsizeDC + GetWindow $win, wsizeDC width = V_right - V_left // make it a bit shorter width -= 10 // pixel -> points width = width * (72/ScreenResolution) // redefine ruler - Notebook $win ruler=Normal, rulerUnits=0, margins={0, 0, width} + Notebook $win, ruler=Normal, rulerUnits=0, margins={0, 0, width} // select everything - Notebook $win selection={startOfFile, endOfFile} + Notebook $win, selection={startOfFile, endOfFile} // apply ruler to selection - Notebook $win ruler=Normal + Notebook $win, ruler=Normal // deselect selection - Notebook $win selection={endOfFile, endOfFile} + Notebook $win, selection={endOfFile, endOfFile} End /// @brief In a formatted notebook sets a location where keyWord appear to the given color diff --git a/Packages/MIES/MIES_IgorHooks.ipf b/Packages/MIES/MIES_IgorHooks.ipf index 69cd4661f0..6a4f0fdebb 100644 --- a/Packages/MIES/MIES_IgorHooks.ipf +++ b/Packages/MIES/MIES_IgorHooks.ipf @@ -353,7 +353,7 @@ Function IH_ResetScaling(struct WMWinHookStruct &s) // first try if the selected window is a graph graph = GetMainWindow(s.winName) - GetWindow $graph activeSW + GetWindow $graph, activeSW activeSW = S_Value if(WinType(activeSW) == WINTYPE_GRAPH) diff --git a/Packages/MIES/MIES_LogbookViewer.ipf b/Packages/MIES/MIES_LogbookViewer.ipf index 19f2f307b2..c790839d36 100644 --- a/Packages/MIES/MIES_LogbookViewer.ipf +++ b/Packages/MIES/MIES_LogbookViewer.ipf @@ -536,7 +536,7 @@ static Function LBV_AddTraceToLBGraph(string graph, WAVE keys, WAVE values, stri lbl += "\r(" + unit + ")" endif - Label/W=$graph $axis lbl + Label/W=$graph $axis, lbl ModifyGraph/W=$graph lblPosMode = 1, standoff($axis) = 0, freePos($axis) = 0 ModifyGraph/W=$graph mode = 3 @@ -704,7 +704,7 @@ static Function LBV_AddTraceToLBGraphTPStorage(string graph, DFREF dfr, string k endfor if(!IsEmpty(traceList)) - Label/W=$graph $axis lbl + Label/W=$graph $axis, lbl ModifyGraph/W=$graph lblPosMode = 1, standoff($axis) = 0, freePos($axis) = 0 ModifyGraph/W=$graph mode = 3 diff --git a/Packages/MIES/MIES_Menu.ipf b/Packages/MIES/MIES_Menu.ipf index 599518fb63..523546c6a0 100644 --- a/Packages/MIES/MIES_Menu.ipf +++ b/Packages/MIES/MIES_Menu.ipf @@ -112,38 +112,38 @@ Function MEN_OpenAboutDialog() NewNotebook /F=1 /N=MiesVersionNB/FG=(FL,FT,FR,FB)/HOST=#/OPTS=3 nb = panel + "#" + nb - Notebook $nb defaultTab=36, magnification=100 - Notebook $nb showRuler=0, rulerUnits=2, updating={1, 1},writeProtect=1 - Notebook $nb newRuler=Normal, justification=0, margins={0,0,468}, spacing={0,0,0}, tabs={}, rulerDefaults={"Arial",11,0,(0,0,0)} - Notebook $nb ruler=Normal, text="MIES is a sweep based data acquisition tool written in Igor Pro.\r" - Notebook $nb text="\r" + Notebook $nb, defaultTab=36, magnification=100 + Notebook $nb, showRuler=0, rulerUnits=2, updating={1, 1},writeProtect=1 + Notebook $nb, newRuler=Normal, justification=0, margins={0,0,468}, spacing={0,0,0}, tabs={}, rulerDefaults={"Arial",11,0,(0,0,0)} + Notebook $nb, ruler=Normal, text="MIES is a sweep based data acquisition tool written in Igor Pro.\r" + Notebook $nb, text="\r" version = ROStr(GetMiesVersion()) version = StringFromList(0, version, "\r") version = RemovePrefix(version, start = "Release_") - Notebook $nb text="Version: " + version + "\r" - Notebook $nb text="\r" + Notebook $nb, text="Version: " + version + "\r" + Notebook $nb, text="\r" NotebookAction/W=$nb name=Action1, title="Report an Issue/Enhancement proposal", ignoreErrors=1 NotebookAction/W=$nb name=Action1, commands="MEN_CreateIssueOnGithub()" - Notebook $nb text="\r" - Notebook $nb text="\r" - Notebook $nb text="Location: " + Notebook $nb, text="\r" + Notebook $nb, text="\r" + Notebook $nb, text="Location: " NotebookAction/W=$nb name=Action2, title="github.com/AllenInstitute/MIES", ignoreErrors=1 NotebookAction/W=$nb name=Action2, commands="BrowseURL(\"https://github.com/AllenInstitute/MIES\")" - Notebook $nb text="\r" - Notebook $nb text="\r" - Notebook $nb text="License: " + Notebook $nb, text="\r" + Notebook $nb, text="\r" + Notebook $nb, text="License: " NotebookAction/W=$nb name=Action0, title="2-clause BSD license plus a third clause", ignoreErrors=1 NotebookAction/W=$nb name=Action0, commands="BrowseURL(\"https://github.com/AllenInstitute/MIES/blob/main/LICENSE\")" - Notebook $nb text="\r" - Notebook $nb text="\r" - Notebook $nb text="Sponsors: " + Notebook $nb, text="\r" + Notebook $nb, text="\r" + Notebook $nb, text="Sponsors: " NotebookAction/W=$nb name=Action3, title="www.alleninstitute.org", ignoreErrors=1 NotebookAction/W=$nb name=Action3, commands="BrowseURL(\"https://www.alleninstitute.org\")" - Notebook $nb text="\r" - Notebook $nb text="\r" - Notebook $nb text="Data products:" - Notebook $nb text="\r" + Notebook $nb, text="\r" + Notebook $nb, text="\r" + Notebook $nb, text="Data products:" + Notebook $nb, text="\r" NotebookAction/W=$nb name=Action5, title="", showmode=3, linkStyle=0, scaling={40.0 * sfactor, 40.0 * sfactor}, procPICTName=SynPhys, ignoreErrors=1, padding={0,0,0,0,5}, commands="BrowseURL(\"https://portal.brain-map.org/explore/connectivity/synaptic-physiology\")" NotebookAction/W=$nb name=Action6, title="", showmode=3, linkStyle=0, scaling={40.0 * sfactor, 40.0 * sfactor}, procPICTName=CellTypes, ignoreErrors=1, padding={0,0,0,0,0}, commands="BrowseURL(\"http://celltypes.brain-map.org/\")" SetActiveSubwindow ## diff --git a/Packages/MIES/MIES_MiesUtilities.ipf b/Packages/MIES/MIES_MiesUtilities.ipf index 27a9312281..aa50b2a7fa 100644 --- a/Packages/MIES/MIES_MiesUtilities.ipf +++ b/Packages/MIES/MIES_MiesUtilities.ipf @@ -269,7 +269,7 @@ static Function/WAVE ExtractLogbookSlice(WAVE logbook, variable logbookType, var Note/K slice if(!cmpstr(entryName, "TimeStamp") || !cmpstr(entryName, "TimeStampSinceIgorEpochUTC")) - SetScale d, 0, 0, "dat" slice + SetScale d, 0, 0, "dat", slice endif ASSERT(!isEmpty(entryName), "entryName must not be empty") @@ -2489,7 +2489,7 @@ Function LayoutGraph(string win, STRUCT TiledGraphSettings &tgs) NewFreeAxis/W=$graph $freeAxis ModifyGraph/W=$graph standoff($freeAxis)=0, lblPosMode($freeAxis)=2, axRGB($freeAxis)=(65535,65535,65535,0), tlblRGB($freeAxis)=(65535,65535,65535,0), alblRGB($freeAxis)=(0,0,0), lblMargin($freeAxis)=0, lblLatPos($freeAxis)=0 ModifyGraph/W=$graph axisEnab($freeAxis)={firstFreeAxis, lastFreeAxis} - Label/W=$graph $freeAxis "HS" + num2str(headstage) + Label/W=$graph $freeAxis, "HS" + num2str(headstage) endfor // unassoc DA @@ -3872,8 +3872,8 @@ Function TimeAlignHandleCursorDisplay(win) posA = NumberByKey("POINT", csrA) posB = NumberByKey("POINT", csrB) endif - Cursor/W=$graph/A=1/N=1/P A $trace posA - Cursor/W=$graph/A=1/N=1/P B $trace posB + Cursor/W=$graph/A=1/N=1/P A, $trace, posA + Cursor/W=$graph/A=1/N=1/P B, $trace, posB End /// @brief Enable/Disable TimeAlignment Controls and Cursors @@ -7478,7 +7478,7 @@ Function UploadCrashDumps() diagPath = S_path basePath = GetUniqueSymbolicPath() - NewPath/Q/O/Z $basePath diagPath + ":" + NewPath/Q/O/Z $basePath, diagPath + ":" #ifdef DEBUGGING_ENABLED SaveTextFile(JSON_dump(jsonID, indent=4), diagPath + ":" + UniqueFileOrFolder(basePath, "crash-dumps", suffix = ".json")) @@ -7594,7 +7594,7 @@ Function UploadLogFiles([variable verbose, variable firstDate, variable lastDate if(DP_DebuggingEnabledForCaller()) basePath = GetUniqueSymbolicPath() path = SpecialDirPath("Temporary", 0, 0, 1) + "MIES:" - NewPath/C/Q/O/Z $basePath path + NewPath/C/Q/O/Z $basePath, path for(jsonID : jsonIDs) location = path + UniqueFileOrFolder(basePath, "logfiles", suffix = ".json") diff --git a/Packages/MIES/MIES_NeuroDataWithoutBorders.ipf b/Packages/MIES/MIES_NeuroDataWithoutBorders.ipf index 61b885ae16..4a31df218a 100644 --- a/Packages/MIES/MIES_NeuroDataWithoutBorders.ipf +++ b/Packages/MIES/MIES_NeuroDataWithoutBorders.ipf @@ -685,7 +685,7 @@ Function NWB_ASYNC_FinishWriting(string device) return NaN endif - sprintf msg, "Waiting for NWB writing thread %d/%d.\r" i + 1, NWB_ASYNC_MAX_ITERATIONS + sprintf msg, "Waiting for NWB writing thread %d/%d.\r", i + 1, NWB_ASYNC_MAX_ITERATIONS BUG(msg) endfor End diff --git a/Packages/MIES/MIES_Oscilloscope.ipf b/Packages/MIES/MIES_Oscilloscope.ipf index 9f7612a00b..db675c4488 100644 --- a/Packages/MIES/MIES_Oscilloscope.ipf +++ b/Packages/MIES/MIES_Oscilloscope.ipf @@ -182,7 +182,7 @@ Function SCOPE_UpdateGraph(device, dataAcqOrTP) endif endif - SetAxis/W=$graph $leftAxis statsMin - spacing / 2.0, statsMax + spacing / 2.0 + SetAxis/W=$graph $leftAxis, statsMin - spacing / 2.0, statsMax + spacing / 2.0 endfor End @@ -328,13 +328,13 @@ Function SCOPE_CreateGraph(device, dataAcqOrTP) ModifyGraph/W=$graph axisEnab($rightAxis) = {YaxisLow, YaxisLow + (YaxisHigh - YaxisLow) * 0.3}, freePos($rightAxis)={0, kwFraction} ModifyGraph/W=$graph lblPosMode($rightAxis) = 4, lblPos($rightAxis) = 60, lblRot($rightAxis) = 180 ModifyGraph/W=$graph nticks($rightAxis) = 2, tickUnit($AXIS_SCOPE_TP_TIME)=1 - Label/W=$graph $rightAxis "(MΩ)" + Label/W=$graph $rightAxis, "(MΩ)" if(!oneTimeInitDone) sprintf str, "\\[1\\K(%d, %d, %d)R\\Bss\\M(MΩ)\\]1\\K(%d, %d,%d)\r\\[1\\K(0, 26122, 0)R\\Bpeak\\M(MΩ)\\]1\\K(0, 0, 0)", steadyColor.red, steadyColor.green, steadyColor.blue, peakColor.red, peakColor.green, peakColor.blue TextBox/W=$graph/F=0/B=1/X=0.62/Y=0.36/E=2 str - Label/W=$graph $AXIS_SCOPE_TP_TIME "Relative time (s)" + Label/W=$graph $AXIS_SCOPE_TP_TIME, "Relative time (s)" SetAxis/W=$graph/A=2 $rightAxis if(!isNaN(axisMinTop)) @@ -384,7 +384,7 @@ Function SCOPE_CreateGraph(device, dataAcqOrTP) Label/W=$graph bottomDAQ "Time DAQ (\\U)" NVAR stopCollectionPoint = $GetStopCollectionPoint(device) sampInt = DAP_GetSampInt(device, DATA_ACQUISITION_MODE) * MICRO_TO_MILLI - SetAxis/W=$graph bottomDAQ 0, stopCollectionPoint * sampInt + SetAxis/W=$graph bottomDAQ, 0, stopCollectionPoint * sampInt ModifyGraph/W=$graph freePos(bottomDAQ)=-35 endif End @@ -428,7 +428,7 @@ Function SCOPE_SetADAxisLabel(device, dataAcqOrTP, activeHeadStage) [s] = GetHeadstageColor(headstage) - sprintf color, "\K(%d,%d,%d)" s.red, s.green, s.blue + sprintf color, "\K(%d,%d,%d)", s.red, s.green, s.blue if(activeHeadStage == headStage) style = "\f05" else @@ -719,8 +719,8 @@ static Function SCOPE_ITC_UpdateOscilloscope(device, dataAcqOrTP, chunk, fifoPos Display/N=DAQDataWaveTPMD DAQDataWave[][1] endif - Cursor/W=DAQDataWaveTPMD/H=2/P A $NameOfWave(DAQDataWave) first - Cursor/W=DAQDataWaveTPMD/H=2/P B $NameOfWave(DAQDataWave) last + Cursor/W=DAQDataWaveTPMD/H=2/P A, $NameOfWave(DAQDataWave), first + Cursor/W=DAQDataWaveTPMD/H=2/P B, $NameOfWave(DAQDataWave), last endif #endif diff --git a/Packages/MIES/MIES_PackageSettings.ipf b/Packages/MIES/MIES_PackageSettings.ipf index 1edd9ef640..755491e5f4 100644 --- a/Packages/MIES/MIES_PackageSettings.ipf +++ b/Packages/MIES/MIES_PackageSettings.ipf @@ -224,7 +224,7 @@ Function PS_StoreWindowCoordinate(variable JSONid, string win) JSON_AddTreeObject(JSONid, path) endif - GetWindow $win wsizeRM + GetWindow $win, wsizeRM JSON_SetVariable(JSONid, path + "/left", V_left) JSON_SetVariable(JSONid, path + "/right", V_right) diff --git a/Packages/MIES/MIES_PressureControl.ipf b/Packages/MIES/MIES_PressureControl.ipf index 0194c981d5..ed7ed1214a 100644 --- a/Packages/MIES/MIES_PressureControl.ipf +++ b/Packages/MIES/MIES_PressureControl.ipf @@ -1813,16 +1813,16 @@ Function P_UpdatePressureModeTabs(device, headStage) string highlightSpec = "\\f01\\Z11" if(pressureMode == PRESSURE_METHOD_ATM) - TabControl tab_DataAcq_Pressure win=$device, tabLabel(0) = "Auto" - TabControl tab_DataAcq_Pressure win=$device, tabLabel(1) = "Manual" + TabControl tab_DataAcq_Pressure, win=$device, tabLabel(0) = "Auto" + TabControl tab_DataAcq_Pressure, win=$device, tabLabel(1) = "Manual" elseif(pressureMode == PRESSURE_METHOD_MANUAL) PGC_SetAndActivateControl(device, "tab_DataAcq_Pressure", val = 1) - TabControl tab_DataAcq_Pressure win=$device, tabLabel(0) = "Auto" - TabControl tab_DataAcq_Pressure win=$device, tabLabel(1) = highlightSpec + "Manual" + TabControl tab_DataAcq_Pressure, win=$device, tabLabel(0) = "Auto" + TabControl tab_DataAcq_Pressure, win=$device, tabLabel(1) = highlightSpec + "Manual" else PGC_SetAndActivateControl(device, "tab_DataAcq_Pressure", val = 0) - TabControl tab_DataAcq_Pressure win=$device, tabLabel(0) = highlightSpec + "Auto" - TabControl tab_DataAcq_Pressure win=$device, tabLabel(1) = "Manual" + TabControl tab_DataAcq_Pressure, win=$device, tabLabel(0) = highlightSpec + "Auto" + TabControl tab_DataAcq_Pressure, win=$device, tabLabel(1) = "Manual" endif PGC_SetAndActivateControl(device, "setvar_DataAcq_SSPressure", val = pressureWave[headStage][%ManSSPressure]) @@ -1840,68 +1840,68 @@ Function P_ValidatePressureSetHeadstage(device, headStageNo) string msg if(!isFinite(PressureDataWv[headStageNo][%HW_DAC_Type])) - sprintf msg, "DAC Type is not configured for headStage %d" headStageNo + sprintf msg, "DAC Type is not configured for headStage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[headStageNo][%DAC_DevID])) - sprintf msg, "DAC device ID is not configured for headstage %d" headStageNo + sprintf msg, "DAC device ID is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif // TTL_B is optional if(!isFinite(PressureDataWv[headStageNo][%TTL_A])) - sprintf msg, "TTL A is not configured for headstage %d" headStageNo + sprintf msg, "TTL A is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[headStageNo][%DAC_Gain])) - sprintf msg, "DAC gain is not configured for headstage %d" headStageNo + sprintf msg, "DAC gain is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[headStageNo][%ADC_Gain])) - sprintf msg, "ADC Type is not configured for headstage %d" headStageNo + sprintf msg, "ADC Type is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[headStageNo][%PSI_air])) - sprintf msg, "Approach pressure in air is not configured for headstage %d" headStageNo + sprintf msg, "Approach pressure in air is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[headStageNo][%PSI_solution])) - sprintf msg, "Approach pressure in solution is not configured for headstage %d" headStageNo + sprintf msg, "Approach pressure in solution is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[headStageNo][%PSI_slice])) - sprintf msg, "Approach pressure in slice is not configured for headstage %d" headStageNo + sprintf msg, "Approach pressure in slice is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[headStageNo][%PSI_nearCell])) - sprintf msg, "Approach pressure in slice is not configured for headstage %d" headStageNo + sprintf msg, "Approach pressure in slice is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[HeadStageNo][%PSI_SealInitial])) - sprintf msg, "Initial seal pressure is not configured for headstage %d" headStageNo + sprintf msg, "Initial seal pressure is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif if(!isFinite(PressureDataWv[headStageNo][%PSI_SealMax])) - sprintf msg, "Maximum seal pressure is not configured for headstage %d" headStageNo + sprintf msg, "Maximum seal pressure is not configured for headstage %d", headStageNo DEBUGPRINT(msg) return 0 endif @@ -1990,10 +1990,10 @@ Function P_PressureDisplayHighlite(device, hilite) variable Bh = str2num(stringFromList(2,High)) string controlName - sprintf controlName, "valdisp_DataAcq_P_LED_%d" pressureDataWv[0][%userSelectedHeadStage] - ValDisplay $controlName zeroColor=(Rz, Gz, Bz), lowColor=(Rl, Gl, Bl), highColor=(Rh, Gh, Bh), win=$device + sprintf controlName, "valdisp_DataAcq_P_LED_%d", pressureDataWv[0][%userSelectedHeadStage] + ValDisplay $controlName, zeroColor=(Rz, Gz, Bz), lowColor=(Rl, Gl, Bl), highColor=(Rh, Gh, Bh), win=$device - sprintf controlName, "valdisp_DataAcq_P_%d" pressureDataWv[0][%userSelectedHeadStage] + sprintf controlName, "valdisp_DataAcq_P_%d", pressureDataWv[0][%userSelectedHeadStage] ChangeControlValueColor(device, controlName, RGB, RGB, RGB) // sprintf controlName, "valdisp_DataAcq_P_%d" pressureDataWv[0][%userSelectedHeadStage] @@ -2084,7 +2084,7 @@ static Function P_Enable() P_LoadPressureButtonState(lockedDevice) P_SetLEDValueAssoc(lockedDevice) else - printf "No devices are presently assigned for pressure regulation on: %s\r" LockedDevice + printf "No devices are presently assigned for pressure regulation on: %s\r", LockedDevice endif LOG_AddEntry(PACKAGE_MIES, "pressure", \ @@ -2565,7 +2565,7 @@ static Function P_SetLEDValueAssoc(device) variable i, col for(i = 0; i < NUM_HEADSTAGES;i += 1) - sprintf pathAndCell, "%s[%d]" stringPath, i + sprintf pathAndCell, "%s[%d]", stringPath, i controlName = stringfromlist(i, PRESSURE_CONTROL_LED_DASHBOARD) SetValDisplay(device, controlName, str=pathAndCell) endfor @@ -2574,7 +2574,7 @@ static Function P_SetLEDValueAssoc(device) for(i = 0; i < 4; i += 1) controlName = stringFromList(i,PRESSURE_CONTROL_USER_CHECBOXES) col = FindDimlabel(GuiState, COLS, controlName) - sprintf pathAndCell, "%s[0][%d]" stringPath, col + sprintf pathAndCell, "%s[0][%d]", stringPath, col controlName = stringFromList(i,PRESSURE_CONTROL_LED_MODE_USER) SetValDisplay(device, controlName, str=pathAndCell) endfor diff --git a/Packages/MIES/MIES_ProgrammaticGUIControl.ipf b/Packages/MIES/MIES_ProgrammaticGUIControl.ipf index 7e4ce7d7aa..c3cf866b4c 100644 --- a/Packages/MIES/MIES_ProgrammaticGUIControl.ipf +++ b/Packages/MIES/MIES_ProgrammaticGUIControl.ipf @@ -240,7 +240,7 @@ Function PGC_SetAndActivateControl(string win, string control, [variable val, st if(!ParamIsDefault(val)) ASSERT(val >= 0 && val < ItemsInList(popupMenuList), "Invalid value for popupmenu: " + num2str(val)) - PopupMenu $control win=$win, mode=(val + 1) + PopupMenu $control, win=$win, mode=(val + 1) elseif(!ParamIsDefault(str)) switch(popupMenuType) case POPUPMENULIST_TYPE_BUILTIN: @@ -248,7 +248,7 @@ Function PGC_SetAndActivateControl(string win, string control, [variable val, st ASSERT(val >= 0 && val < ItemsInList(popupMenuList), "Invalid value for popupmenu: " + num2str(val)) // popmatch does not work with these - PopupMenu $control win=$win, mode=(WhichListItem(str, popupMenuList) + 1) + PopupMenu $control, win=$win, mode=(WhichListItem(str, popupMenuList) + 1) break case POPUPMENULIST_TYPE_OTHER: // the return value might be different due to wildcard expansion @@ -307,7 +307,7 @@ Function PGC_SetAndActivateControl(string win, string control, [variable val, st break case CONTROL_TYPE_TAB: ASSERT(!ParamIsDefault(val) && ParamIsDefault(str), "Needs a variable argument") - TabControl $control win=$win, value=val + TabControl $control, win=$win, value=val // @todo add range check @@ -386,7 +386,7 @@ Function PGC_SetAndActivateControl(string win, string control, [variable val, st ASSERT(!ParamIsDefault(val) && ParamIsDefault(str), "Needs a variable argument") ASSERT(GetLimitConstrainedSetVar(S_recreation, val) == val, "Value " + num2str(val) + " is out of range.") - Slider $control win=$win, value = val + Slider $control, win=$win, value = val if(isEmpty(procedure)) break @@ -414,7 +414,7 @@ Function PGC_SetAndActivateControl(string win, string control, [variable val, st ASSERT(val >= 0 && val < DimSize(listWave, ROWS), "val is out of range") - ListBox $control win=$win, row = val, selRow = val + ListBox $control, win=$win, row = val, selRow = val if(IsEmpty(procedure)) break diff --git a/Packages/MIES/MIES_PulseAveraging.ipf b/Packages/MIES/MIES_PulseAveraging.ipf index 8cac446dc0..71003073ff 100644 --- a/Packages/MIES/MIES_PulseAveraging.ipf +++ b/Packages/MIES/MIES_PulseAveraging.ipf @@ -170,7 +170,7 @@ static Function/S PA_GetGraph(string mainWin, STRUCT PulseAverageSettings &pa, v // rest is zero already endif - GetWindow $mainWin wsize + GetWindow $mainWin, wsize left = V_right + width_spacing top = V_top right = left + width @@ -205,10 +205,10 @@ static Function/S PA_GetGraph(string mainWin, STRUCT PulseAverageSettings &pa, v switch(displayMode) case PA_DISPLAYMODE_IMAGES: - SetWindow $win hook(resizeHookAndScalebar)=PA_ImageWindowHook + SetWindow $win, hook(resizeHookAndScalebar)=PA_ImageWindowHook break case PA_DISPLAYMODE_TRACES: - SetWindow $win hook(resizeHookAndScalebar)=PA_TraceWindowHook + SetWindow $win, hook(resizeHookAndScalebar)=PA_TraceWindowHook break default: ASSERT(0, "Invalid display mode") @@ -2695,11 +2695,11 @@ static Function/WAVE PA_Deconvolution(average, outputDFR, outputWaveName, deconv if(DimOffset(average, ROWS) != DimOffset(cache, ROWS)) CopyScales/P average, cache endif - Duplicate/O cache outputDFR:$outputWaveName/WAVE=wv + Duplicate/O cache, outputDFR:$outputWaveName/WAVE=wv return wv endif - Duplicate/O/R=[0, DimSize(smoothed, ROWS) - 2] smoothed outputDFR:$outputWaveName/WAVE=wv + Duplicate/O/R=[0, DimSize(smoothed, ROWS) - 2] smoothed, outputDFR:$outputWaveName/WAVE=wv step = deconvolution.tau / DimDelta(average, 0) MultiThread wv = step * (smoothed[p + 1] - smoothed[p]) + smoothed[p] @@ -3126,7 +3126,7 @@ static Function PA_AddColorScales(string win, STRUCT PulseAverageSettings &pa, S sprintf msg, "traceName %s, minimum %g, maximum %g\r", traceName, minimum, maximum DEBUGPRINT(msg) - ModifyImage/W=$graph $traceName ctab= {minimum, maximum, $(pa.imageColorScale), 0}, minRGB=0,maxRGB=(65535,0,0) + ModifyImage/W=$graph $traceName, ctab= {minimum, maximum, $(pa.imageColorScale), 0}, minRGB=0,maxRGB=(65535,0,0) endfor endfor @@ -3663,7 +3663,7 @@ static Function PA_SetColorScale(string win, string colScale) numImages = ItemsInList(images) for(j = 0; j < numImages; j += 1) image = StringFromList(j, images) - ModifyImage/W=$graph $image ctab={,,$colScale,0} + ModifyImage/W=$graph $image, ctab={,,$colScale,0} endfor endfor End diff --git a/Packages/MIES/MIES_RepeatedAcquisition.ipf b/Packages/MIES/MIES_RepeatedAcquisition.ipf index aefdaaecfb..2cccafe038 100644 --- a/Packages/MIES/MIES_RepeatedAcquisition.ipf +++ b/Packages/MIES/MIES_RepeatedAcquisition.ipf @@ -215,7 +215,7 @@ Function RA_Counter(device) RA_PerfAddMark(device, count) #endif - sprintf str, "count=%d, activeSetCount=%d\r" count, activeSetCount + sprintf str, "count=%d, activeSetCount=%d\r", count, activeSetCount DEBUGPRINT(str) RA_StepSweepsRemaining(device) @@ -313,7 +313,7 @@ Function RA_CounterMD(device) RA_PerfAddMark(device, count) #endif - sprintf str, "count=%d, activeSetCount=%d\r" count, activeSetCount + sprintf str, "count=%d, activeSetCount=%d\r", count, activeSetCount DEBUGPRINT(str) RA_StepSweepsRemaining(device) diff --git a/Packages/MIES/MIES_StimsetAPI.ipf b/Packages/MIES/MIES_StimsetAPI.ipf index 3df54a6f38..7f5b3afea9 100644 --- a/Packages/MIES/MIES_StimsetAPI.ipf +++ b/Packages/MIES/MIES_StimsetAPI.ipf @@ -344,7 +344,7 @@ Function ST_GetStimsetParameterAsVariable(string setName, string entry, [variabl endif if(ST_UpgradeStimset(setName)) - printf "The stimset %s does not exist\r." setName + printf "The stimset %s does not exist\r.", setName ControlwindowToFront() return NaN endif @@ -375,7 +375,7 @@ Function/S ST_GetStimsetParameterAsString(string setName, string entry, [variabl endif if(ST_UpgradeStimset(setName)) - printf "The stimset %s does not exist\r." setName + printf "The stimset %s does not exist\r.", setName ControlwindowToFront() return "" endif @@ -434,7 +434,7 @@ Function ST_SetStimsetParameter(string setName, string entry, [variable epochInd endif if(ST_UpgradeStimset(setName)) - printf "The stimset %s does not exist\r." setName + printf "The stimset %s does not exist\r.", setName ControlwindowToFront() return 1 endif diff --git a/Packages/MIES/MIES_SweepFormula.ipf b/Packages/MIES/MIES_SweepFormula.ipf index 23d0503f17..5b5ab5a0ad 100644 --- a/Packages/MIES/MIES_SweepFormula.ipf +++ b/Packages/MIES/MIES_SweepFormula.ipf @@ -1442,7 +1442,7 @@ static Function SF_CommonWindowSetup(string win, string graph) NVAR JSONid = $GetSettingsJSONid() PS_InitCoordinates(JSONid, win, "sweepformula_" + win) - SetWindow $win hook(resetScaling)=IH_ResetScaling, userData($SFH_USER_DATA_BROWSER)=graph + SetWindow $win, hook(resetScaling)=IH_ResetScaling, userData($SFH_USER_DATA_BROWSER)=graph newTitle = BSP_GetFormulaGraphTitle(graph) DoWindow/T $win, newTitle @@ -1635,7 +1635,7 @@ static Function SF_FormulaPlotter(string graph, string formula, [DFREF dfr, vari WAVE wvX = GetSweepFormulaX(dfr, dataCnt) if(WaveType(wvResultX, 1) == WaveType(wvX, 1)) - Duplicate/O wvResultX $GetWavesDataFolder(wvX, 2) + Duplicate/O wvResultX, $GetWavesDataFolder(wvX, 2) else MoveWaveWithOverWrite(wvX, wvResultX) endif @@ -1652,7 +1652,7 @@ static Function SF_FormulaPlotter(string graph, string formula, [DFREF dfr, vari WAVE wvY = GetSweepFormulaY(dfr, dataCnt) if(WaveType(wvResultY, 1) == WaveType(wvY, 1)) - Duplicate/O wvResultY $GetWavesDataFolder(wvY, 2) + Duplicate/O wvResultY, $GetWavesDataFolder(wvY, 2) else MoveWaveWithOverWrite(wvY, wvResultY) endif diff --git a/Packages/MIES/MIES_TestPulse.ipf b/Packages/MIES/MIES_TestPulse.ipf index acfb70e6ba..a279fb8370 100644 --- a/Packages/MIES/MIES_TestPulse.ipf +++ b/Packages/MIES/MIES_TestPulse.ipf @@ -468,8 +468,8 @@ static Function [variable result, variable tau, variable baseline] TP_AutoFitBas ModifyGraph axisEnab(left)={0,0.65},axisEnab(res)={0.7,1},freePos(res)=0 endif - Cursor/W=AutoTPDebugging A $NameOfWave(displayedData) first - Cursor/W=AutoTPDebugging B $NameOfWave(displayedData) last + Cursor/W=AutoTPDebugging A, $NameOfWave(displayedData), first + Cursor/W=AutoTPDebugging B, $NameOfWave(displayedData), last WAVE data = root:AutoTPDebuggingData WAVE residuals = root:Res_AutoTPDebuggingData @@ -900,8 +900,8 @@ threadsafe Function/DF TP_TSAnalysis(dfrInp) #if defined(TP_ANALYSIS_DEBUGGING) DEBUGPRINT_TS("Marker: ", var = marker) - Duplicate data dfrOut:colors - Duplicate data dfrOut:data + Duplicate data, dfrOut:colors + Duplicate data, dfrOut:data WAVE colors = dfrOut:colors colors = 0 colors[0, lengthTPInPoints - 1] = 100 diff --git a/Packages/MIES/MIES_Utilities.ipf b/Packages/MIES/MIES_Utilities.ipf index bfc4c17bd4..9fec2d7242 100644 --- a/Packages/MIES/MIES_Utilities.ipf +++ b/Packages/MIES/MIES_Utilities.ipf @@ -1825,7 +1825,7 @@ Function CreateFolderOnDisk(absPath) ASSERT(!FileExists(partialPath), "The path which we should create exists, but points to a file") - NewPath/O/C/Q/Z $tempPath partialPath + NewPath/O/C/Q/Z $tempPath, partialPath endfor KillPath/Z $tempPath @@ -3931,7 +3931,7 @@ Function/S AskUserForExistingFolder(string baseFolder) symbPath = GetUniqueSymbolicPath() - NewPath/O/Q/Z $symbPath baseFolder + NewPath/O/Q/Z $symbPath, baseFolder // preset next undirected NewPath/Open call using the contents of a // *symbolic* folder PathInfo/S $symbPath @@ -4682,7 +4682,7 @@ Function GetPlotArea(win, s) return NaN endif - GetWindow $win psizeDC + GetWindow $win, psizeDC s.left = V_left s.right = V_right @@ -6656,7 +6656,7 @@ Function UpdateInfoButtonHelp(string win, string ctrl, string content) string htmlStr = "
" + content + "
" - Button $ctrl win=$win,help={htmlStr},userdata=content + Button $ctrl, win=$win,help={htmlStr},userdata=content End /// @brief Acts like the `limit` builtin but replaces values outside the valid range instead of clipping them diff --git a/Packages/MIES/MIES_WaveBuilder.ipf b/Packages/MIES/MIES_WaveBuilder.ipf index 5ee1e4fa80..c0d60220cc 100644 --- a/Packages/MIES/MIES_WaveBuilder.ipf +++ b/Packages/MIES/MIES_WaveBuilder.ipf @@ -477,7 +477,7 @@ static Function/Wave WB_GetStimSet([setName]) FastOp stimSet = 0 // note: here the stimset generation is coupled to the ITC minimum sample interval which is 200 kHz wheras for NI it is 500 kHz - SetScale/P x 0, WAVEBUILDER_MIN_SAMPINT, "ms", stimset + SetScale/P x, 0, WAVEBUILDER_MIN_SAMPINT, "ms", stimset for(i = 0; i < numSweeps; i += 1) WAVE wv = data[i] @@ -1267,7 +1267,7 @@ static Function WB_NoiseSegment(pa) Make/FREE/D/C/N=(samples / 2 + 1) magphase FastOp magphase = 0 - SetScale/P x 0, WAVEBUILDER_MIN_SAMPINT_HZ/samples, "Hz" magphase + SetScale/P x, 0, WAVEBUILDER_MIN_SAMPINT_HZ/samples, "Hz", magphase // we can't use Multithread here as this creates non-reproducible data switch(pa.noiseType) diff --git a/Packages/MIES/MIES_WaveBuilderPanel.ipf b/Packages/MIES/MIES_WaveBuilderPanel.ipf index 3ba2b4a2f8..d5d3a2d567 100644 --- a/Packages/MIES/MIES_WaveBuilderPanel.ipf +++ b/Packages/MIES/MIES_WaveBuilderPanel.ipf @@ -398,7 +398,7 @@ static Function WBP_UpdatePanelIfAllowed() endif maxDuration = WBP_ReturnPulseDurationMax() - SetVariable SetVar_WaveBuilder_P8 win=$panel, limits = {0, maxDuration, 0.1} + SetVariable SetVar_WaveBuilder_P8, win=$panel, limits = {0, maxDuration, 0.1} if(GetSetVariable(panel, "SetVar_WaveBuilder_P8") > maxDuration) SetSetVariable(panel, "SetVar_WaveBuilder_P8", maxDuration) endif @@ -457,7 +457,7 @@ static Function WBP_ParameterWaveToPanel(stimulusType) customWaveName = WPT[0][segment][EPOCH_TYPE_CUSTOM] WAVE/Z customWave = $customWaveName if(WaveExists(customWave)) - GroupBox group_WaveBuilder_FolderPath win=$panel, title=GetWavesDataFolder(customWave, 1) + GroupBox group_WaveBuilder_FolderPath, win=$panel, title=GetWavesDataFolder(customWave, 1) PopupMenu popup_WaveBuilder_ListOfWaves, win=$panel, popMatch=NameOfWave(customWave) endif elseif(stimulusType == EPOCH_TYPE_PULSE_TRAIN) @@ -518,7 +518,7 @@ Function WBP_ButtonProc_DeleteSet(ba) : ButtonControl ST_RemoveStimSet(setWaveToDelete) ControlUpdate/W=$panel popup_WaveBuilder_SetList - PopupMenu popup_WaveBuilder_SetList win=$panel, mode = 1 + PopupMenu popup_WaveBuilder_SetList, win=$panel, mode = 1 break endswitch @@ -757,7 +757,7 @@ static Function WBP_LowPassDeltaLimits() if(LowPassDelta > 0) DeltaLimit = trunc(100000 / numSweeps) - SetVariable SetVar_WaveBuilder_P21 win=$panel, limits = {-inf, DeltaLimit, 1} + SetVariable SetVar_WaveBuilder_P21, win=$panel, limits = {-inf, DeltaLimit, 1} if(LowPassDelta > DeltaLimit) SetSetVariable(panel, "SetVar_WaveBuilder_P21", DeltaLimit) endif @@ -765,7 +765,7 @@ static Function WBP_LowPassDeltaLimits() if(LowPassDelta < 0) DeltaLimit = trunc(-((LowPassCutOff/numSweeps) -1)) - SetVariable SetVar_WaveBuilder_P21 win=$panel, limits = {DeltaLimit, 99999, 1} + SetVariable SetVar_WaveBuilder_P21, win=$panel, limits = {DeltaLimit, 99999, 1} if(LowPassDelta < DeltaLimit) SetSetVariable(panel, "SetVar_WaveBuilder_P21", DeltaLimit) endif @@ -784,7 +784,7 @@ static Function WBP_HighPassDeltaLimits() if(HighPassDelta > 0) DeltaLimit = trunc((100000 - HighPassCutOff) / numSweeps) - 1 - SetVariable SetVar_WaveBuilder_P23 win=$panel, limits = { -inf, DeltaLimit, 1} + SetVariable SetVar_WaveBuilder_P23, win=$panel, limits = { -inf, DeltaLimit, 1} if(HighPassDelta > DeltaLimit) SetSetVariable(panel, "SetVar_WaveBuilder_P23", DeltaLimit) endif @@ -792,7 +792,7 @@ static Function WBP_HighPassDeltaLimits() if(HighPassDelta < 0) DeltaLimit = trunc(HighPassCutOff / numSweeps) + 1 - SetVariable SetVar_WaveBuilder_P23 win=$panel, limits = {DeltaLimit, 99999, 1} + SetVariable SetVar_WaveBuilder_P23, win=$panel, limits = {DeltaLimit, 99999, 1} if(HighPassDelta < DeltaLimit) SetSetVariable(panel, "SetVar_WaveBuilder_P23", DeltaLimit) endif @@ -820,7 +820,7 @@ static Function WBP_ChangeWaveType() WP[1,6][][] = 0 - SetVariable SetVar_WaveBuilder_P2 win = $panel, limits = {0,1,1} + SetVariable SetVar_WaveBuilder_P2, win = $panel, limits = {0,1,1} DisableControls(panel, list) WBP_UpdateControlAndWave("SetVar_WaveBuilder_P2", var = 0) @@ -828,7 +828,7 @@ static Function WBP_ChangeWaveType() WBP_UpdateControlAndWave("SetVar_WaveBuilder_P4", var = 0) WBP_UpdateControlAndWave("SetVar_WaveBuilder_P5", var = 0) elseif(stimulusType == CHANNEL_TYPE_DAC) - SetVariable SetVar_WaveBuilder_P2 win =$panel, limits = {-inf,inf,1} + SetVariable SetVar_WaveBuilder_P2, win =$panel, limits = {-inf,inf,1} EnableControls(panel, list) else ASSERT(0, "Unknown stimulus type") @@ -1037,7 +1037,7 @@ static Function WBP_UpdateEpochControls() currentEpoch = GetSetVariable("WaveBuilder", "setvar_WaveBuilder_CurrentEpoch") numEpochs = SegWvType[100] - SetVariable setvar_WaveBuilder_CurrentEpoch win=$panel, limits = {0, numEpochs - 1, 1} + SetVariable setvar_WaveBuilder_CurrentEpoch, win=$panel, limits = {0, numEpochs - 1, 1} if(currentEpoch >= numEpochs) PGC_SetAndActivateControl(panel, "setvar_WaveBuilder_CurrentEpoch", val = numEpochs - 1) @@ -1149,9 +1149,9 @@ Function WBP_PopMenuProc_FolderSelect(pa) : PopupMenuControl endif endif - GroupBox group_WaveBuilder_FolderPath win=$panel, title = path - PopupMenu popup_WaveBuilder_FolderList win=$panel, mode = 1 - PopupMenu popup_WaveBuilder_ListOfWaves win=$panel, mode = 1 + GroupBox group_WaveBuilder_FolderPath, win=$panel, title = path + PopupMenu popup_WaveBuilder_FolderList, win=$panel, mode = 1 + PopupMenu popup_WaveBuilder_ListOfWaves, win=$panel, mode = 1 ControlUpdate/W=$panel popup_WaveBuilder_ListOfWaves break endswitch @@ -1629,18 +1629,18 @@ Function WBP_ShowFFTSpectrumIfReq(segmentWave, sweep) Duplicate/FREE segmentWave, input ASSERT(!cmpstr(WaveUnits(input, ROWS), "ms"), "Unexpected data units for row dimension") - SetScale/P x 0, WAVEBUILDER_MIN_SAMPINT * MILLI_TO_ONE, "s", input + SetScale/P x, 0, WAVEBUILDER_MIN_SAMPINT * MILLI_TO_ONE, "s", input FFT/FREE/DEST=cmplxFFT input MultiThread cmplxFFT = r2polar(cmplxFFT) - Duplicate/O cmplxFFT dfr:$(SEGMENTWAVE_SPECTRUM_PREFIX + "Mag_" + num2str(sweep))/WAVE=spectrumMag + Duplicate/O cmplxFFT, dfr:$(SEGMENTWAVE_SPECTRUM_PREFIX + "Mag_" + num2str(sweep))/WAVE=spectrumMag Redimension/R spectrumMag MultiThread spectrumMag = 20 * log(real(cmplxFFT[p])) SetScale y, 0, 0, "dB", spectrumMag - Duplicate/O cmplxFFT dfr:$(SEGMENTWAVE_SPECTRUM_PREFIX + "Phase_" + num2str(sweep))/WAVE=spectrumPhase + Duplicate/O cmplxFFT, dfr:$(SEGMENTWAVE_SPECTRUM_PREFIX + "Phase_" + num2str(sweep))/WAVE=spectrumPhase Redimension/R spectrumPhase MultiThread spectrumPhase = imag(cmplxFFT[p]) * 180 / Pi @@ -1875,7 +1875,7 @@ static Function WBP_ToggleAnalysisParamGUI() Execute/Q/Z "SetWindow kwTopWin sizeLimit={785,233,inf,inf}" // sizeLimit requires Igor 7 or later NewNotebook /F=0 /N=nb_param_value /W=(16,76,216,120)/FG=(UGFL1,UGFT1,UGFR1,UGFB1) /HOST=# /OPTS=3 Notebook kwTopWin, defaultTab=20, autoSave= 0, magnification=100 - Notebook kwTopWin font="Lucida Console", fSize=11, fStyle=0, textRGB=(0,0,0) + Notebook kwTopWin, font="Lucida Console", fSize=11, fStyle=0, textRGB=(0,0,0) SetActiveSubwindow ## WBP_UpdateParameterWave() diff --git a/Packages/MIES/MIES_WaveDataFolderGetters.ipf b/Packages/MIES/MIES_WaveDataFolderGetters.ipf index ad224867bf..1040b73dd5 100644 --- a/Packages/MIES/MIES_WaveDataFolderGetters.ipf +++ b/Packages/MIES/MIES_WaveDataFolderGetters.ipf @@ -4229,7 +4229,7 @@ Function/Wave GetSegmentWave([duration]) Redimension/N=(numPoints) SegmentWave endif - SetScale/P x 0, WAVEBUILDER_MIN_SAMPINT, "ms", SegmentWave + SetScale/P x, 0, WAVEBUILDER_MIN_SAMPINT, "ms", SegmentWave return SegmentWave End @@ -4448,7 +4448,7 @@ Function/S P_GetDevicePressureFolderAS(device) string DeviceType ParseDeviceString(device, deviceType, deviceNumber) string FolderPathString - sprintf FolderPathString, "%s:Pressure:%s:Device_%s" GetMiesPathAsString(), DeviceType, DeviceNumber + sprintf FolderPathString, "%s:Pressure:%s:Device_%s", GetMiesPathAsString(), DeviceType, DeviceNumber return FolderPathString End diff --git a/Packages/tests/Basic/UTF_Configuration.ipf b/Packages/tests/Basic/UTF_Configuration.ipf index 952176196c..ce9c75b2f4 100644 --- a/Packages/tests/Basic/UTF_Configuration.ipf +++ b/Packages/tests/Basic/UTF_Configuration.ipf @@ -45,7 +45,7 @@ Window MainPanel() : Panel CheckBox CheckBox,userdata(Config_RestorePriority)= "10" CheckBox CheckBox,userdata(Config_NiceName)= "Check Me" CheckBox CheckBox,userdata(Config_JSONPath)= "The real important controls" - CheckBox CheckBox proc=TCONF_CheckProc + CheckBox CheckBox, proc=TCONF_CheckProc PopupMenu popup,pos={138.00,0.00},size={77.00,19.00},title="popup" PopupMenu popup,mode=1,popvalue="Yes",value= #"\"Yes;No;Maybe\"" ValDisplay valdisp,pos={225.00,0.00},size={93.00,17.00},title="valdisp" @@ -73,7 +73,7 @@ Window MainPanel() : Panel CheckBox Radio2,value= 0,mode=1 CheckBox Radio3,pos={290.00,259.00},size={52.00,15.00},title="Radio3" CheckBox Radio3,value= 1,mode=1 - CheckBox Radio3 proc=TCONF_CheckProc + CheckBox Radio3, proc=TCONF_CheckProc NewPanel/W=(11,203,273,387)/HOST=# ModifyPanel cbRGB=(32768,40777,65535) CheckBox checkbox1,pos={10.00,10.00},size={70.00,15.00},title="TrueColor" @@ -136,14 +136,14 @@ Function TCONF_CheckProc(cba) : CheckBoxControl End static Function TCONF_ChangeGUIValues_IGNORE() - CheckBox CheckBox value=0 - PopupMenu popup popvalue="Maybe" - ValDisplay valdisp value= _NUM:0 - TabControl tab value=1 - CheckBox Radio3 value=0 - SetVariable setvar value=setvarTest - CheckBox checkbox3 win=#SubPanel, value=0 - PopupMenu popup win=#SubPanel, popvalue="Atari ST" + CheckBox CheckBox, value=0 + PopupMenu popup, popvalue="Maybe" + ValDisplay valdisp, value= _NUM:0 + TabControl tab, value=1 + CheckBox Radio3, value=0 + SetVariable setvar, value=setvarTest + CheckBox checkbox3, win=#SubPanel, value=0 + PopupMenu popup, win=#SubPanel, popvalue="Atari ST" End /// @brief Saves a json to a text file in home path @@ -218,11 +218,11 @@ static Function TCONF_AllStates() wName = GetMainWindow(GetCurrentWindow()) saveMask = EXPCONFIG_SAVE_VALUE | EXPCONFIG_SAVE_POSITION | EXPCONFIG_SAVE_USERDATA | EXPCONFIG_SAVE_DISABLED | EXPCONFIG_SAVE_CTRLTYPE - ModifyControl valdisp win=$wName, userdata(testdata)="testdata" - ModifyControl valdisp win=$wName, userdata(testdatabase64)="\u0000" + ModifyControl valdisp, win=$wName, userdata(testdata)="testdata" + ModifyControl valdisp, win=$wName, userdata(testdatabase64)="\u0000" jsonID = CONF_AllWindowsToJSON(wName, saveMask) - ModifyControl valdisp win=$wName, align=1, size={100, 100}, pos={10, 10} + ModifyControl valdisp, win=$wName, align=1, size={100, 100}, pos={10, 10} DisableControl(wName, "valdisp") CONF_JSONToWindow(wName, saveMask, jsonID) jsonID2 = CONF_AllWindowsToJSON(wName, saveMask) @@ -256,7 +256,7 @@ static Function TCONF_DupNiceName() string wName wName = GetMainWindow(GetCurrentWindow()) - CheckBox CheckBox win=$wName, userdata(Config_NiceName)= "BUTTON" + CheckBox CheckBox, win=$wName, userdata(Config_NiceName)= "BUTTON" try CONF_SaveWindow(PrependExperimentFolder_IGNORE(REF_TMP1_CONFIG_FILE)) FAIL() @@ -271,7 +271,7 @@ static Function TCONF_ReservedNiceName() string wName wName = GetMainWindow(GetCurrentWindow()) - CheckBox CheckBox win=$wName, userdata(Config_NiceName)= "BUTTON ControlGroup" + CheckBox CheckBox, win=$wName, userdata(Config_NiceName)= "BUTTON ControlGroup" try CONF_SaveWindow(PrependExperimentFolder_IGNORE(REF_TMP1_CONFIG_FILE)) FAIL() @@ -286,7 +286,7 @@ static Function TCONF_DupCtrlArrayName() string wName wName = GetMainWindow(GetCurrentWindow()) - CheckBox CheckBox win=$wName, userdata(ControlArray)= "BUTTON" + CheckBox CheckBox, win=$wName, userdata(ControlArray)= "BUTTON" try CONF_SaveWindow(PrependExperimentFolder_IGNORE(REF_TMP1_CONFIG_FILE)) FAIL() diff --git a/Packages/tests/Basic/UTF_PGCSetAndActivateControl.ipf b/Packages/tests/Basic/UTF_PGCSetAndActivateControl.ipf index 2116d63063..2812965038 100644 --- a/Packages/tests/Basic/UTF_PGCSetAndActivateControl.ipf +++ b/Packages/tests/Basic/UTF_PGCSetAndActivateControl.ipf @@ -29,7 +29,7 @@ Function CreatePGCTestPanel_IGNORE() NewPanel /K=1 /W=(265,784,820,987) String/G root:panel = S_name - PopupMenu popup_ctrl proc=PGCT_PopMenuProc,value=#("\"" + PGCT_POPUPMENU_ENTRIES + "\""), mode = 1 + PopupMenu popup_ctrl, proc=PGCT_PopMenuProc,value=#("\"" + PGCT_POPUPMENU_ENTRIES + "\""), mode = 1 PopupMenu popup_ctrl_colortable,pos={68.00,114.00},size={200.00,19.00},proc=PGCT_PopMenuProc PopupMenu popup_ctrl_colortable,mode=2,value= #"\"*COLORTABLEPOP*\"" @@ -747,7 +747,7 @@ static Function PGCT_SetVariableChecksNoEdit() refValue = V_Value CHECK_EMPTY_STR(S_Value) - SetVariable setvar_num_ctrl win=$panel, noEdit=1 + SetVariable setvar_num_ctrl, win=$panel, noEdit=1 // default try diff --git a/Packages/tests/Basic/UTF_SweepFormula.ipf b/Packages/tests/Basic/UTF_SweepFormula.ipf index f1bb2f0759..fba4ea3291 100644 --- a/Packages/tests/Basic/UTF_SweepFormula.ipf +++ b/Packages/tests/Basic/UTF_SweepFormula.ipf @@ -1143,14 +1143,14 @@ static Function TestOperationSetscale() str = "setscale([0,1,2,3,4,5,6,7,8,9], x, 0, 2, unit)" WAVE wv = SF_ExecuteFormula(str, win, singleResult=1, useVariables=0) Make/N=(10) waveX = p - SetScale x 0, 2, "unit", waveX + SetScale x, 0, 2, "unit", waveX REQUIRE_EQUAL_WAVES(waveX, wv, mode = WAVE_DATA) str = "setscale(setscale([range(10),range(10)+1,range(10)+2,range(10)+3,range(10)+4,range(10)+5,range(10)+6,range(10)+7,range(10)+8,range(10)+9], x, 0, 2, unitX), y, 0, 4, unitX)" WAVE wv = SF_ExecuteFormula(str, win, singleResult=1, useVariables=0) Make/N=(10, 10) waveXY = p + q - SetScale/P x 0, 2, "unitX", waveXY - SetScale/P y 0, 4, "unitX", waveXY + SetScale/P x, 0, 2, "unitX", waveXY + SetScale/P y, 0, 4, "unitX", waveXY REQUIRE_EQUAL_WAVES(waveXY, wv, mode = WAVE_DATA | WAVE_SCALING | DATA_UNITS) Make/O/D/N=(2, 2, 2, 2) input = p + 2 * q + 4 * r + 8 * s diff --git a/Packages/tests/Basic/UTF_Utils.ipf b/Packages/tests/Basic/UTF_Utils.ipf index e1b10b5ef7..c2e50ced30 100644 --- a/Packages/tests/Basic/UTF_Utils.ipf +++ b/Packages/tests/Basic/UTF_Utils.ipf @@ -6056,9 +6056,9 @@ Function GSFWNR_Works() // wave ref, matching Make/WAVE/FREE/N=2 wref wref[] = NewFreeWave(IGOR_TYPE_32BIT_FLOAT, 0) - Note/K wref "abcd:123" - Note/K wref[0] "abcd:123" - Note/K wref[1] "abcd:123" + Note/K wref, "abcd:123" + Note/K wref[0], "abcd:123" + Note/K wref[1], "abcd:123" ref = "123" str = GetStringFromWaveNote(wref, "abcd", recursive = 1) @@ -6067,11 +6067,11 @@ Function GSFWNR_Works() // wave ref 2D, matching Make/WAVE/FREE/N=(2, 2) wref wref[] = NewFreeWave(IGOR_TYPE_32BIT_FLOAT, 0) - Note/K wref "abcd:123" - Note/K wref[0] "abcd:123" - Note/K wref[1] "abcd:123" - Note/K wref[2] "abcd:123" - Note/K wref[3] "abcd:123" + Note/K wref, "abcd:123" + Note/K wref[0], "abcd:123" + Note/K wref[1], "abcd:123" + Note/K wref[2], "abcd:123" + Note/K wref[3], "abcd:123" ref = "123" str = GetStringFromWaveNote(wref, "abcd", recursive = 1) @@ -6080,9 +6080,9 @@ Function GSFWNR_Works() // wave ref, not-matching (wref has a different one) Make/WAVE/FREE/N=2 wref wref[] = NewFreeWave(IGOR_TYPE_32BIT_FLOAT, 0) - Note/K wref "abcde:123" - Note/K wref[0] "abcd:123" - Note/K wref[1] "abcd:123" + Note/K wref, "abcde:123" + Note/K wref[0], "abcd:123" + Note/K wref[1], "abcd:123" str = GetStringFromWaveNote(wref, "abcd", recursive = 1) CHECK_EMPTY_STR(str) @@ -6090,9 +6090,9 @@ Function GSFWNR_Works() // wave ref, not-matching (first contained has a different one) Make/WAVE/FREE/N=2 wref wref[] = NewFreeWave(IGOR_TYPE_32BIT_FLOAT, 0) - Note/K wref "abcd:123" - Note/K wref[0] "abcde:123" - Note/K wref[1] "abcd:123" + Note/K wref, "abcd:123" + Note/K wref[0], "abcde:123" + Note/K wref[1], "abcd:123" str = GetStringFromWaveNote(wref, "abcd", recursive = 1) CHECK_EMPTY_STR(str) diff --git a/Packages/tests/HardwareBasic/UTF_Databrowser.ipf b/Packages/tests/HardwareBasic/UTF_Databrowser.ipf index b63bf064b0..9055bb021f 100644 --- a/Packages/tests/HardwareBasic/UTF_Databrowser.ipf +++ b/Packages/tests/HardwareBasic/UTF_Databrowser.ipf @@ -64,7 +64,7 @@ Function RestoreButtonWorks([string str]) CHECK(!IsControlHidden(win, "button_BSP_open")) // subwindow is hidden - GetWindow $subWindow hide + GetWindow $subWindow, hide CHECK_EQUAL_VAR(V_Value, 0x1) // restoring @@ -72,7 +72,7 @@ Function RestoreButtonWorks([string str]) CHECK(WindowExists(subWindow)) // subwindow is not hidden - GetWindow $subWindow hide + GetWindow $subWindow, hide CHECK_EQUAL_VAR(V_Value, 0x0) // but the button is hidden again diff --git a/Packages/tests/HardwareBasic/UTF_SweepFormulaHardware.ipf b/Packages/tests/HardwareBasic/UTF_SweepFormulaHardware.ipf index ae46e8400c..84a8e8a8bf 100644 --- a/Packages/tests/HardwareBasic/UTF_SweepFormulaHardware.ipf +++ b/Packages/tests/HardwareBasic/UTF_SweepFormulaHardware.ipf @@ -615,8 +615,8 @@ static Function TestSweepFormulaCodeResults_REENTRY([string str]) // set cursors and execute formula again graph = DB_FindDataBrowser(str) trace = StringFromList(0, TraceNameList(graph, ";", 1)) - Cursor/W=$graph A $trace 0 - Cursor/W=$graph J $trace 50 + Cursor/W=$graph A, $trace, 0 + Cursor/W=$graph J, $trace, 50 bsPanel = BSP_GetPanel(graph) PGC_SetAndActivateControl(bsPanel, "button_sweepFormula_display") diff --git a/Packages/tests/UTF_HelperFunctions.ipf b/Packages/tests/UTF_HelperFunctions.ipf index bbcd324317..d5bb3fb7dd 100644 --- a/Packages/tests/UTF_HelperFunctions.ipf +++ b/Packages/tests/UTF_HelperFunctions.ipf @@ -598,7 +598,7 @@ static Function RetrieveAllWindowsInCI() return NaN endif - DoIgorMenu "Control" "Retrieve All Windows" + DoIgorMenu "Control", "Retrieve All Windows" End Function TestBeginCommon()