Remove BasicRenderer and Fix panel location

graphstream · Feb 9, 2018 · 9575d60 · 9575d60
1 parent 125cd47
commit 9575d60
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 1,212 deletions.
diff --git a/app/src/main/java/org/graphstream/ui/android/BackendJ2D.java b/app/src/main/java/org/graphstream/ui/android/BackendJ2D.java
@@ -97,12 +97,13 @@ public Matrix getMatrixSurface(){
         Matrix origin = surface.getMatrix();
 
         if (!surface.isHardwareAccelerated()) {
-            int statusBarHeight = 0;
-            int resourceId = surface.getResources().getIdentifier("status_bar_height", "dimen", "android");
-            if (resourceId > 0) {
-                statusBarHeight = surface.getResources().getDimensionPixelSize(resourceId);
-            }
-            origin.postTranslate(0, statusBarHeight);
+			// get the surfaceView's location on screen
+			int[] location = new int[2];
+			location[0] = 0; location[1] = 0;
+
+			surface.getLocationOnScreen(location);
+
+            origin.postTranslate(location[0], location[1]);
         }
         return origin ;
     }
@@ -190,6 +191,7 @@ public void endTransform() {
 	}
 
 	private void computeInverse() {
+        Log.e("Debug", getMatrix()+"");
 	    xT = new Matrix(Tx);
 		if( !xT.invert(xT)) {
             Log.e("Error", "Cannot inverse matrix. " + this.getClass().getSimpleName());

diff --git a/app/src/main/java/org/graphstream/ui/android_viewer/AndroidGraphRenderer.java b/app/src/main/java/org/graphstream/ui/android_viewer/AndroidGraphRenderer.java
diff --git a/app/src/main/java/org/graphstream/ui/android_viewer/AndroidGraphRendererBase.java b/app/src/main/java/org/graphstream/ui/android_viewer/AndroidGraphRendererBase.java
diff --git a/app/src/main/java/org/graphstream/ui/android_viewer/AndroidViewer.java b/app/src/main/java/org/graphstream/ui/android_viewer/AndroidViewer.java
@@ -8,7 +8,7 @@
 import org.graphstream.stream.ProxyPipe;
 import org.graphstream.stream.Source;
 import org.graphstream.stream.thread.ThreadProxyPipe;
-import org.graphstream.ui.android_viewer.basicRenderer.AndroidBasicGraphRenderer;
+import org.graphstream.ui.android.AndroidFullGraphRenderer;
 import org.graphstream.ui.graphicGraph.GraphicGraph;
 import org.graphstream.ui.view.GraphRenderer;
 import org.graphstream.ui.view.View;
@@ -195,7 +195,7 @@ public void close() {
     }
 
     public GraphRenderer<?, ?> newDefaultGraphRenderer() {
-        return new AndroidBasicGraphRenderer();
+        return new AndroidFullGraphRenderer();
     }
 
     class MyTimer extends CountDownTimer

diff --git a/app/src/main/java/org/graphstream/ui/android_viewer/DefaultView.java b/app/src/main/java/org/graphstream/ui/android_viewer/DefaultView.java
@@ -93,16 +93,15 @@ public Camera getCamera() {
     }
 
     public void render(Canvas c) {
-        int statusBarHeight = 0;
+        // get the surfaceView's location on screen
+        int[] location = new int[2];
+        location[0] = 0; location[1] = 0;
 
         if (!isHardwareAccelerated()) {
-            int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
-            if (resourceId > 0) {
-                statusBarHeight = getResources().getDimensionPixelSize(resourceId);
-            }
+            getLocationOnScreen(location);
         }
 
-        renderer.render(c, (int)getX(), (int)getY()+statusBarHeight, getWidth(), getHeight());
+        renderer.render(c, location[0], location[1], getWidth(), getHeight());
         //renderer.render(c, 0, statusBarHeight, getWidth(), getHeight());
 
         // No screenshot in android, renderer.screenshot is empty