Fixes issues in #3

.github/workflows/install.yml

@@ -0,0 +1,46 @@
+name: Build and install CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:  
+  gcc-build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: "Boost"
+      run: sudo apt install libboost-all-dev
+    - name: "Configure and make (C++)"
+      run: |
+        make -C src all
+
+  java-build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: "Make one class-file"
+      run: |
+        echo "Making one class-file"
+        make -C Java src/ImageMaker/GenerateImages.class
+    - name: "Make jarfiles"
+      run: |
+        echo "Running java jarfiles"
+        make -C Java jarfiles
+        :
+
+  build:
+    runs-on: ubuntu-latest
+    needs: [java-build, gcc-build]
+    steps:
+    - uses: actions/checkout@v2
+    - name: "Install Boost"
+      run: sudo apt install libboost-all-dev
+    - name: make
+      run: make
+    - name: make install
+      run: make install

.github/workflows/testrun.yml

@@ -0,0 +1,32 @@
+name: Testrun CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:  
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: "Install Boost"
+      run: sudo apt install libboost-all-dev
+    - name: "Install other dependencies"
+      run: |
+        sudo apt install zsh bgpdump xz-utils
+    - name: "Install everything"
+      run: |
+        echo Running install
+        make install
+    - name: "Run a simple graph"
+      run: |
+        cd scripts
+        echo Trying to create graph
+        ./creategraphfromdate.sh 2000 09
+    - name: Upload graph image
+      uses: actions/upload-artifact@v1
+      with:
+        name: Upload graph
+        path: testrun/bview_2000_09/bview_2000_09_transparent.png

.gitignore

