Changeset 9977

Timestamp:

04/05/10 11:42:39 (3 years ago)

Author:

deepan

Message:

Added Python component generation support; Updated OEF to hide unsupported property types;

Location:

ossiedev/trunk/tools/OEF/src/edu/vt/ossie

Files:

• actionSets/GenerateComponent.java (modified) (5 diffs)
• dialogs/PropertiesDialog.java (modified) (1 diff)
• editors/ComponentEditor.java (modified) (3 diffs)
• editors/OWDEditor.java (modified) (2 diffs)
• wavedev/Component.java (modified) (2 diffs)
• wavedev/SimpleProperty.java (modified) (2 diffs)

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/actionSets/GenerateComponent.java

@@ -26 +26 @@
 import edu.vt.ossie.editors.ComponentEditor;
 import edu.vt.ossie.wavedev.Component;
+import edu.vt.ossie.wavedev.Property;
+import edu.vt.ossie.wavedev.SimpleProperty;;
 
 //-------------------------------------------------------------------------
@@ -50 +52 @@
             "Generate invoked on editor " + componentEditor.getComponent());
         IPath targetDir = getProject().getLocation();
-
+        //log.debug("targetDir is " + targetDir.toOSString());
+        
         // remember old files
         File projectDir = targetDir.toFile();
@@ -68 +71 @@
 
         Component component = componentEditor.getComponent();
+        log.debug("Component template is " + component.getTemplate());
+        if (component.getTemplate().equals("py_comp")) {
+                /*
+                 * Python components supports only the following data types
+                 * short, ushort, float and double
+                 * Watch out for readWriteProps() function in wavedev/generate/templates/py_comp/genStructure.py
+                 * for any changes to additional datatype supported
+                 */
+                Property[] cProps = component.getPropertiesAsArray();
+                for (Property prp : cProps){
+                        String pType = ((SimpleProperty)prp).getType();
+                        if (pType.equals("short") ||
+                                        pType.equals("int") ||
+                                        pType.equals("float") ||
+                                        pType.equals("double")){
+                                continue;
+                        }
+                        else{
+                                MessageDialog.openError(componentEditor.getSite().getShell(),
+                                                "Invalid data types for properties",
+                                                "Property \"" + prp.getName() + "\" is set to datatype \"" + pType + "\"."
+                                                + "Python components supports only short/int/float/double" );
+                                                
+                                log.debug("data types unsupported for prop " + prp.getName() + " of python component");
+                                return;
+                        }
+                }
+                
+        }
+        
         boolean previouslyGenerated = false;
+        log.debug("targetDir is " + targetDir.toOSString());
         if (targetDir.lastSegment().equals(component.getName()))
         {
             targetDir = targetDir.removeLastSegments(1);
+            log.debug("projectDir is " + projectDir.toString());
             previouslyGenerated =
                 (new File(projectDir, component.getName() + ".cpp")).exists()
@@ -86 +121 @@
                 componentEditor.getSite().getShell(),
                 "Generated Files Already Exist",
-                "Skeleton implementation files for this component have "
+                "Skeleton implementation files for " + component.getName() + "component have "
                 + "already been generated.  If you regenerate the skeleton "
                 + "files again, any changes in the existing files will be "
@@ -258 +293 @@
     private IProject getProject()
     {
-        if (project == null
-            && componentEditor != null
+        if (project == null)
+                        log.debug("getProject(): project is null");
+        if (componentEditor != null
             && componentEditor.isConnectedToFile())
         {
+                //log.debug("getProject(): " + componentEditor.getFileInput().getFile().getName());
             project = componentEditor.getFileInput().getFile().getProject();
         }

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/dialogs/PropertiesDialog.java

@@ -326 +326 @@
     
     //string arrays to hold combo box choices
-    private String[] typeChoices = {"boolean", "char", "double",
-        "float", "short", "long", "objref", "octet", "string", "ulong",
-        "ushort"};
+    /* Removing char, objref, octet and string types */
+    /* re-include when the component is able to compile and build 
+     * without errors for these datatypes
+     */
+    private String[] typeChoices = {"boolean", "double",
+        "float", "short", "long", "ulong", "ushort"};
+     //"objref", "octet", "string", "char"
     private String[] modeChoices = {"readonly", "readwrite",
         "writeonly"};

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/editors/ComponentEditor.java

@@ -680 +680 @@
                         result = ((SimpleSequenceProperty)element).getDefaultValues().toString();
                     }
+                    log.debug("result: " + result);
                     return result;
                 }
@@ -763 +764 @@
                 component.removeProperty(property[0].getText(0));
                 tableViewer.setInput(component);
+                tableViewer.refresh();
             }
 
@@ -978 +980 @@
         {
             doSetInput(input);
+            log.debug("setInputWithNotify: " + input.getName() );
 
             /*

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/editors/OWDEditor.java

@@ -355 +355 @@
                             log.debug("Refreshing resources tree");
                             monitor.worked(1);
-                            final PyWrapper[] result = wavedevFactory()
-                                .toArrayOfWrappedElements(
-                                    mainFrame().loadResources());
+                            final PyWrapper[] result = wavedevFactory().toArrayOfWrappedElements(mainFrame().loadResources());
                             monitor.worked(8);
 
@@ -1653 +1651 @@
         public void run()
         {
-            getActiveWaveform().addNewComponent((Component)subject, null);
+                Waveform tempWform = getActiveWaveform();
+                log.debug("AddToWaveformAction(): Wform is " + tempWform.getName());
+                log.debug("AddToWAveformAction(): Wform class is " + tempWform.getClass());
+                try {
+                        getActiveWaveform().addNewComponent((Component)subject, null);
+                }
+                catch(Exception e){
+                        log.debug(e.fillInStackTrace());
+                }
             refreshWaveform();
             setIsDirty(true);

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/wavedev/Component.java

@@ -425 +425 @@
     }
     
+    public String getTemplate()
+    {
+        try {
+                String temp = getString(ECLIPSE_TEMPLATE);
+                return temp;
+        }
+        catch(Error e){
+                System.out.println("No xTemplate attribute. adding a new one with basic_ports as def value");
+                put(ECLIPSE_TEMPLATE, "basic_ports");
+                return getString(ECLIPSE_TEMPLATE);
+        }
+    }
+    
  
     public void removePort(String portName)
@@ -483 +496 @@
         {
             put(ECLIPSE_ASSIGNED_COMPONENTS, new PyList());
-
+            put(ECLIPSE_TEMPLATE, "basic_ports");
             ensurePortsAreParented();
             // Can't call ensurePortsKnowAboutConnections(), since other

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/wavedev/SimpleProperty.java

@@ -76 +76 @@
             try
         {
-            put(VALUE, Integer.parseInt(defaultValue));
+            put(DEFAULT_VALUE, Integer.parseInt(defaultValue));
         }
         catch(NumberFormatException nfe)
@@ -82 +82 @@
             try
             {
-                put(VALUE, Long.parseLong(defaultValue));
+                put(DEFAULT_VALUE, Long.parseLong(defaultValue));
             }
             catch(NumberFormatException nfe2)
             {
-                put(VALUE, Double.parseDouble(defaultValue));
+                put(DEFAULT_VALUE, Double.parseDouble(defaultValue));
             }
         }