Merge pull request #29 from ukos-git/add_all_modules

Add all modules

Author: t-b

procedures/CodeBrowser.ipf

@@ -892,11 +892,10 @@ Function KillStorage()
 	killGlobalvar("parsingTime")
 End
 
-// Returns a list with the following optional suffixes removed:
-// -Module " [.*]"
-// -Ending ".ipf"
-// -Both ".ipf [.*]"
-Function/S nicifyProcedureList(list)
+/// @brief Return a list of procedures with the module suffix " [.*]" removed
+//
+/// @see ProcedureListRemoveEnding
+Function/S ProcedureListRemoveModule(list)
 	string list
 
 	variable i, idx
@@ -905,6 +904,23 @@ Function/S nicifyProcedureList(list)
 	for(i = 0; i < ItemsInList(list); i += 1)
 		item = StringFromList(i, list)
 		item = RemoveEverythingAfter(item, " [")
+		niceList = AddListItem(item, niceList, ";", inf)
+	endfor
+
+	return niceList
+End
+
+/// @brief Return a list of procedures with the ending ".ipf" removed
+//
+/// @see ProcedureListRemoveModule
+Function/S ProcedureListRemoveEnding(list)
+	string list
+
+	variable i, idx
+	string item, niceList=""
+
+	for(i = 0; i < ItemsInList(list); i += 1)
+		item = StringFromList(i, list)
 		item = RemoveEverythingAfter(item, ".ipf")
 		niceList = AddListItem(item, niceList, ";", inf)
 	endfor
@@ -977,10 +993,10 @@ Function updateListBoxHook()
 	Wave/I lines = getLineWave()
 
 	// get procedure information
-	procedure.name     = getCurrentItem(procedureWithoutModule = 1)
-	procedure.module   = getCurrentItem(module = 1)
-	procedure.fullName = getCurrentItem(procedure = 1) // remove this if maclist is removed
-	procedure.id       = procedure.module + "#" + procedure.name
+	procedure.fullName = getCurrentItem(procedure = 1)
+	procedure.name     = ProcedureWithoutModule(procedure.fullName)
+	procedure.module   = ModuleWithoutProcedure(procedure.fullName)
+	procedure.id       = procedure.module + "#" + RemoveEverythingAfter(procedure.name, ".ipf")
 	procedure.row      = getSaveRow(procedure.id)
 
 	// load procedure
@@ -1189,15 +1205,32 @@ static Function/Wave getSaveVariables()
 	return wv
 End
 
-// Returns a list of all procedure files of the given independent module/ProcGlobal
-Function/S getProcList(module)
-	String module
+// Get a list of all procedure files of the given independent module/ProcGlobal
+//
+// @param module    Independent Module or ProcGlobal Namespace
+// @param addModule [optional, default 0] add the module to the list
+//                  Module is added as Module#Procedure in a way similar to Module#Function()
+Function/S getProcList(module, [addModule])
+	string module
+	variable addModule
+
+	string procedures
+
+	addModule = ParamIsDefault(addModule) ? 0 : !!addModule
 
-	if( isProcGlobal(module) )
-		return getGlobalProcWindows()
+	if(isProcGlobal(module))
+		module = "ProcGlobal"
+		procedures = getGlobalProcWindows()
 	else
-  		return getIMProcWindows(module)
+		procedures = getIMProcWindows(module)
+	endif
+
+	if(addModule)
+		procedures = ProcedureListRemoveEnding(procedures)
+		module = module + "#"
+		procedures = AddToItemsInList(procedures, prefix=module)
 	endif
+	return procedures
 End
 
 static Function getParsingTime()

procedures/CodeBrowser_gui.ipf

@@ -28,6 +28,8 @@ static StrConstant userDataNiceList = "niceList"
 
 static StrConstant oneTimeInitUserData = "oneTimeInit"
 
+static StrConstant selectAll = "<ALL>"
+
 Function/S GetPanel()
 	return panel
 End
@@ -135,6 +137,7 @@ Function/S generateModuleList()
 	debugPrint("called")
 
 	string niceList = getModuleList()
+	niceList = AddListItem(selectAll, niceList)
 
 	PopupMenu $moduleCtrl, win=$panel, userData($userDataNiceList)=niceList
 
@@ -144,11 +147,30 @@ End
 // Callback for the procedure popup, returns a nicified list
 // Stores both the nicified list and the raw list as user data
 Function/S generateProcedureList()
-	debugPrint("called")
-
-	string module = getCurrentItem(module=1)
-	string procList = getProcList(module)
-	string niceList = nicifyProcedureList(procList)
+	string module, modules, procList, niceList
+	variable numModules, i
+
+	module = getCurrentItem(module = 1)
+	if(!cmpstr(module, selectAll))
+		procList = ""
+		niceList = ""
+		modules = getModuleList()
+		numModules = ItemsInList(modules)
+		for(i = 0; i < numModules; i += 1)
+			module = StringFromList(i, modules)
+			procList += getProcList(module)
+			if(isProcGlobal(module))
+				niceList += getProcList(module)
+			else
+				niceList += getProcList(module, addModule = 1)
+			endif
+		endfor
+	else
+		procList = getProcList(module)
+		niceList = procList
+	endif
+	niceList = ProcedureListRemoveModule(niceList)
+	niceList = ProcedureListRemoveEnding(niceList)
 
 	PopupMenu $procCtrl, win=$panel, userData($userDataRawList)=procList, userData($userDataNiceList)=niceList
 
