rework and fix panel initialization

Author: t-b

procedures/CodeBrowser_gui.ipf

@@ -17,6 +17,8 @@ static StrConstant moduleCtrl	= "popupNamespace"
 static StrConstant procCtrl  	= "popupProcedure"
 static StrConstant listCtrl   = "list1"
 
+static StrConstant oneTimeInitUserData = "oneTimeInit"
+
 Function/S GetPanel()
 	return panel
 End
@@ -58,7 +60,7 @@ Function createPanel()
 	SetWindow $panel, hook(mainHook)=$(module + "#panelHook")
 	DoUpdate/W=$panel
 
-	setHooksAndUpdate()
+	initializePanel()
 	resizePanel()
 End
 
@@ -96,7 +98,6 @@ Function updatePanel()
 
 	DoWindow $panel
 	if(V_flag == 0)
-		debugPrint("Main panel does not exist")
 		return 0
 	endif
 
@@ -110,12 +111,41 @@ Function updatePanel()
 
 	string module = S_value
 	updatePopup(procCtrl,getProcList(module))
-
 	updateListBoxHook()
 
 	return 0
 End
 
+Function markAsUnInitialized()
+
+	DoWindow $panel
+	if(V_flag == 0)
+		return 0
+	endif
+
+	SetWindow $panel, userdata($oneTimeInitUserData)=""
+End
+
+Function markAsInitialized()
+
+	DoWindow $panel
+	if(V_flag == 0)
+		return 0
+	endif
+
+	SetWindow $panel, userdata($oneTimeInitUserData)="1"
+End
+
+Function isInitialized()
+
+	DoWindow $panel
+	if(V_flag == 0)
+		return 0
+	endif
+
+	return cmpstr(GetUserData(panel,"",oneTimeInitUserData),"1") == 0
+End
+
 // Returns the currently selected item from the panel defined by the optional arguments.
 // Exactly one optional argument must be given.
 //
@@ -283,10 +313,6 @@ Function listBoxProc(lba) : ListBoxControl
 				ListBox $listCtrl, win=$panel, selCol=1
 			endif
 			break
-		case 6: // begin edit
-//			break
-		case 7: // finish edit
-			break
 		case 12: // keystroke
 			if(!WaveExists(listWave))
 				return 0

procedures/CodeBrowser_hooks.ipf

@@ -6,42 +6,44 @@
 // This file was created by () byte physics Thomas Braun, support@byte-physics.de
 // (c) 2013
 
-static Function IgorStartOrNewHook(igorApplicationNameStr)
+static Function IgorBeforeQuitHook(igorApplicationNameStr)
 	string igorApplicationNameStr
 
-	setHooksAndUpdate()
+	preparePanelClose()
 	return 0
 End
 
-static Function IgorQuitHook(igorApplicationNameStr)
+static Function IgorBeforeNewHook(igorApplicationNameStr)
 	string igorApplicationNameStr
 
 	preparePanelClose()
 	return 0
 End
 
-static Function IgorBeforeNewHook(igorApplicationNameStr)
-	string igorApplicationNameStr
+static Function BeforeExperimentSaveHook(rN,fileName,path,type,creator,kind)
+	Variable rN,kind
+	String fileName,path,type,creator
 
-	preparePanelClose()
+	markAsUnInitialized()
 	return 0
 End
 
-Function setHooksAndUpdate()
-	Execute/Q "SetIgorOption IndependentModuleDev=1"
+Function initializePanel()
 
-	// prevent multiple hooks of the same function
-	SetIgorHook/K AfterCompiledHook=updatePanel
+	debugprint("called")
+
+	Execute/Q "SetIgorOption IndependentModuleDev=1"
 
-	SetIgorHook   AfterCompiledHook=updatePanel
-	debugprint("SetIgorHook AfterCompiledHook: " + S_info)
+	SetIgorHook AfterCompiledHook=updatePanel
+	debugprint("AfterCompiledHook: " + S_info)
 	updatePanel()
 End
 
 // Prepare for panel closing, must be called before the panel is killed or the experiment closed
 Function preparePanelClose()
+
 	SetIgorHook/K AfterCompiledHook=updatePanel
-	debugprint("SetIgorHook AfterCompiledHook: " + S_info)
+	debugprint("AfterCompiledHook: " + S_info)
 
 	DoWindow $GetPanel()
 	if(V_flag == 0)
@@ -60,6 +62,14 @@ Function panelHook(s)
 	Variable hookResult = 0
 
 	switch(s.eventCode)
+		case 0:				// activate
+			if(isInitialized())
+				break
+			endif
+			initializePanel()
+			markAsUnInitialized()
+			hookResult = 1
+			break
 		case 2:				// kill
 			preparePanelClose()
 			hookResult = 1