[pip~pipSVN:238] Fix for the latest issues raised by Dr. Shah

[gkris@kenai.com]

Project:    pip
Repository: pipSVN
Revision:   238
Author:     gkris
Date:       2011-04-14 14:42:37 UTC
Link:       

Log Message:
------------
Fix for the latest issues raised by Dr. Shah


Revisions:
----------
238


Modified Paths:
---------------
trunk/src/org/proteme/protean/Protean.java
trunk/src/org/proteme/protean/Control_Protocol.java
trunk/src/org/proteme/protean/PpcEditor.form
trunk/src/org/proteme/protean/Control_LUMP.java
trunk/src/org/proteme/protean/Control_PPC.java
trunk/src/org/proteme/view/jgraphx/ProteanRouter.java
trunk/src/org/proteme/engine/Engine.java
trunk/src/org/proteme/protean/EditPPCDialog.java
trunk/src/org/proteme/protean/Control_PAL.java
trunk/src/org/proteme/protean/PpcEditor.java


Diffs:
------
Index: trunk/src/org/proteme/engine/Engine.java
===================================================================
--- trunk/src/org/proteme/engine/Engine.java    (revision 237)
+++ trunk/src/org/proteme/engine/Engine.java    (revision 238)
@@ -580,13 +580,20 @@
      * @param args
      */
     public static void main(String args[]) {
-        Engine engine = new Engine("edu.hfh.emradaptor.HenryFordEMRAdapter");
-        engine.loadGuideline("prt1010111200024940.8183718756401819");
-        engine.setPatientIdentifier("36145749");
-        engine.prepopulateFromEMR(engine.getGuideline());
+        Engine engine = new Engine("org.proteme.engine.DummyEMRAdaptor");
+        engine.loadGuideline("prt1101121316351580.18572095005515765");
+//        engine.setPatientIdentifier("36145749");
+//        engine.prepopulateFromEMR(engine.getGuideline());
 
-//        String executionId = engine.executeGuideline();
-//        
((Control_IPPC)((Control_IPPC)((Control_IPPC)engine.getGuideline().getPpcByName("Recommendation")).getPpcByName("Assessment")).getPpcByName("Signs
 and Symptoms - BP")).getPpcByName("-Vision changes").setValue("true");
+        String executionId = engine.executeGuideline();
+        ((Control_IPPC)engine.getGuideline().getPpcByName("TUA AKC - 
1")).getPpcByName("-TUA DE - 1").setValue(new Boolean(true));
+        engine.resumeExecution(executionId, engine.getGuidelineId(), null);
+        ((Control_IPPC)engine.getGuideline().getPpcByName("TUA AKC - 
2")).getPpcByName("-TUA DE - 2").setValue(new Boolean(true));
+        engine.resumeExecution(executionId, engine.getGuidelineId(), null);
+        ((Control_IPPC)engine.getGuideline().getPpcByName("TUA AKC - 
2")).getPpcByName("-TUA DE - 2").setValue(new Boolean(true));
+        engine.resumeExecution(executionId, engine.getGuidelineId(), null);
+
+        //        
((Control_IPPC)((Control_IPPC)((Control_IPPC)engine.getGuideline().getPpcByName("Recommendation")).getPpcByName("Assessment")).getPpcByName("Signs
 and Symptoms - BP")).getPpcByName("-Vision changes").setValue("true");
 //        
((Control_IPPC)((Control_IPPC)((Control_IPPC)((Control_IPPC)engine.getGuideline().getPpcByName("Recommendation")).getPpcByName("Assessment")).getPpcByName("BP
 in relation to goal")).getPpcByName("Current Systolic 
BP")).getPpcByName("-Systolic BP").setValue(new Integer(200));
 //        
((Control_IPPC)((Control_IPPC)((Control_IPPC)((Control_IPPC)engine.getGuideline().getPpcByName("Recommendation")).getPpcByName("Assessment")).getPpcByName("BP
 in relation to goal")).getPpcByName("Current Systolic 
BP")).getPpcByName("-Diastolic BP").setValue(new Integer(190));
 //        engine.resumeExecution(executionId, engine.getGuidelineId(), null);
Index: trunk/src/org/proteme/protean/PpcEditor.form
===================================================================
--- trunk/src/org/proteme/protean/PpcEditor.form        (revision 237)
+++ trunk/src/org/proteme/protean/PpcEditor.form        (revision 238)
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.5" 
type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
Index: trunk/src/org/proteme/protean/Control_PAL.java
===================================================================
--- trunk/src/org/proteme/protean/Control_PAL.java      (revision 237)
+++ trunk/src/org/proteme/protean/Control_PAL.java      (revision 238)
@@ -96,6 +96,7 @@
         if (PrGlobals.myFrame != null) {
             palFig = new FigPal();
             palFig.setOwner(this);
+            palFig.setPalAttributes(palType);
         }
     }
 
@@ -246,6 +247,7 @@
         try {
             endKcFg = (FgKcPorts) endPpc.getFig();
             this.palFig.connect(startKcFg, endKcFg, palType);
+            this.palFig.setPalAttributes(palType);
         } catch (Exception ex) {
             logger.error("Failed to connect PAL: " + name);
             logger.error("PAL id: " + ID);
Index: trunk/src/org/proteme/protean/Control_LUMP.java
===================================================================
--- trunk/src/org/proteme/protean/Control_LUMP.java     (revision 237)
+++ trunk/src/org/proteme/protean/Control_LUMP.java     (revision 238)
@@ -985,6 +985,7 @@
               cloneIppc.setOwnerThread(this);
               cloneIppc.setIteration(aIppc.getIteration() + 1);
               cloneIppc.setExecutionState(Constants.ACTIVE);
+//              cloneIppc.setResuming(true);
               aIppc.setId(anId + "-Iter-" + aIppc.getIteration());
               if (PrGlobals.myFrame != null) {
                 this.getFig().adjust();
Index: trunk/src/org/proteme/protean/Control_Protocol.java
===================================================================
--- trunk/src/org/proteme/protean/Control_Protocol.java (revision 237)
+++ trunk/src/org/proteme/protean/Control_Protocol.java (revision 238)
@@ -98,6 +98,7 @@
         super.save();
         noNeedToSave();
         ((FigGL) fgPPC).save();
+        PrGlobals.myFrame.setSaveEnabled(false);
     }
 
     /**
Index: trunk/src/org/proteme/protean/EditPPCDialog.java
===================================================================
--- trunk/src/org/proteme/protean/EditPPCDialog.java    (revision 237)
+++ trunk/src/org/proteme/protean/EditPPCDialog.java    (revision 238)
@@ -199,7 +199,7 @@
     JLabel jLabel14 = new JLabel();
     JScrollPane jScrollPane4 = new JScrollPane();
     JEditorPane informationEditorPane = new JEditorPane();
-    private String ppcInformation;
+    public String ppcInformation;
     JButton actFileEditButton = new JButton();
     JButton absFileEditButton = new JButton();
     Component component4;
Index: trunk/src/org/proteme/protean/Protean.java
===================================================================
--- trunk/src/org/proteme/protean/Protean.java  (revision 237)
+++ trunk/src/org/proteme/protean/Protean.java  (revision 238)
@@ -285,6 +285,10 @@
         return createGraph(layoutCache);
     }
 
+    public void setSaveEnabled(Boolean enabled) {
+        savePPCButton.setEnabled(enabled);
+    }
+    
     /**
      * Main method to execute Protean from command line
      * @param args
@@ -1514,6 +1518,7 @@
             myView.setSelectionCell(fg);  // Fix: the fig gets unselected 
after dialog box
             stackActionFlag = false;
             aKc.setModified(true);
+            PrGlobals.myFrame.setSaveEnabled(true);
             logger.debug("Protean.insertPPC............... fig="+fg+" 
bounds="+fg.getViewBounds(fg));
             logger.debug("Protean.insertPPC............... fig="+fg+" Map 
bounds="+GraphConstants.getBounds(fg.getAttributes()));
         } else {
@@ -3580,7 +3585,7 @@
     }
 
     private void enableButtons() {
-        savePPCButton.setEnabled(true);
+        savePPCButton.setEnabled(false);
         runButton.setEnabled(true);
         editPPCButton.setEnabled(true);
         editRulesButton.setEnabled(true);
Index: trunk/src/org/proteme/protean/Control_PPC.java
===================================================================
--- trunk/src/org/proteme/protean/Control_PPC.java      (revision 237)
+++ trunk/src/org/proteme/protean/Control_PPC.java      (revision 238)
@@ -528,6 +528,8 @@
      */
     public void setModified(boolean newModified) {
         modified = newModified;
+        if (modified)
+            PrGlobals.myFrame.setSaveEnabled(true);
         setModificationDate(new java.util.Date());
     }
 
@@ -1228,6 +1230,7 @@
             setCategory(aResult.getString("category"));
             setAssoUrl(aResult.getString("asso_info_url"));
             setInformation(aResult.getString("information"));
+            setDescription(aResult.getString("description"));
             if (!getPPC_Type().equals("PIDE")) {
                 setContext(aResult.getString("context"));
                 setTerm(aResult.getString("term"));
Index: trunk/src/org/proteme/protean/PpcEditor.java
===================================================================
--- trunk/src/org/proteme/protean/PpcEditor.java        (revision 237)
+++ trunk/src/org/proteme/protean/PpcEditor.java        (revision 238)
@@ -878,12 +878,12 @@
 
     @Override
     public String getPpcInformation() {
-        return jEditorPane2.getText();
+        return jEditorPane1.getText();
     }
 
     @Override
     public String getPpcDescription() {
-        return jEditorPane1.getText();
+        return jEditorPane2.getText();
     }
 
     @Override
@@ -1005,16 +1005,16 @@
         objectClassTF.setText(objectClass);
     }
 
-    public void setInformation(String information) {
-        jEditorPane2.setText(information);
+    public void setDescription(String description) {
+        ppcDescription = description;
+        jEditorPane2.setText(description);
     }
 
-    public void setDescription(String description) {
-         ppcDescription = description;
-        jEditorPane1.setText(description);
+    public void setInformation(String information) {
+         ppcInformation = information;
+        jEditorPane1.setText(information);
     }
 
-
     public void setURL(String url) {
         webUrlField.setText(url);
     }
Index: trunk/src/org/proteme/view/jgraphx/ProteanRouter.java
===================================================================
--- trunk/src/org/proteme/view/jgraphx/ProteanRouter.java       (revision 237)
+++ trunk/src/org/proteme/view/jgraphx/ProteanRouter.java       (revision 238)
@@ -775,6 +775,16 @@
         return side;
     }
 
+    public boolean isVertical(EdgeView edge) {
+        int side = getSide(edge, true);
+        if (side == TOPRIGHT || side == TOPLEFT || side == BOTLEFT || side 
== BOTRIGHT) {
+            return false;
+        } else if (side == RIGHTTOP || side == RIGHTBOT || side == LEFTTOP 
|| side == LEFTBOT) {
+            return true;
+        }
+        return false;
+    }
+
     private void setPortImage(EdgeView edge, int side) {
             final FigPal fgPal = (FigPal) edge.getCell();
             final int state = fgPal.getState();