@@ -208,25 +230,26 @@ Function isInitialized()
 	return getGlobalVar("initialized") == 1
 End
 
-// Returns the currently selected item from the panel defined by the optional arguments.
-// Exactly one optional argument must be given.
-//
-// module:              Module from ProcGlobal/Independent Module list
-// procedure:           "myProcedure.ipf [moduleName]"
-// procedureWithModule: "myProcedure.ipf"
-// index:               Zero-based index into main listbox
-Function/S getCurrentItem([module, procedure,procedureWithoutModule, index])
-	variable module, procedureWithoutModule, procedure, index
+/// Returns the currently selected item from the panel defined by the optional arguments.
+///
+/// Exactly one optional argument must be given.
+///
+/// @param module     [optional] Module from ProcGlobal/Independent Module list
+/// @param procedure  [optional] "myProcedure.ipf [moduleName]"
+/// @param index      [optional] Zero-based index into main listbox
+///
+/// @returns the currently selected item
+Function/S getCurrentItem([module, procedure, index])
+	variable module, procedure, index
 
-	string procName
+	string procName, rawList
 
-	module                 =  ParamIsDefault(module)                 ? 0 : 1
-	procedureWithoutModule =  ParamIsDefault(procedureWithoutModule) ? 0 : 1
-	procedure              =  ParamIsDefault(procedure)              ? 0 : 1
-	index                  =  ParamIsDefault(index)                  ? 0 : 1
+	module    =  ParamIsDefault(module)    ? 0 : 1
+	procedure =  ParamIsDefault(procedure) ? 0 : 1
+	index     =  ParamIsDefault(index)     ? 0 : 1
 
 	// only one optional argument allowed
-	if(module + procedure + procedureWithoutModule + index != 1)
+	if(module + procedure + index != 1)
 		return "_error_"
 	endif
 
@@ -242,28 +265,51 @@ Function/S getCurrentItem([module, procedure,procedureWithoutModule, index])
 		if(V_Value >= 0)
 			return num2str(V_Value)
 		endif
-	elseif(procedure || procedureWithoutModule)
-
+	elseif(procedure)
 		ControlInfo/W=$panel $procCtrl
 		V_Value -= 1 // 1-based index
-		string rawList = GetUserData(panel,procCtrl,userDataRawList)
 
+		rawList = GetUserData(panel, procCtrl, userDataRawList)
 		if(V_Value < 0 || V_Value >= ItemsInList(rawList))
 			return "_error_"
 		endif
 
-		procName = StringFromList(V_Value,rawList)
-
-		if(procedureWithoutModule)
-			return RemoveEverythingAfter(procName," [")
-		endif
-
+		procName = StringFromList(V_Value, rawList)
 		return procName
 	endif
 
 	return "_error_"
 End
 
+/// Get the basic procedure name from a full procedure name
+///
+/// @param fullName  "myProcedure.ipf [moduleName]"
+///
+/// @returns myProcedure.ipf without module definition
+Function/S ProcedureWithoutModule(fullName)
+	string fullName
+
+	return RemoveEverythingAfter(fullName, " [")
+End
+
+/// Get the module name from a full procedure name
+///
+/// @param fullName  "myProcedure.ipf [moduleName]"
+///
+/// @returns moduleName without procedure specification
+Function/S ModuleWithoutProcedure(fullName)
+	string fullName
+
+	string module, procedure
+
+	SplitString/E="(.*)\ \[(\w+)\]" fullName, procedure, module
+	if(V_flag != 2)
+		return ""
+	endif
+
+	return module
+End
+
 // Returns the currently selected item from the panel defined by the optional arguments.
 // Argument is returned as number in current list
 // Exactly one optional argument must be given.
@@ -304,7 +350,7 @@ Function getCurrentItemAsNumeric([module, procedure, index, indexTop])
 	return -1 // error
 End
 
-// Updates the the given popup menu
+// Updates the given popup menu
 // Tries to preserve the currently selected item
 Function updatePopup(ctrlName)
 	string ctrlName
@@ -320,7 +366,7 @@ Function updatePopup(ctrlName)
 
 	ControlUpdate/W=$panel $ctrlName
 
-	list = GetUserData(panel,procCtrl,userDataNiceList)
+	list = GetUserData(panel, procCtrl, userDataNiceList)
 
 	if(ItemsInList(list) == 1)
 		PopupMenu $ctrlName win=$panel, disable=2
@@ -329,10 +375,10 @@ Function updatePopup(ctrlName)
 	endif
 
 	// try to restore the previously selected item if it differs from the current one
-	variable newIndex = WhichListItem(itemText,list) + 1
+	variable newIndex = WhichListItem(itemText, list) + 1
 
 	if(newIndex != index) // only update if required, as the update triggers the list generating function
-		if( newIndex > 0)
+		if(newIndex > 0)
 			PopupMenu $ctrlName win=$panel, mode=newIndex
 		else
 			PopupMenu $ctrlName win=$panel, mode=1