Changeset 4496

Timestamp:

07/20/07 14:40:47 (6 years ago)

Author:

DrewCormier

Message:

no longer need to compare members to the naming contexts since the application instance name can be retreived through the application sequence

Files:

• experimental/ALF/trunk/alf/ALF.py (modified) (4 diffs)

experimental/ALF/trunk/alf/ALF.py

@@ -379 +379 @@
         nsRoot = self.nsBox.AddRoot("ns_root")
         
-        if self.domMgr == None or self.rootContext == None:
-            return
-
-        dom_obj = self.rootContext.resolve([CosNaming.NameComponent("DomainName1","")])
-        dom_context = dom_obj._narrow(CosNaming.NamingContext) 
-        if dom_context is None:
-            return
-
         appSeq =  self.domMgr._get_applications()
 
- 
-        # for framework <= r2983
-        '''
-        members = dom_context.list(1000) 
-        for m in members[0]:
-            wav_name = str(m.binding_name[0].id)
-            wav_obj = dom_context.resolve([CosNaming.NameComponent(wav_name,"")])
-            wav_context = wav_obj._narrow(CosNaming.NamingContext)
-            if wav_context is None:
-                continue
-
-            contextApp = None
-            foundApp = False
-
-            # cycle through all the installed applications
-            for app in appSeq:
-                # get all of the available component instances in the application
-                compNameCon = app._get_componentNamingContexts()
-
-                # attempt to match the installed waveforms to one of the
-                # available waveform names 
-                for compElementType in  compNameCon:
-                    if wav_name in compElementType.elementId:
-                        waveformApp = app
-                        foundApp = True
-                        #print compElementType.componentId + " " + compElementType.elementId
-                        break
-
-            if not foundApp:
-               print "Could not find associated application for: " + wav_name
-               continue
-
-            t1 = self.nsBox.AppendItem(nsRoot,wav_name)
-            self.nsBox.SetPyData(t1,waveformApp)
-            
-            # Set item bold if it is the active waveform
-            if self.active_wave is not None:
-                if self.active_wave.naming_context == wav_name:
-                    self.nsBox.SetItemBold(t1, True)
-        '''  
-
-        # for framework > r2983
-        wave_count = 0
         for app in appSeq:
             wav_name = app._get_name()
-            # TODO: set up counter for the waveform name or get the counter 
-            # from the framework
             t1 = self.nsBox.AppendItem(nsRoot,wav_name)
             self.nsBox.SetPyData(t1,app) 
@@ -551 +498 @@
         self.domMgr.installApplication(name_SAD)
 
+        # applicationFactories will have been set up from the 
+        # installApplication() call
         _applicationFactories = self.domMgr._get_applicationFactories()
 
@@ -556 +505 @@
         # cycle through the applicationFactories
         # find out which one matches my application name
+        # name of application factory
         for app_num in range(len(_applicationFactories)):
             if _applicationFactories[app_num]._get_name()==app_name:
@@ -567 +517 @@
             sys.exit(-1)
 
-        # create an application with the application factory that matches my 
+        # create an application with the application factory that matches my    
         # application name
         try:
             app = _applicationFactories[app_factory_num].create(
-                                       'tmp_wave_name',_appFacProps,_devSeq)
+                                             app_name,_appFacProps,_devSeq)
         except:
             print "Unable to create application - make sure that all appropriate nodes are installed"