[Gzz-commits] fenfire/org/fenfire/loom ColorScheme.java Loom....

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/03/13 12:41:37

Modified files:
        org/fenfire/loom: ColorScheme.java Loom.java WheelView.java 
                          WheelView.test 

Log message:
        Blue borders around selected nodes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/ColorScheme.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Loom.java.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/WheelView.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/WheelView.test.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/loom/ColorScheme.java
diff -u fenfire/org/fenfire/loom/ColorScheme.java:1.2 
fenfire/org/fenfire/loom/ColorScheme.java:1.3
--- fenfire/org/fenfire/loom/ColorScheme.java:1.2       Tue Mar 11 17:52:22 2003
+++ fenfire/org/fenfire/loom/ColorScheme.java   Thu Mar 13 12:41:36 2003
@@ -39,6 +39,11 @@
      */
     Color getCursorColor();
 
+    /** Get a color for a border rendered around the selected
+     *  nodes, as an alternative to getCursorColor().
+     */
+    Color getCursorBorderColor();
+
     /** A green color scheme.
      */
     ColorScheme green = new LightColorScheme(0.233f);
@@ -53,12 +58,15 @@
      */
     public static class LightColorScheme implements ColorScheme {
         float hue;
-        public LightColorScheme(float hue) { this.hue = hue; }
-        public Color getBg() {
-            return Color.getHSBColor(hue, 0.1f, 1f);
-        }
-        public Color getCursorColor() {
-            return Color.getHSBColor(hue, 0.4f, 1f);
-        }
+       Color bg, cc, cbc;
+        public LightColorScheme(float hue) { 
+           this.hue = hue; 
+            bg = Color.getHSBColor(hue, 0.1f, 1f);
+            cc = Color.getHSBColor(hue, 0.4f, 1f);
+           cbc = Color.getHSBColor(hue, 0.75f, 1f);
+       }
+        public Color getBg() { return bg; }
+        public Color getCursorColor() { return cc; }
+       public Color getCursorBorderColor() { return cbc; }
     }
 }
Index: fenfire/org/fenfire/loom/Loom.java
diff -u fenfire/org/fenfire/loom/Loom.java:1.32 
fenfire/org/fenfire/loom/Loom.java:1.33
--- fenfire/org/fenfire/loom/Loom.java:1.32     Thu Mar 13 11:50:50 2003
+++ fenfire/org/fenfire/loom/Loom.java  Thu Mar 13 12:41:36 2003
@@ -280,19 +280,19 @@
                    Property prop = spec.prop;
                    int dir = spec.dir;
 
+                   boolean selected = 
spec.equals(cursor.getRotationNodespec(dir));
                    if(node instanceof Resource) {
-                       OvalBgVob bg = new OvalBgVob(new Color(102, 255, 102), 
false);
-                       if(spec.equals(cursor.getRotationNodespec(dir))) // if 
selected
-                           bg.addColor(colors.getCursorColor());
+                       OvalBgVob bg = new OvalBgVob(new Color(102, 255, 102), 
selected,
+                                                    
colors.getCursorBorderColor());
                        sc.map.put(bg, into);
                    } else {
-                       RectBgVob bg = new RectBgVob(new Color(255, 204, 51), 
false);
-                       if(spec.equals(cursor.getRotationNodespec(dir))) // if 
selected
-                           bg.addColor(colors.getCursorColor());
+                       RectBgVob bg = new RectBgVob(new Color(255, 204, 51), 
selected,
+                                                    
colors.getCursorBorderColor());
                        sc.map.put(bg, into);
                    }
 
                    String s = node.toString();
+                   boolean isByClass = false;
                    if(node instanceof Resource) {
                        s = names.getAbbrev(s);
                        String t = s;
@@ -315,13 +315,15 @@
                                    s = byStmt.getString();
                                else
                                    s = 
names.getAbbrev(byStmt.getObject().toString());
+                           
+                               isByClass = true;
                            }
                        } catch(RDFException e) {
                            s = t;
                        }
                    }
                    if(s.length() > 17) {
-                       if(node instanceof Literal)
+                       if(node instanceof Literal || isByClass)
                            s = s.substring(0, 14) + "...";
                        else
                            s = "..." + s.substring(s.length()-14);
Index: fenfire/org/fenfire/loom/WheelView.java
diff -u fenfire/org/fenfire/loom/WheelView.java:1.9 
fenfire/org/fenfire/loom/WheelView.java:1.10
--- fenfire/org/fenfire/loom/WheelView.java:1.9 Thu Mar 13 11:42:27 2003
+++ fenfire/org/fenfire/loom/WheelView.java     Thu Mar 13 12:41:36 2003
@@ -62,7 +62,7 @@
     protected int gapx = 50, gapy = 30;
 
     /** Maximum rotation angle. */
-    protected double maxrota = Math.PI / 15;
+    protected double maxrota = Math.PI / 9;
 
     public void render(VobScene sc, int into, Cursor c) {
        int midx = sc.size.width/2, midy = sc.size.height/2;
Index: fenfire/org/fenfire/loom/WheelView.test
diff -u fenfire/org/fenfire/loom/WheelView.test:1.12 
fenfire/org/fenfire/loom/WheelView.test:1.13
--- fenfire/org/fenfire/loom/WheelView.test:1.12        Thu Mar 13 12:06:43 2003
+++ fenfire/org/fenfire/loom/WheelView.test     Thu Mar 13 12:41:36 2003
@@ -121,6 +121,11 @@
         [vs.coords.transformPoint(cs, 0, 0, None)
          for cs in [cs_r, cs_s, cs_t, cs_u, cs_v, cs_w]]
 
+    for point in (pr,ps,pt,pu,pv,pw):
+        # middle instead of upper-left corner
+        point.x = point.x + 75
+        point.y = point.y + 10  
+
     prz, psz, ptz, puz, pvz, pwz = \
         [getZ(vs, cs) for cs in [cs_r, cs_s, cs_t, cs_u, cs_v, cs_w]]