First version of PherogramView added.

diff --git a/.gitattributes b/.gitattributes
index 0a2103d0edf5dd82f6a8c2b8f4f716b674d2b31f..142730b3cd9c747c31e31526e8141bdb266410a1 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -425,6 +425,7 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecu
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditorInput.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/CMDAlignmentObjectPlaceholder.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/ContigSequenceDataProvider.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramView.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/ToggleInsertOverwriteButton.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/ToggleLeftRightInsertionButton.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java -text

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index 27ca72cdb7a8e53d19b782f99ed177dbf4e56c9d..c139ebbe59d5a5d44e011397a7b226c5555780b1 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -91,6 +91,7 @@
       </editor>
    </extension>
       <extension
+            id="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
             point="org.eclipse.ui.views">
          <view
                allowMultiple="false"
@@ -150,6 +151,13 @@
                id="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifResponseImportView"
                name="%view.name.5">
          </view>
+         <view
+               allowMultiple="true"
+               class="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
+               id="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
+               name="PherogramView"
+               restorable="true">
+         </view>
       </extension>
    <extension
          point="org.eclipse.ui.elementFactories">

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
index b2233be8498f0cd7cfde5d6a009909dbce8321ca..9b669defb202d6c00b9c18279fbb50bd445a35cf 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
@@ -153,6 +153,8 @@ public class AlignmentEditor extends EditorPart {
                        (getReadsArea().getContentArea().getEditSettings().isInsert() ? "Insert" : "Overwrite") + "  " +
                        "Insertion in pherogram: " +
                        (getReadsArea().getContentArea().getEditSettings().isInsertLeftInDataArea() ? "Left" : "Right"));
+        
+        //TODO Refresh button status and caption (e.g. "OVR" and "INS")
 //        IContributionItem[] items = bars.getMenuManager().getItems(); //bars.getToolBarManager().getItems();
 //        System.out.println(items.length);
 //        for (int i = 0; i < items.length; i++) {

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramView.java
new file mode 100644 (file)
index 0000000..9225c99
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramView.java
@@ -0,0 +1,45 @@
+package eu.etaxonomy.taxeditor.editor.molecular;\r
+\r
+\r
+import info.bioinfweb.libralign.pherogram.PherogramTraceCurveView;\r
+\r
+import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.widgets.Composite;\r
+import org.eclipse.ui.part.ViewPart;\r
+\r
+\r
+\r
+/**\r
+ * Component that allows to view a pherogram without the distortion due to aligning it to a sequence as in \r
+ * {@link AlignmentEditor}. \r
+ * \r
+ * @author Ben Stöver\r
+ * @date Nov 20, 2014\r
+ */\r
+public class PherogramView extends ViewPart {\r
+    public static final String ID = "eu.etaxonomy.taxeditor.editor.molecular.PherogramView";\r
+\r
+    private PherogramTraceCurveView pherogramView = null;\r
+       \r
+       \r
+       public PherogramTraceCurveView getPherogramView() {\r
+               if (pherogramView == null) {\r
+                       pherogramView = new PherogramTraceCurveView();\r
+               }\r
+               return pherogramView;\r
+       }\r
+\r
+\r
+       @Override\r
+       public void createPartControl(Composite parent) {\r
+               //TODO Load pherogram that shall be displayed\r
+               getPherogramView().createSWTWidget(parent, SWT.NONE);\r
+       }\r
+       \r
+       \r
+       @Override\r
+       public void setFocus() {\r
+               // TODO Auto-generated method stub\r
+               \r
+       }\r
+}\r