From 0050edcb88bac197578ec518425c8c1e1b4e469f Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 02 Sep 2019 19:29:35 -0400
Subject: [PATCH] Scale slider
---
ObjEditor.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 530b091..06f91f8 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -555,7 +555,7 @@
// }
// }
// }
- cameraView.transformMode = objectTabbedPane.getSelectedIndex() == 4;
+ cameraView.transformMode = objectTabbedPane.getSelectedIndex() == 5;
// refreshContents(false); // To refresh Info tab
cameraView.repaint();
@@ -1726,6 +1726,12 @@
//XYZPanel.setName("XYZ");
transformPanel.add(resetTransformPanel);
+
+ cGridBag scalePanel = AddSlider(transformPanel, "Scale", 1, 10, 1);
+ scalePanel.preferredHeight = 2;
+ scaleSlider = (cNumberSlider)scalePanel.getComponent(1);
+ transformPanel.add(scalePanel);
+
transformPanel.add(XYZPanel);
/*
@@ -1781,7 +1787,7 @@
figurePanel = new cGridBag();
figurePanel.add(new cButton("FIGURES amd POSES coming soon!"));
objectTabbedPane.add(figurePanel);
- objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/run.png"));
+ objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/figure.png"));
objectTabbedPane.setToolTipTextAt(objectTabCount++, "Figures and poses");
// JPanel north = new JPanel(new BorderLayout());
@@ -5189,9 +5195,16 @@
cNumberSlider versionSlider;
cNumberSlider versionField;
+ cNumberSlider scaleSlider;
+
+ void ScaleSelection(int scale)
+ {
+ }
+
public void stateChanged(ChangeEvent e)
{
// assert(false);
+ // Main version slider
if (e.getSource() == versionSlider)
{
if (muteSlider)
@@ -5212,6 +5225,7 @@
return;
}
+ // Version slider of edited object
if (e.getSource() == versionField)
{
int version = versionField.getInteger();
@@ -5225,6 +5239,14 @@
return;
}
+ if (e.getSource() == scaleSlider)
+ {
+ int scale = scaleSlider.getInteger();
+
+ ScaleSelection(scale);
+ return;
+ }
+
if (freezematerial)
{
return;
--
Gitblit v1.6.2