From 8f1afe25ea8fc8801aab66331c32a50859a758c2 Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Mon, 12 Aug 2019 18:20:19 -0400 Subject: [PATCH] Fix version manager. --- ObjEditor.java | 52 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 19 deletions(-) diff --git a/ObjEditor.java b/ObjEditor.java index 389e50d..35727f1 100644 --- a/ObjEditor.java +++ b/ObjEditor.java @@ -297,11 +297,13 @@ client = inClient; copy = client; - if (copy.versionlist == null) - { - copy.versionlist = new Object3D[100]; - copy.versionindex = -1; - } +// if (copy.versionlist == null) +// { +// copy.versionlist = new Object3D[100]; +// copy.versionindex = -1; +// +// callee.Save(true); +// } // "this" is not called: SetupUI2(objEditor); } @@ -320,6 +322,8 @@ { copy.versionlist = new Object3D[100]; copy.versionindex = -1; + +// Save(true); } SetupUI2(callee.GetEditor()); @@ -354,11 +358,13 @@ copy = localCopy; copy.editWindow = this; - if (copy.versionlist == null) - { -// copy.versions = new byte[100][]; +// if (copy.versionlist == null) +// { +// copy.versionlist = new Object3D[100]; // copy.versionindex = -1; - } +// +// Save(true); +// } SetupMenu(); @@ -445,7 +451,7 @@ // EditSelection(false); // } - refreshContents(false); // To refresh Info tab +// refreshContents(false); // To refresh Info tab } }; objectPanel.addChangeListener(changeListener); @@ -4161,7 +4167,7 @@ System.err.println("Save"); Replace(); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"? @@ -4328,10 +4334,13 @@ void SetUndoStates() { - cRadio tab = GetCurrentTab(); + //if (true) + // return; + + //cRadio tab = GetCurrentTab(); - restoreButton.setEnabled(true); // copy.versionindex != -1); - replaceButton.setEnabled(true); // copy.versionindex != -1); + restoreButton.setEnabled(copy.versionindex != -1); + replaceButton.setEnabled(copy.versionindex != -1); previousVersionButton.setEnabled(copy.versionindex > 0); nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null); @@ -4340,8 +4349,10 @@ copy.versionlist[copy.versionindex + 1] != null); muteSlider = true; + versionSlider.setMinimum(0); versionSlider.setMaximum(VersionCount() - 1); versionSlider.setInteger(copy.versionindex); + versionSlider.setEnabled(copy.versionindex != -1); muteSlider = false; } @@ -4352,7 +4363,7 @@ System.err.println("Undo"); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); if (copy.versionindex == 0) { @@ -4384,7 +4395,7 @@ { System.err.println("Restore"); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null) { @@ -4402,7 +4413,7 @@ { System.err.println("Replace"); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null) { @@ -4420,7 +4431,7 @@ // Option? Replace(); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); if (copy.versionlist[copy.versionindex + 1] == null) { @@ -4741,7 +4752,7 @@ int version = versionSlider.getInteger(); - if (copy.versionlist[version] != null) + if (version != -1 && copy.versionlist[version] != null) { copy.versionindex = version; CopyChanged(); @@ -5489,8 +5500,11 @@ if (copy.versionlist == null) { + // Backward compatibility copy.versionlist = new Object3D[100]; copy.versionindex = -1; + + Save(true); } //? SetUndoStates(); -- Gitblit v1.6.2