X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fxml%2Fbinding%2Fjalview%2FJalviewModel.java;h=cbe06b4ef713ae38fe3404feb93818f953ac457c;hb=ae447a3691fb85aaf4e27cd6af8a6e0eb3d50530;hp=518d8ff98eecd440f676f899c5fea091ac998ffb;hpb=335e6b12c126bcb6825cd3f66422677db7cd91c7;p=jalview.git

diff --git a/src/jalview/xml/binding/jalview/JalviewModel.java b/src/jalview/xml/binding/jalview/JalviewModel.java
index 518d8ff..cbe06b4 100644
--- a/src/jalview/xml/binding/jalview/JalviewModel.java
+++ b/src/jalview/xml/binding/jalview/JalviewModel.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2023.02.22 at 05:27:55 PM GMT 
+// Generated on: 2023.02.22 at 10:08:57 PM GMT 
 //
 
 
@@ -210,6 +210,8 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *                   &lt;attribute name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
  *                   &lt;attribute name="startRes" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                   &lt;attribute name="startSeq" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   &lt;attribute name="charWidth" type="{http://www.w3.org/2001/XMLSchema}int" />
+ *                   &lt;attribute name="charHeight" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                   &lt;attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                   &lt;attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" />
  *                   &lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" />
@@ -308,8 +310,8 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *                     &lt;/element>
  *                     &lt;element name="pcaData" type="{www.jalview.org}PcaDataType"/>
  *                   &lt;/sequence>
- *                   &lt;attGroup ref="{www.jalview.org}SimilarityParams"/>
  *                   &lt;attGroup ref="{www.jalview.org}swingwindow"/>
+ *                   &lt;attGroup ref="{www.jalview.org}SimilarityParams"/>
  *                   &lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                   &lt;attribute name="scoreModelName" type="{http://www.w3.org/2001/XMLSchema}string" />
  *                   &lt;attribute name="xDim" type="{http://www.w3.org/2001/XMLSchema}int" />
