Changeset 7711

Timestamp:

05/31/08 23:02:07 (5 years ago)

Author:

stedwar2

Message:

Added an OSSIE menu command to generate skeleton code from
the component editor.

Location:

ossiedev/branches/jsnyder/ComponentProject

Files:

• PythonSrc/MainFrameGlue.py (modified) (3 diffs)
• plugin.xml (modified) (1 diff)
• src/edu/vt/ossie/actionSets/GenerateComponent.java (added)
• src/edu/vt/ossie/editors/ComponentEditor.java (modified) (1 diff)
• src/edu/vt/ossie/jyinterface/interfaces/MainFrame.java (modified) (1 diff)

ossiedev/branches/jsnyder/ComponentProject/PythonSrc/MainFrameGlue.py

@@ -39 +39 @@
 import ComponentClass as CC
 import cfg
+import shutil
+
 
 class MainFrameTreeNode:
@@ -294 +296 @@
 
     def generateProject(self, path):
-        wavedevPath = self.installPath
+        wavedevPath = self.pluginHome
         if wavedevPath == None or len(wavedevPath) == 0:
-            errorMsg(self, "installPath not set")
-            wavedevPath = '/sdr/'
+            errorMsg(self, "pluginHome not set")
+            wavedevPath = self.installPath + 'tools/'
         if wavedevPath[len(wavedevPath)-1] != '/':
             wavedevPath = wavedevPath + '/'
-        wavedevPath = wavedevPath + 'tools/WaveDev/wavedev/'
+        wavedevPath = wavedevPath + 'WaveDev/wavedev/'
         gen = genStruct.genAll(path, wavedevPath, copy.deepcopy(self.active_waveform))
         gen.genDirs()
@@ -448 +450 @@
         cPickle.dump(('component', component), f)
         f.close()
+
+
+    ############################################################################
+    ## Generate the Component XML and C++
+    ############################################################################
+    def generateComponentFiles(self, component, savepath):
+        if not hasattr(component, 'template'):
+            component.template = 'basic_ports'
+        #select which template to use
+
+        if component.template == "basic_ports":
+            import WaveDev.wavedev.generate.templates.basic_ports.genStructure as genStruct
+        elif component.template == "custom_ports":
+            import WaveDev.wavedev.generate.templates.custom_ports.genStructure as genStruct
+        elif component.template == "py_comp":
+            import WaveDev.wavedev.generate.templates.py_comp.genStructure as genStruct
+        else:
+            return component.template + ' is not supported in OnMenuComponentGenerateMenu within the componentFrame'
+
+        print 'component template = ', component.template
+
+        if savepath[len(savepath)-1] != '/':
+            savepath = savepath + '/'
+
+        compPath = savepath + component.name
+
+        if os.path.exists(compPath) == False:
+            os.mkdir(compPath)
+
+        if component.template != "py_comp":
+            print 'copying reconf to ', compPath
+            shutil.copy(self.pluginHome + 'WaveDev/wavedev/generate/reconf', compPath)
+        print 'copying LICENSE to ', compPath
+        shutil.copy(self.pluginHome + 'WaveDev/wavedev/generate/LICENSE', compPath)
+
+        if component.timing:
+            found_timing = False
+            for p in component.ports:
+                if p.interface.name == 'timingStatus':
+                    found_timing = True
+            if not found_timing and hasattr(self, 'timing_port'):
+                component.ports.append(self.timing_port)
+
+        print 'genStruct.genAll'
+        gen = genStruct.genAll(savepath, None)
+        print 'writing Makefile'
+        gen.writeCompMakefile(component, compPath)
+        print 'writing ConfAC'
+        gen.writeConfAC(compPath, component.name, component.ace, False, self.installPath)
+        print 'writing component skeleton'
+        gen.genCompFiles(component)
+
+        print 'writing component XML files'
+        component_gen.gen_scd(component, savepath)
+        component_gen.gen_spd(component, savepath)
+        component_gen.gen_prf(component, savepath)
+        return None

ossiedev/branches/jsnyder/ComponentProject/plugin.xml

@@ -91 +91 @@
    </extension>
    <extension
+         point="org.eclipse.ui.editorActions">
+      <editorContribution
+          id="edu.vt.ossie.editors.ComponentEditor.actions"
+          targetID="edu.vt.ossie.editors.ComponentEditor">
+         <action
+            id="edu.vt.ossie.actionSets.GenerateComponent"
+            label="Generate Component"
+            icon="icons/component.gif"
+            tooltip="Generate component's implementation skeleton"
+            menubarPath="edu.vt.ossie.menu/main"
+            class="edu.vt.ossie.actionSets.GenerateComponent">
+         </action>
+      </editorContribution>
+   </extension>
+   <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
             id="ComponentProject.actionSet"
-            label="Sample Action Set"
+            label="OSSIE Waveform Developer Actions"
             visible="true">
          <menu

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/editors/ComponentEditor.java

@@ -880 +880 @@
 
     // ----------------------------------------------------------
+    // Public so that actions can use it
+    public Component getComponent()
+    {
+        return component;
+    }
+
+
+    // ----------------------------------------------------------
     private void notifyListeners(SelectionChangedEvent event)
     {

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/jyinterface/interfaces/MainFrame.java

@@ -30 +30 @@
     PyObject loadComponent(PyString fileName);
     void saveComponent(PyObject component, PyString fileName);
+    PyObject generateComponentFiles(PyObject component, PyString savepath);
 }