@@ -13,3 +13,15 @@ tags
 /testrun/test-June-10/tmp
 /testrun/test-June-10/*.tmp
 /testrun/test-June-10/*.out
+**/*.class
+install_perl.log
+**/*.Po
+**/*.0
+**/*.1
+src/autom4te.cache
+testrun/bview_*/
+src/lglbreakup
+src/lglfileconvert
+src/lglayout
+src/lglrebuild
+**/*.pyx

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "cSpell.words": [
+        "Apthread",
+        "Jama",
+        "manip"
+    ]
+}

Java/Makefile

@@ -0,0 +1,22 @@
+
+## Simple and stupid makefile
+
+JAVAS=src/ImageMaker/GenerateImages.java src/Viewer2D/Edge.java src/Viewer2D/EdgesFrame.java src/Viewer2D/EdgesPanel.java src/Viewer2D/FileInputHandler.java src/Viewer2D/FindEdgesFrame.java src/Viewer2D/FindVertexFrame.java src/Viewer2D/FormatVertex.java src/Viewer2D/ManipVertexArray.java src/Viewer2D/SaveResults.java src/Viewer2D/Transformer.java src/Viewer2D/VertexDescripTable.java src/Viewer2D/VertexFitter.java src/Viewer2D/Vertex.java src/Viewer2D/VertexStats.java src/Viewer2D/Viewer2D.java src/Viewer2D/ViewerIO.java
+CLASS=src/ImageMaker/GenerateImages.class src/Viewer2D/Edge.class src/Viewer2D/EdgesFrame.class src/Viewer2D/EdgesPanel.class src/Viewer2D/FileInputHandler.class src/Viewer2D/FindEdgesFrame.class src/Viewer2D/FindVertexFrame.class src/Viewer2D/FormatVertex.class src/Viewer2D/ManipVertexArray.class src/Viewer2D/SaveResults.class src/Viewer2D/Transformer.class src/Viewer2D/VertexDescripTable.class src/Viewer2D/VertexFitter.class src/Viewer2D/Vertex.class src/Viewer2D/VertexStats.class src/Viewer2D/Viewer2D.class src/Viewer2D/ViewerIO.class
+
+jar/%.jar: $(CLASS)
+	jar uf $@ -C src .
+
+jarfiles: jar/ImageMaker.jar jar/LGLLib.jar jar/LGLView.jar
+
+%.class : %.java
+	javac -cp lib/Jama-1.0.3.jar:lib/VectorGraphics2D-0.13.jar src/Viewer2D/*.java src/ImageMaker/*.java	
+
+all: $(CLASS)
+
+.PHONY: jarfiles
+
+# Keeping for posterity
+#%classfiles: src/ImageMaker/GenerateImages.java src/Viewer2D/Edge.java src/Viewer2D/EdgesFrame.java src/Viewer2D/EdgesPanel.java src/Viewer2D/FileInputHandler.java src/Viewer2D/FindEdgesFrame.java src/Viewer2D/FindVertexFrame.java src/Viewer2D/FormatVertex.java src/Viewer2D/ManipVertexArray.java src/Viewer2D/SaveResults.java src/Viewer2D/Transformer.java src/Viewer2D/VertexDescripTable.java src/Viewer2D/VertexFitter.java src/Viewer2D/Vertex.java src/Viewer2D/VertexStats.java src/Viewer2D/Viewer2D.java src/Viewer2D/ViewerIO.java
+#	javac -cp lib/Jama-1.0.3.jar:lib/VectorGraphics2D-0.13.jar src/Viewer2D/*.java src/ImageMaker/*.java
+#.PHONY: classfiles jarfiles

Java/build.sh

@@ -8,11 +8,11 @@ cd ImageMaker
 make clean
 make
 cd ..
-$JAVABINPATH/jar cmf ImageMaker/META-INF/MANIFEST.MF imageMaker.jar Viewer2D Jama ImageMaker
+jar cmf ImageMaker/META-INF/MANIFEST.MF imageMaker.jar Viewer2D Jama ImageMaker
 echo "----- Compiling LGLView -----"
 cd Viewer2D
 make clean
 make
 cd ..
-$JAVABINPATH/jar cmf Viewer2D/META-INF/MANIFEST.MF lglview.jar Viewer2D Jama
+jar cmf Viewer2D/META-INF/MANIFEST.MF lglview.jar Viewer2D Jama
 echo "There should be 2 .jar files in this directory"

Java/src/ImageMaker/GenerateImages.java

@@ -22,6 +22,7 @@
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -30,6 +31,12 @@
 import Viewer2D.EdgesPanel;
 import Viewer2D.FormatVertex;
 import Viewer2D.ViewerIO;
+import de.erichseifert.vectorgraphics2d.Document;
+import de.erichseifert.vectorgraphics2d.Processor;
+import de.erichseifert.vectorgraphics2d.Processors;
+import de.erichseifert.vectorgraphics2d.VectorGraphics2D;
+import de.erichseifert.vectorgraphics2d.intermediate.CommandSequence;
+import de.erichseifert.vectorgraphics2d.util.PageSize;
 
 /**
  * <b>SESS - 2014.05.10:</b>
@@ -53,6 +60,7 @@ public static void main(String[] args) {
 		int[] windowSizes = new int[2];
 		windowSizes[0] = new Integer(args[0]).intValue();
 		windowSizes[1] = new Integer(args[1]).intValue();
+		System.out.println("Loading flindeberg mod 2");
 		System.out.println("Image size is " + windowSizes[0] + " x "
 				+ windowSizes[1]);
 
@@ -100,14 +108,173 @@ public static void main(String[] args) {
 		}
 		System.out.println("Edges loading complete.");
 
+		generateDark(loadedEdgeColors, windowSizes, coordFiles, verterIO);
+
+		generateLight(loadedEdgeColors, windowSizes, coordFiles, verterIO);
+
+		generateTransparent(loadedEdgeColors, windowSizes, coordFiles, verterIO);
+
+		// System.out.println("Going for vector graphics (currently broken)");
+		// // Lets process coords files
+		// for (String coordFile : coordFiles) {
+		// 	try {
+		// 		System.out.println("Loading " + coordFile + "...");
+		// 		verterIO.loadVertexCoords(new File(coordFile));
+
+
+		// 		FormatVertex formatter = new FormatVertex(
+		// 				verterIO.getVertices(), verterIO.getStats(),
+		// 				windowSizes, 1);
+
+		// 		EdgesPanel panel = new EdgesPanel(verterIO.getEdges(),
+		// 				verterIO.getVertices(), windowSizes[0], windowSizes[1]);
+
+		// 		if (loadedEdgeColors)
+		// 			panel.addEdgeColors(verterIO.getEdgeColorMap());
+
+		// 		panel.showVertices(true);
+		// 		panel.setVisibilityTest(true);
+		// 		panel.setFormatter(formatter);
+		// 		panel.setEdgeColor(EDGE_COLOR);
+		// 		panel.setVertexColor(Color.white);
+		// 		panel.setBackgroundColor(new Color(0f,0f,0f,0f));
+
+		// 		// Use vector instead
+		// 		VectorGraphics2D g2 = new VectorGraphics2D();
+
+		// 		// Now the image has to be fitted to the given region
+		// 		panel.fitData();
+		// 		panel.writeVectorImage(g2);
+
+		// 		CommandSequence commands = ((VectorGraphics2D) g2).getCommands();
+
+		// 		String[] elements = {"pdf", "eps", "svg"};
+		// 		for (String ext : elements) {
+
+		// 			Processor pdfProcessor = Processors.get(ext);
+		// 			Document doc = pdfProcessor.getDocument(commands, PageSize.A4);
+
+		// 			String pngFile = MessageFormat.format(
+		// 					"{0}_{1,number,0}x{2,number,0}_transparent.{3}", coordFile,
+		// 					windowSizes[0], windowSizes[1], ext);
+
+		// 			System.out.println("Preparing " + pngFile + "...");
+		// 			try {
+		// 				doc.writeTo(new FileOutputStream(pngFile));
+		// 			} catch (Exception e) {
+		// 				System.out.println("Could not write vector graphics");
+		// 			}
+
+		// 			System.out.println("Done.");
+		// 		}
+
+
+		// 	} catch (IOException e) {
+		// 		System.out.println(MessageFormat.format(
+		// 				"Error processing {0}:\n{1}", e.getMessage()));
+		// 	}
+		// }
+	}
+
+	private static void generateTransparent(boolean loadedEdgeColors, int[] windowSizes, List<String> coordFiles,
+			ViewerIO verterIO) {
+		System.out.println("Going for transparent");
+		// Lets process coords files
+		for (String coordFile : coordFiles) {
+			try {
+				System.out.println("Loading " + coordFile + "...");
+				verterIO.loadVertexCoords(new File(coordFile));
+
+				String pngFile = MessageFormat.format(
+						"{0}_{1,number,0}x{2,number,0}_transparent.png", coordFile,
+						windowSizes[0], windowSizes[1]);
+				System.out.println("Preparing " + pngFile + "...");
+				FormatVertex formatter = new FormatVertex(
+						verterIO.getVertices(), verterIO.getStats(),
+						windowSizes, 1);
+
+				EdgesPanel panel = new EdgesPanel(verterIO.getEdges(),
+						verterIO.getVertices(), windowSizes[0], windowSizes[1]);
+
+				if (loadedEdgeColors)
+					panel.addEdgeColors(verterIO.getEdgeColorMap());
+
+				panel.showVertices(true);
+				panel.setVisibilityTest(true);
+				panel.setFormatter(formatter);
+				panel.setEdgeColor(EDGE_COLOR);
+				panel.setVertexColor(Color.white);
+				panel.setBackgroundColor(new Color(0f,0f,0f,0f));
+
+				BufferedImage bufferedImage = new BufferedImage(windowSizes[0],
+						windowSizes[1], BufferedImage.TYPE_INT_ARGB);
+
+				// Now the image has to be fitted to the given region
+				panel.fitData();
+				panel.writeImage(pngFile, bufferedImage);
+				System.out.println("Done.");
+			} catch (IOException e) {
+				System.out.println(MessageFormat.format(
+						"Error processing {0}:\n{1}", e.getMessage()));
+			}
+		}
+	}
+
+	private static void generateLight(boolean loadedEdgeColors, int[] windowSizes, List<String> coordFiles,
+			ViewerIO verterIO) {
+		System.out.println("Going for light");
+		// Lets process coords files
+		for (String coordFile : coordFiles) {
+			try {
+				System.out.println("Loading " + coordFile + "...");
+				verterIO.loadVertexCoords(new File(coordFile));
+
+				String pngFile = MessageFormat.format(
+						"{0}_{1,number,0}x{2,number,0}_light.png", coordFile,
+						windowSizes[0], windowSizes[1]);
+				System.out.println("Preparing " + pngFile + "...");
+				FormatVertex formatter = new FormatVertex(
+						verterIO.getVertices(), verterIO.getStats(),
+						windowSizes, 1);
+
+				EdgesPanel panel = new EdgesPanel(verterIO.getEdges(),
+						verterIO.getVertices(), windowSizes[0], windowSizes[1]);
+
+				if (loadedEdgeColors)
+					panel.addEdgeColors(verterIO.getEdgeColorMap());
+
+				panel.showVertices(true);
+				panel.setVisibilityTest(true);
+				panel.setFormatter(formatter);
+				panel.setEdgeColor(EDGE_COLOR);
+				panel.setVertexColor(Color.white);
+				panel.setBackgroundColor(Color.white);
+
+				BufferedImage bufferedImage = new BufferedImage(windowSizes[0],
+						windowSizes[1], BufferedImage.TYPE_INT_ARGB);
+
+				// Now the image has to be fitted to the given region
+				panel.fitData();
+				panel.writeImage(pngFile, bufferedImage);
+				System.out.println("Done.");
+			} catch (IOException e) {
+				System.out.println(MessageFormat.format(
+						"Error processing {0}:\n{1}", e.getMessage()));
+			}
+		}
+	}
+
+	private static void generateDark(boolean loadedEdgeColors, int[] windowSizes, List<String> coordFiles,
+			ViewerIO verterIO) {
+		System.out.println("Going for dark");
 		// Lets process coords files
 		for (String coordFile : coordFiles) {
 			try {
 				System.out.println("Loading " + coordFile + "...");
 				verterIO.loadVertexCoords(new File(coordFile));
 
 				String pngFile = MessageFormat.format(
-						"{0}_{1,number,0}x{2,number,0}.png", coordFile,
+						"{0}_{1,number,0}x{2,number,0}_dark.png", coordFile,
 						windowSizes[0], windowSizes[1]);
 				System.out.println("Preparing " + pngFile + "...");
 				FormatVertex formatter = new FormatVertex(
@@ -128,7 +295,7 @@ public static void main(String[] args) {
 				panel.setBackgroundColor(Color.BLACK);
 
 				BufferedImage bufferedImage = new BufferedImage(windowSizes[0],
-						windowSizes[1], BufferedImage.TYPE_INT_RGB);
+						windowSizes[1], BufferedImage.TYPE_INT_ARGB);
 
 				// Now the image has to be fitted to the given region
 				panel.fitData();
@@ -147,7 +314,7 @@ public static void message() {
 						+ "\t<width> <height> <edges file> <coords file1> <coords file2>... [-c <colors file> ]\n\n"
 						+ "If no colors file specified program will try to load file named \""
 						+ EDGE_COLOR_FILE + "\".\n"
-						+ "By default edges are white.");
+						+ "By default edges are white. flindeberg mod");
 		System.exit(1);
 	}