Skip to content

Commit 7ffec22

Browse files
committed
minor changes, noted license change on website
1 parent f52f163 commit 7ffec22

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

plcc/doc/RELEASE_LOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ Updates from version 2012-10-11 to 2013-03-25:
123123

124124
Updates from version 2013-03-25 to 2015-01-20:
125125
================================================
126+
* ALL: license changed to GPL 2.0
126127
* PLCC
127128
- tons of changes and fixes, the code base may have doubled. some are given in the following list, more are forgotten already.
128129
- support for computing folding graphs (connected components of protein graphs)

plcc/src/plcc/ComplexGraph.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public Vertex getVertexFromChain(String chainID) {
6666

6767
public String getPDBID() {
6868
return this.pdbid;
69-
}
69+
}
7070

7171
/**
7272
* Writes this complex graph to the file 'file' in GML format. Note that

plcc/src/plcc/SSEGraph.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.awt.geom.AffineTransform;
3333
import java.awt.geom.Arc2D;
3434
import java.awt.geom.Ellipse2D;
35+
import java.awt.geom.GeneralPath;
3536
import java.awt.geom.Line2D;
3637
import java.awt.geom.Rectangle2D;
3738
import java.awt.image.BufferedImage;
@@ -4003,6 +4004,7 @@ protected static ArrayList<Shape> getCrossoverArcConnectorAlternativeBezierVersi
40034004
Integer downwards = 180;
40044005

40054006
ArrayList<Shape> parts = new ArrayList<Shape>();
4007+
ArrayList<Shape> partsPath = new ArrayList<Shape>();
40064008
Integer leftVertPosX, rightVertPosX, bothArcsXDistance, bothArcsSumHeight, vertStartY, leftArcHeight, leftArcWidth, rightArcHeight, rightArcWidth, arcWidth, arcEllipseHeight;
40074009
Integer leftArcUpperLeftX, leftArcUpperLeftY, centerBetweenBothArcsX, centerBetweenBothArcsY, leftArcEndX, leftArcEndY, rightArcEndX, rightArcEndY;
40084010
Integer leftArcLowerRightX, leftArcLowerRightY, leftArcUpperRightX, leftArcUpperRightY;
@@ -4046,6 +4048,8 @@ protected static ArrayList<Shape> getCrossoverArcConnectorAlternativeBezierVersi
40464048

40474049
// everything computed, now start to create the shapes based on the required arc starting angle (up or down)
40484050
Shape shape; Arc2D arc;
4051+
GeneralPath path = new GeneralPath();
4052+
path.moveTo(startX, startY);
40494053

40504054
// TODO: we could draw these arcs using Quadratic and Cubic Curves (QuadCurve2D and CubicCurve2D).
40514055
// See the docs at http://docs.oracle.com/javase/tutorial/2d/overview/primitives.html for examples.
@@ -4061,6 +4065,7 @@ protected static ArrayList<Shape> getCrossoverArcConnectorAlternativeBezierVersi
40614065
shape = stroke.createStrokedShape(arc);
40624066
parts.add(shape);
40634067

4068+
path.curveTo(startX, (startY - leftArcHeight), leftArcEndX, (leftArcEndY - leftArcHeight), leftArcEndX, leftArcEndY);
40644069

40654070
rightArcUpperLeftX = rightVertPosX - rightArcWidth;
40664071
rightArcUpperLeftY = targetY;
@@ -4111,7 +4116,8 @@ protected static ArrayList<Shape> getCrossoverArcConnectorAlternativeBezierVersi
41114116
parts.add(shape);
41124117

41134118
}
4114-
return(parts);
4119+
return new ArrayList<>(partsPath);
4120+
//return(parts);
41154121
}
41164122

41174123

plcc/website/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<p class="text">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
4343
<br />
4444
<br />
45-
VPLG is licensed under the <a href="http://www.perlfoundation.org/artistic_license_2_0" target="_blank">Artistic License 2.0</a>. This is a <a href="http://www.gnu.org/licenses/license-list.html%23ArtisticLicense2">free software license which is compatible with the GPL according to the FSF</a>. It is the same license that is used by the Perl programming language.
45+
VPLG is licensed under the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU Public License 2.0</a>.
4646
<br />
4747
<br />
4848
Also keep in mind that the software is work in progress. You can download different versions, but it is recommended to always use the latest version.<br />

0 commit comments

Comments
 (0)