Compact toolbar.

Normand Briere

2019-08-12 b1d79b74514041a059b454a9f6fc3970773c0cb8

 Cone.java
..
..
@@ -2,7 +2,7 @@
2
2
 
3
3
 class Cone extends Biparam implements java.io.Serializable
4
4
 {
5
-    //static final long serialVersionUID = -679715043452968126L;
5
+    static final long serialVersionUID = -2558098774090336324L; // -679715043452968126L;
6
6
 
7
7
     Cone()
8
8
     {
..
..
@@ -193,6 +193,11 @@
193
193
         return inside;
194
194
     }
195
195
 
196
+    double uStretch()
197
+    {
198
+        return 6; // Actually 6.28 (I think)
199
+    }
200
+    
196
201
     Vertex biparamFunction(double u, double v)
197
202
     {
198
203
         cVector tPos;
..
..
@@ -263,9 +268,11 @@
263
268
         editWindow = objectUI.GetEditor();
264
269
     }
265
270
 
266
-    void drawEditHandles(ClickInfo info, int level)
271
+    void drawEditHandles(//ClickInfo info,
272
+            int level)
267
273
     {
268
-        super.drawEditHandles(info, level);
274
+        super.drawEditHandles(//info,
275
+                level);
269
276
         if (level == 1)
270
277
         {
271
278
             return;
..
..
@@ -273,37 +280,39 @@
273
280
         {
274
281
             cVector temp = new cVector();
275
282
             LA.xformPos(base, toParent, temp);
276
-            Rectangle baseSpot = calcHotSpot(temp, info);
283
+            Rectangle baseSpot = calcHotSpot(temp); //, info);
277
284
             LA.xformPos(apex, toParent, temp);
278
-            Rectangle apexSpot = calcHotSpot(temp, info);
279
-            info.g.setColor(Color.green);
280
-            info.g.fillRect(baseSpot.x, baseSpot.y, baseSpot.width, baseSpot.height);
281
-            info.g.fillRect(apexSpot.x, apexSpot.y, apexSpot.width, apexSpot.height);
285
+            Rectangle apexSpot = calcHotSpot(temp); //, info);
286
+            clickInfo.g.setColor(Color.green);
287
+            clickInfo.g.fillRect(baseSpot.x, baseSpot.y, baseSpot.width, baseSpot.height);
288
+            clickInfo.g.fillRect(apexSpot.x, apexSpot.y, apexSpot.width, apexSpot.height);
282
289
             return;
283
290
         }
284
291
     }
285
292
 
286
-    boolean doEditClick(ClickInfo info, int level)
293
+    boolean doEditClick(//ClickInfo info,
294
+            int level)
287
295
     {
288
296
         //if (level == 0)
289
297
             //return false;
290
298
         hitSomething = 0;
291
-        if (super.doEditClick(info, level))
299
+        if (super.doEditClick(//info,
300
+                level))
292
301
         {
293
302
             hitSomething = 1;
294
303
             return true;
295
304
         }
296
305
         cVector temp = new cVector();
297
306
         LA.xformPos(base, toParent, temp);
298
-        Rectangle baseSpot = calcHotSpot(temp, info);
307
+        Rectangle baseSpot = calcHotSpot(temp); //, info);
299
308
         LA.xformPos(apex, toParent, temp);
300
-        Rectangle apexSpot = calcHotSpot(temp, info);
301
-        if (baseSpot.contains(info.x, info.y))
309
+        Rectangle apexSpot = calcHotSpot(temp); //, info);
310
+        if (baseSpot.contains(clickInfo.x, clickInfo.y))
302
311
         {
303
312
             hitSomething = 2;
304
313
             startRad = baseRadius;
305
314
         } else
306
-        if (apexSpot.contains(info.x, info.y))
315
+        if (apexSpot.contains(clickInfo.x, clickInfo.y))
307
316
         {
308
317
             hitSomething = 3;
309
318
             startRad = apexRadius;
..
..
@@ -311,20 +320,22 @@
311
320
         {
312
321
             return false;
313
322
         }
314
-        startX = info.x;
323
+        startX = clickInfo.x;
315
324
         return true;
316
325
     }
317
326
 
318
-    void doEditDrag(ClickInfo info, boolean opposite)
327
+    void doEditDrag(//ClickInfo info,
328
+            boolean opposite)
319
329
     {
320
330
         if (hitSomething == 0)
321
331
             return;
322
332
         if (hitSomething == 1)
323
333
         {
324
-            super.doEditDrag(info, opposite);
334
+            super.doEditDrag(//info,
335
+                    opposite);
325
336
             return;
326
337
         }
327
-        double deltaR = info.x - startX;
338
+        double deltaR = clickInfo.x - startX;
328
339
         double newRad = startRad + deltaR;
329
340
         if (newRad < 0)
330
341
             newRad = 0;
..
..
@@ -333,7 +344,7 @@
333
344
         else
334
345
             apexRadius = newRad;
335
346
         recalculate();
336
-        info.pane.repaint();
347
+        clickInfo.pane.repaint();
337
348
     }
338
349
 
339
350
     cVector base;