@@ -3122,8 +3124,8 @@ public class JalviewModel {
      *         &lt;/element>
      *         &lt;element name="pcaData" type="{www.jalview.org}PcaDataType"/>
      *       &lt;/sequence>
-     *       &lt;attGroup ref="{www.jalview.org}SimilarityParams"/>
      *       &lt;attGroup ref="{www.jalview.org}swingwindow"/>
+     *       &lt;attGroup ref="{www.jalview.org}SimilarityParams"/>
      *       &lt;attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       &lt;attribute name="scoreModelName" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       &lt;attribute name="xDim" type="{http://www.w3.org/2001/XMLSchema}int" />
@@ -3178,14 +3180,6 @@ public class JalviewModel {
         protected Boolean showLabels;
         @XmlAttribute(name = "linkToAllViews")
         protected Boolean linkToAllViews;
-        @XmlAttribute(name = "includeGaps")
-        protected Boolean includeGaps;
-        @XmlAttribute(name = "matchGaps")
-        protected Boolean matchGaps;
-        @XmlAttribute(name = "includeGappedColumns")
-        protected Boolean includeGappedColumns;
-        @XmlAttribute(name = "denominateByShortestLength")
-        protected Boolean denominateByShortestLength;
         @XmlAttribute(name = "width")
         protected Integer width;
         @XmlAttribute(name = "height")
@@ -3194,6 +3188,14 @@ public class JalviewModel {
         protected Integer xpos;
         @XmlAttribute(name = "ypos")
         protected Integer ypos;
+        @XmlAttribute(name = "includeGaps")
+        protected Boolean includeGaps;
+        @XmlAttribute(name = "matchGaps")
+        protected Boolean matchGaps;
+        @XmlAttribute(name = "includeGappedColumns")
+        protected Boolean includeGappedColumns;
+        @XmlAttribute(name = "denominateByShortestLength")
+        protected Boolean denominateByShortestLength;
 
         /**
          * Gets the value of the sequencePoint property.
@@ -3542,195 +3544,195 @@ public class JalviewModel {
         }
 
         /**
-         * Gets the value of the includeGaps property.
+         * Gets the value of the width property.
          * 
          * @return
          *     possible object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public Boolean isIncludeGaps() {
-            return includeGaps;
+        public Integer getWidth() {
+            return width;
         }
 
         /**
-         * Sets the value of the includeGaps property.
+         * Sets the value of the width property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public void setIncludeGaps(Boolean value) {
-            this.includeGaps = value;
+        public void setWidth(Integer value) {
+            this.width = value;
         }
 
         /**
-         * Gets the value of the matchGaps property.
+         * Gets the value of the height property.
          * 
          * @return
          *     possible object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public Boolean isMatchGaps() {
-            return matchGaps;
+        public Integer getHeight() {
+            return height;
         }
 
         /**
-         * Sets the value of the matchGaps property.
+         * Sets the value of the height property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public void setMatchGaps(Boolean value) {
-            this.matchGaps = value;
+        public void setHeight(Integer value) {
+            this.height = value;
         }
 
         /**
-         * Gets the value of the includeGappedColumns property.
+         * Gets the value of the xpos property.
          * 
          * @return
          *     possible object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public Boolean isIncludeGappedColumns() {
-            return includeGappedColumns;
+        public Integer getXpos() {
+            return xpos;
         }
 
         /**
-         * Sets the value of the includeGappedColumns property.
+         * Sets the value of the xpos property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public void setIncludeGappedColumns(Boolean value) {
-            this.includeGappedColumns = value;
+        public void setXpos(Integer value) {
+            this.xpos = value;
         }
 
         /**
-         * Gets the value of the denominateByShortestLength property.
+         * Gets the value of the ypos property.
          * 
          * @return
          *     possible object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public Boolean isDenominateByShortestLength() {
-            return denominateByShortestLength;
+        public Integer getYpos() {
+            return ypos;
         }
 
         /**
-         * Sets the value of the denominateByShortestLength property.
+         * Sets the value of the ypos property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Boolean }
+         *     {@link Integer }
          *     
          */
-        public void setDenominateByShortestLength(Boolean value) {
-            this.denominateByShortestLength = value;
+        public void setYpos(Integer value) {
+            this.ypos = value;
         }
 
         /**
-         * Gets the value of the width property.
+         * Gets the value of the includeGaps property.
          * 
          * @return
          *     possible object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public Integer getWidth() {
-            return width;
+        public Boolean isIncludeGaps() {
+            return includeGaps;
         }
 
         /**
-         * Sets the value of the width property.
+         * Sets the value of the includeGaps property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public void setWidth(Integer value) {
-            this.width = value;
+        public void setIncludeGaps(Boolean value) {
+            this.includeGaps = value;
         }
 
         /**
-         * Gets the value of the height property.
+         * Gets the value of the matchGaps property.
          * 
          * @return
          *     possible object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public Integer getHeight() {
-            return height;
+        public Boolean isMatchGaps() {
+            return matchGaps;
         }
 
         /**
-         * Sets the value of the height property.
+         * Sets the value of the matchGaps property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public void setHeight(Integer value) {
-            this.height = value;
+        public void setMatchGaps(Boolean value) {
+            this.matchGaps = value;
         }
 
         /**
-         * Gets the value of the xpos property.
+         * Gets the value of the includeGappedColumns property.
          * 
          * @return
          *     possible object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public Integer getXpos() {
-            return xpos;
+        public Boolean isIncludeGappedColumns() {
+            return includeGappedColumns;
         }
 
         /**
-         * Sets the value of the xpos property.
+         * Sets the value of the includeGappedColumns property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public void setXpos(Integer value) {
-            this.xpos = value;
+        public void setIncludeGappedColumns(Boolean value) {
+            this.includeGappedColumns = value;
         }
 
         /**
-         * Gets the value of the ypos property.
+         * Gets the value of the denominateByShortestLength property.
          * 
          * @return
          *     possible object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public Integer getYpos() {
-            return ypos;
+        public Boolean isDenominateByShortestLength() {
+            return denominateByShortestLength;
         }
 
         /**
-         * Sets the value of the ypos property.
+         * Sets the value of the denominateByShortestLength property.
          * 
          * @param value
          *     allowed object is
-         *     {@link Integer }
+         *     {@link Boolean }
          *     
          */
-        public void setYpos(Integer value) {
-            this.ypos = value;
+        public void setDenominateByShortestLength(Boolean value) {
+            this.denominateByShortestLength = value;
         }
 
 
@@ -4826,6 +4828,8 @@ public class JalviewModel {
      *       &lt;attribute name="ignoreGapsinConsensus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
      *       &lt;attribute name="startRes" type="{http://www.w3.org/2001/XMLSchema}int" />
      *       &lt;attribute name="startSeq" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       &lt;attribute name="charWidth" type="{http://www.w3.org/2001/XMLSchema}int" />
+     *       &lt;attribute name="charHeight" type="{http://www.w3.org/2001/XMLSchema}int" />
      *       &lt;attribute name="fontName" type="{http://www.w3.org/2001/XMLSchema}string" />
      *       &lt;attribute name="fontSize" type="{http://www.w3.org/2001/XMLSchema}int" />
      *       &lt;attribute name="fontStyle" type="{http://www.w3.org/2001/XMLSchema}int" />
@@ -4922,6 +4926,10 @@ public class JalviewModel {
         protected Integer startRes;
         @XmlAttribute(name = "startSeq")
         protected Integer startSeq;
+        @XmlAttribute(name = "charWidth")
+        protected Integer charWidth;
+        @XmlAttribute(name = "charHeight")
+        protected Integer charHeight;
         @XmlAttribute(name = "fontName")
         protected String fontName;
         @XmlAttribute(name = "fontSize")
@@ -5805,6 +5813,54 @@ public class JalviewModel {
         }
 
         /**
+         * Gets the value of the charWidth property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Integer }
+         *     
+         */
+        public Integer getCharWidth() {
+            return charWidth;
+        }
+
+        /**
+         * Sets the value of the charWidth property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Integer }
+         *     
+         */
+        public void setCharWidth(Integer value) {
+            this.charWidth = value;
+        }
+
+        /**
+         * Gets the value of the charHeight property.
+         * 
+         * @return
+         *     possible object is
+         *     {@link Integer }
+         *     
+         */
+        public Integer getCharHeight() {
+            return charHeight;
+        }
+
+        /**
+         * Sets the value of the charHeight property.
+         * 
+         * @param value
+         *     allowed object is
+         *     {@link Integer }
+         *     
+         */
+        public void setCharHeight(Integer value) {
+            this.charHeight = value;
+        }
+
+        /**
          * Gets the value of the fontName property.
          * 
          * @return