Lazy icons.

Normand Briere

2019-09-10 a7e7618fb914f8b919a17daf6c020b860c5d11c9

Lazy icons.

 Grafreed.java
..
..
@@ -688,10 +688,14 @@
688
688
     
689
689
     public static void main(String argv[])
690
690
     {
691
-         String osArch = System.getProperty("os.arch");
691
+        String osArch = System.getProperty("os.arch");
692
692
         if (Globals.DEBUG)
693
693
                 System.out.println("os.arch = " + osArch);
694
694
                 
695
+        String osName = System.getProperty("os.name");
696
+
697
+        isWindows = !osName.equals("Mac OS X");
698
+            
695
699
         if (argv.length == 0)
696
700
         {
697
701
             String javaPath = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
..
..
@@ -717,7 +721,6 @@
717
721
             // -Djava.library.path=/Users/nbriere/Projects/shared/lib
718
722
         if (jarfile.charAt(2) == ':')
719
723
         {
720
-            isWindows = true;
721
724
             command = "\"" + javaPath + "\" -Xmx1024m -Djava.library.path=" + jarpath;
722
725
                 // On Windows systems, the path is /C:/
723
726
                 jarfile = jarfile.substring(1, jarfile.length());
 ObjEditor.java
..
..
@@ -98,10 +98,11 @@
98
98
     
99
99
     cButton GetButton(String name, boolean border)
100
100
     {
101
-        ImageIcon icon = GetIcon(name);
101
+        //ImageIcon icon = GetIcon(name);
102
102
         boolean fit = !name.startsWith("icons");
103
-        if (icon != null || name.contains("/"))
104
-            return new cButton(icon, border, fit);
103
+        if (//icon != null ||
104
+                name.contains("/"))
105
+            return new cButton(name, border, fit);
105
106
         else
106
107
             return new cButton(name, border);
107
108
     }
..
..
@@ -1787,7 +1788,7 @@
1787
1788
         objectTabbedPane.setToolTipTextAt(objectTabCount++, "Material");
1788
1789
     
1789
1790
         figurePanel = new cGridBag();
1790
-        figurePanel.add(new cButton("FIGURES amd POSES coming soon!"));
1791
+        figurePanel.add(new cButton("FIGURES and POSES coming soon!"));
1791
1792
         objectTabbedPane.add(figurePanel);
1792
1793
         objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/figure.png"));
1793
1794
         objectTabbedPane.setToolTipTextAt(objectTabCount++, "Figures and poses");
 Sphere.java
..
..
@@ -13,8 +13,8 @@
13
13
         this(false);
14
14
 
15
15
         radius = 0.05f;
16
-        uDivs = 7;
17
-        vDivs = 6;
16
+        uDivs = 11; // 7;
17
+        vDivs = 4; // 6;
18
18
 
19
19
         center = new cVector();
20
20
         center.set(x, y, z);
..
..
@@ -44,8 +44,8 @@
44
44
         inPnt = new cVector();
45
45
         name = "Sphere";
46
46
         //uDivs = vDivs = 16;
47
-        uDivs = 8; // 19;
48
-        vDivs = 8; // 18;
47
+        uDivs = 12; // 8; // 19;
48
+        vDivs = 6; // 8; // 18;
49
49
         minUDivs = 3;
50
50
         minVDivs = 2;
51
51
         //center = new cVector();
 Torus.java
..
..
@@ -8,8 +8,8 @@
8
8
     {
9
9
         inPnt = new cVector();
10
10
         name = "Torus";
11
-        uDivs = 35; // 64;
12
-        vDivs = 19; // 24;
11
+        uDivs = 61; // 35; // 64;
12
+        vDivs = 21; // 19; // 24;
13
13
         minUDivs = 3;
14
14
         minVDivs = 3;
15
15
         retile();
 cButton.java
..
..
@@ -1,5 +1,8 @@
1
1
 public class cButton extends javax.swing.JButton
2
2
 {
3
+    String iconname;
4
+    boolean fit;
5
+    
3
6
     cButton(String name)
4
7
     {
5
8
         super(name);
..
..
@@ -22,16 +25,20 @@
22
25
         }
23
26
     }
24
27
     
25
-    cButton(javax.swing.ImageIcon icon, boolean border, boolean fit)
28
+    cButton(//javax.swing.ImageIcon icon,
29
+            String iconname,
30
+            boolean border, boolean fit)
26
31
     {
27
-        super(icon);
32
+        //super(icon);
33
+        this.iconname = iconname;
34
+        this.fit = fit;
28
35
         
29
36
         assert(border);
30
37
         
31
38
         //setMargin(new java.awt.Insets(1, 10, 1, 10)); // ??
32
39
         
33
-        if (icon != null && fit)
34
-            this.image = icon.getImage();
40
+//        if (icon != null && fit)
41
+//            this.image = icon.getImage();
35
42
         
36
43
 //result = new JButton( icon );
37
44
 //result.setBorderPainted( false );
..
..
@@ -53,6 +60,23 @@
53
60
     //@Override
54
61
     protected void paintComponent(java.awt.Graphics g)
55
62
     {
63
+        if (iconname != null)
64
+        {
65
+            javax.swing.ImageIcon icon = ObjEditor.GetIcon(iconname);
66
+
67
+            if (icon == null)
68
+                setName(iconname);
69
+            else
70
+            {
71
+                if (fit)
72
+                    this.image = icon.getImage();
73
+                else
74
+                    setIcon(icon);
75
+            }
76
+            
77
+            iconname = null;
78
+        }
79
+        
56
80
         if (image != null)
57
81
         {
58
82
             //if (getWidth() > image.getWidth(null) + 8)