Changeset 1707 for trunk/modelicaml/org.openmodelica.modelicaml.view.componentstree/src/org

Timestamp:

02/11/13 15:43:54 (12 years ago)

Author:

wschamai

Message:

MOD: reload buttons consistent in all views
ADD: reload button with element selection for component tree view
MOD: plotting of leaf variables only

Location:

trunk/modelicaml/org.openmodelica.modelicaml.view.componentstree/src/org/openmodelica/modelicaml/view/componentstree

Files:

• dialogs/ElementSelectionDialog.java (added)
• views/ComponentsTree.java (modified) (12 diffs)

trunk/modelicaml/org.openmodelica.modelicaml.view.componentstree/src/org/openmodelica/modelicaml/view/componentstree/views/ComponentsTree.java

@@ -130 +130 @@
 import org.openmodelica.modelicaml.common.services.StringUtls;
 import org.openmodelica.modelicaml.common.utls.ResourceManager;
+import org.openmodelica.modelicaml.common.utls.SWTResourceManager;
 import org.openmodelica.modelicaml.common.validation.services.ModelicaMLMarkerSupport;
 import org.openmodelica.modelicaml.gen.modelica.cg.helpers.OMCClassValidator;
@@ -139 +140 @@
 import org.openmodelica.modelicaml.view.componentstree.Activator;
 import org.openmodelica.modelicaml.view.componentstree.dialogs.DialogComponentModification;
+import org.openmodelica.modelicaml.view.componentstree.dialogs.ElementSelectionDialog;
 import org.openmodelica.modelicaml.view.componentstree.dialogs.SearchDialog;
 import org.openmodelica.modelicaml.view.componentstree.dialogs.UpdateBindingsConfirmationDialog;
@@ -246 +248 @@
     private Action actionReload;
 
+    public Action actionReloadAndValidate;
+
     private IAction actionExpandArrays;
 
@@ -284 +288 @@
     private String markerType = Constants.MARKERTYPE_COMPONENT_MODIFICATION;
 
-    
+    /*
+     * dialog used to select an element from the model browser
+     */
+    private ElementSelectionDialog elementSelectionDialog;
+
+    private Action actionElementSelectedByDialog;
     
     
@@ -617 +626 @@
      */
     private void fillLocalToolBar(IToolBarManager manager) {
+        manager.add(actionReload);
+        manager.add(new Separator());
         manager.add(actionFind);
-        manager.add(new Separator());
-        manager.add(actionReload);
+//      manager.add(new Separator());
+//      manager.add(actionReloadAndValidate);
         manager.add(new Separator());
         manager.add(actionValidate);
@@ -710 +721 @@
         actionFind.setImageDescriptor(ImageDescriptor.createFromFile(Activator.class, "/icons/find.png"));
         
-        
-        
         actionReload = new Action("actionReload") {
             public void run() {
+                
+                
+                elementSelectionDialog = new ElementSelectionDialog(
+                        //PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), // don't use this because it will block the window underneath 
+                        new Shell(),
+                        SWTResourceManager.getImage(ElementSelectionDialog.class,"/icons/selectItem.gif"), 
+                        "Element Selection", 
+                        "Select the model to be instantiated", 
+                        selectedClass,
+                        actionElementSelectedByDialog
+                        );
+                
+                elementSelectionDialog.open();
+            }
+        };
+        actionReload.setText("(Reload");
+        actionReload.setToolTipText("Reload");
+        actionReload.setImageDescriptor(ImageDescriptor.createFromFile(Activator.class, "/icons/refresh.gif"));
+        actionReload.setEnabled(true);
+
+        
+        actionElementSelectedByDialog = new Action("actionElementSelectedByDialog") {
+            public void run() {
+                
+                // get the selected element from the dialog and set the view selected class 
+                if (elementSelectionDialog != null) {
+                    EObject selectedElement = elementSelectionDialog.getSelectedElement();
+                    if (selectedElement instanceof Class) {
+                        selectedClass = (Class) selectedElement;
+
+                        // close the dialog
+                        elementSelectionDialog.dispose();
+                        
+                        // re-create the tree
+                        reCreateTree();
+                    }
+                }
+            }
+        };
+        actionElementSelectedByDialog.setText("(Reload");
+        actionElementSelectedByDialog.setToolTipText("Reload");
+        actionElementSelectedByDialog.setImageDescriptor(ImageDescriptor.createFromFile(Activator.class, "/icons/refresh.gif"));
+        actionElementSelectedByDialog.setEnabled(true);
+
+        
+
+        
+        
+        actionReloadAndValidate = new Action("actionReloadAndValidate") {
+            public void run() {
+
                 showSelection(par, sel);
                 
@@ -725 +785 @@
             }
         };
-        actionReload.setText("(Re)load and validate");
-        actionReload.setToolTipText("(Re)load and validate");
-        actionReload.setImageDescriptor(ImageDescriptor.createFromFile(Activator.class, "/icons/refresh.gif"));
-        actionReload.setEnabled(false);
+        actionReloadAndValidate.setText("(Re)load and validate");
+        actionReloadAndValidate.setToolTipText("(Re)load and validate");
+        actionReloadAndValidate.setImageDescriptor(ImageDescriptor.createFromFile(Activator.class, "/icons/refresh.gif"));
+        actionReloadAndValidate.setEnabled(false);
         
         actionValidateComponentModifications = new Action("actionValidateComponentModifications") { //obviously a check box style
@@ -2226 +2286 @@
         par = sourcepart;
         
-        Object[] expandedElements = viewer.getExpandedElements();
-        TreePath[] expandedTreePaths = viewer.getExpandedTreePaths();
+//      Object[] expandedElements = viewer.getExpandedElements();
+//      TreePath[] expandedTreePaths = viewer.getExpandedTreePaths();
         
         // build new tree
@@ -2240 +2300 @@
                     selectedClass = (Class) selectedElement;
 
-                    createTree();
-                }
-            }
+//                  createTree();
+                }
+            }
+        }
+        
+        // set new input from the selection.
+//      viewer.setInput(getViewSite());
+//
+//      viewer.setExpandedElements(expandedElements);
+//      viewer.setExpandedTreePaths(expandedTreePaths);
+        
+        reCreateTree();
+    }
+    
+    
+    public void reCreateTree() {
+
+        Object[] expandedElements = viewer.getExpandedElements();
+        TreePath[] expandedTreePaths = viewer.getExpandedTreePaths();
+        
+        if (selectedClass instanceof Class) {
+            createTree();
         }
         
@@ -2251 +2330 @@
         viewer.setExpandedTreePaths(expandedTreePaths);
     }
+
 
     /*
@@ -2394 +2474 @@
             actionSimulate.setEnabled(true);
             actionValidate.setEnabled(true);
-            actionReload.setEnabled(true);
+            actionReloadAndValidate.setEnabled(true);
             actionCollapseAll.setEnabled(true);
             
@@ -2439 +2519 @@
             actionSimulate.setEnabled(false);
             actionValidate.setEnabled(false);
-            actionReload.setEnabled(false);
+            actionReloadAndValidate.setEnabled(false);
             actionCollapseAll.setEnabled(false);
         }