New layout icons

Normand Briere

2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15

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