From 1af7d3700724834e40ad8636bc9a56cdc3b19b15 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 27 Jul 2019 11:52:38 -0400
Subject: [PATCH] New layout icons
---
ObjEditor.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 30d64e6..cd7eaf9 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -327,8 +327,8 @@
if (copy.versions == null)
{
- copy.versions = new byte[100][];
- copy.versionindex = -1;
+// copy.versions = new byte[100][];
+// copy.versionindex = -1;
}
SetupMenu();
@@ -974,7 +974,7 @@
// NumberSlider vDivsField;
// JCheckBox endcaps;
JCheckBox liveCB;
- JCheckBox selectCB;
+ JCheckBox selectableCB;
JCheckBox hideCB;
JCheckBox link2masterCB;
JCheckBox markCB;
@@ -1186,9 +1186,10 @@
liveCB = AddCheckBox(setupPanel, "Live", copy.live);
liveCB.setToolTipText("Animate object");
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
- selectCB.setToolTipText("Make object selectable");
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
+ selectableCB.setToolTipText("Make object selectable");
// Return();
+
hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
hideCB.setToolTipText("Hide object");
markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
@@ -1631,8 +1632,8 @@
/**/
bigThree = new cGridBag();
- bigThree.addComponent(scenePanel);
bigThree.addComponent(centralPanel);
+ bigThree.addComponent(scenePanel);
//bigThree.addComponent(XYZPanel);
// // SIDE EFFECT!!!
@@ -3250,7 +3251,7 @@
{
copy.live ^= true;
return;
- } else if (event.getSource() == selectCB)
+ } else if (event.getSource() == selectableCB)
{
copy.dontselect ^= true;
return;
@@ -4768,7 +4769,9 @@
readobj.ResetDisplayList();
} catch (Exception e)
{
- //e.printStackTrace();
+ if (!e.toString().contains("GZIP"))
+ e.printStackTrace();
+
try
{
java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
@@ -4888,6 +4891,7 @@
}
} catch (ClassCastException e)
{
+ e.printStackTrace();
assert (false);
Composite c = (Composite) copy;
c.children.clear();
@@ -5018,6 +5022,7 @@
//ps.print(buffer.toString());
} catch (IOException e)
{
+ e.printStackTrace();
}
}
--
Gitblit v1.6.2