Normand Briere
2019-08-01 7d02eaffc02895a01d95d8fd7e089044449e1d6d
Switch left/right
3 files modified
18 ■■■■■ changed files
BoundaryRep.java 2 ●●● patch | view | raw | blame | history
Grafreed.java 4 ●●●● patch | view | raw | blame | history
GroupEditor.java 12 ●●●●● patch | view | raw | blame | history
BoundaryRep.java
....@@ -1997,7 +1997,7 @@
19971997 if (v.vertexlinks == null)
19981998 continue;
19991999
2000
- // Warning: a bit faster but dangerous
2000
+ // Warning: faster but dangerous
20012001 if (v.weights != null && v.weights[j]
20022002 // == 0)
20032003 < 0.001 * v.totalweight)
Grafreed.java
....@@ -626,12 +626,12 @@
626626
627627 System.out.println("jarfile = " + jarfile);
628628
629
- String command = javaPath + " -Xmx2048m -Djava.library.path=" + jarpath;
629
+ String command = javaPath + " -Xmx1024m -Djava.library.path=" + jarpath;
630630
631631 // -Djava.library.path=/Users/nbriere/Projects/shared/lib
632632 if (jarfile.charAt(2) == ':')
633633 {
634
- command = "\"" + javaPath + "\" -Xmx2048m -Djava.library.path=" + jarpath;
634
+ command = "\"" + javaPath + "\" -Xmx1024m -Djava.library.path=" + jarpath;
635635 // On Windows systems, the path is /C:/
636636 jarfile = jarfile.substring(1, jarfile.length());
637637 System.out.println("jarfile = " + jarfile);
GroupEditor.java
....@@ -932,7 +932,7 @@
932932 restoreCameraButton.addActionListener(this);
933933
934934 copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
- saveButton.setToolTipText("New version");
935
+ saveButton.setToolTipText("Duplicate current version");
936936 saveButton.addActionListener(this);
937937
938938 copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -942,12 +942,12 @@
942942
943943 cGridBag updown = new cGridBag().setVertical(true);
944944 updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
- restoreButton.setToolTipText("Restore current");
945
+ restoreButton.setToolTipText("Restore current version (undo latest change)");
946946 restoreButton.addActionListener(this);
947947 restoreButton.setEnabled(false);
948948
949949 updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950
- replaceButton.setToolTipText("Replace current");
950
+ replaceButton.setToolTipText("Replace current version (save latest change)");
951951 replaceButton.addActionListener(this);
952952 replaceButton.setEnabled(false);
953953
....@@ -1183,7 +1183,7 @@
11831183 dgr.addDragGestureListener(this);
11841184 }catch(Exception e) {}
11851185 */
1186
- radio.layout = sixButton; // sevenButton;
1186
+ radio.layout = threeButton; // sixButton;
11871187 oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
11881188 }
11891189
....@@ -1328,7 +1328,7 @@
13281328 }
13291329
13301330 radioButton.SetObject(obj);
1331
- radioButton.layout = sixButton; // sevenButton;
1331
+ radioButton.layout = threeButton; // sixButton;
13321332 radioButton.SetCamera(cameraView.renderCamera, false);
13331333 radioButton.addActionListener(this);
13341334 radioPanel.add(radioButton);
....@@ -3944,11 +3944,13 @@
39443944 } else if (event.getSource() == editCameraItem)
39453945 {
39463946 cameraView.ProtectCamera();
3947
+ cameraView.requestFocusInWindow();
39473948 cameraView.repaint();
39483949 return;
39493950 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
39503951 {
39513952 cameraView.RevertCamera();
3953
+ cameraView.requestFocusInWindow();
39523954 cameraView.repaint();
39533955 return;
39543956 // } else if (event.getSource() == textureButton)