frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed Layout issues where components were only partly visible 

Former-commit-id: 518b72093d38a7692c7c7707f5fe9f663477ec9d
This commit is contained in:
johan 2013-10-21 21:45:02 +02:00
parent 3939380b5e
commit 8a9c052e8d
5 changed files with 2 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/HyperCon.jar.REMOVED.git-id
View File

@ -1 +1 @@
e81048005035c3bc370c6b2141998c1b379e1a7b 8b85d78801cd11fdefd0d389d61e2c9e5a50ad03

2
src/config-tool/ConfigTool/src/org/hyperion/hypercon/Main.java
View File

@ -26,7 +26,7 @@ public class Main {
// Create a frame for the configuration panel // Create a frame for the configuration panel
JFrame frame = new JFrame(); JFrame frame = new JFrame();
frame.setTitle("Hyperion configuration Tool"); frame.setTitle("Hyperion configuration Tool");
frame.setSize(1300, 620); frame.setSize(1300, 700);
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
frame.setIconImage(new ImageIcon(Main.class.getResource("HyperConIcon_64.png")).getImage()); frame.setIconImage(new ImageIcon(Main.class.getResource("HyperConIcon_64.png")).getImage());

2
src/config-tool/ConfigTool/src/org/hyperion/hypercon/gui/ConfigPanel.java
View File

@ -1,7 +1,6 @@
package org.hyperion.hypercon.gui; package org.hyperion.hypercon.gui;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.io.IOException; import java.io.IOException;
import java.util.Observable; import java.util.Observable;
@ -120,7 +119,6 @@ public class ConfigPanel extends JPanel {
private JPanel getSpecificationPanel() { private JPanel getSpecificationPanel() {
if (mSpecificationPanel == null) { if (mSpecificationPanel == null) {
mSpecificationPanel = new JPanel(); mSpecificationPanel = new JPanel();
mSpecificationPanel.setPreferredSize(new Dimension(300, 200));
mSpecificationPanel.setLayout(new BoxLayout(mSpecificationPanel, BoxLayout.Y_AXIS)); mSpecificationPanel.setLayout(new BoxLayout(mSpecificationPanel, BoxLayout.Y_AXIS));
mConstructionPanel = new LedFramePanel(ledString.mLedFrameConfig); mConstructionPanel = new LedFramePanel(ledString.mLedFrameConfig);

21
src/config-tool/ConfigTool/src/org/hyperion/hypercon/gui/ImageProcessPanel.java
View File

@ -1,6 +1,5 @@
package org.hyperion.hypercon.gui; package org.hyperion.hypercon.gui;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.Observable; import java.util.Observable;
@ -49,57 +48,37 @@ public class ImageProcessPanel extends JPanel implements Observer {
private void initialise() { private void initialise() {
mHorizontalDepthLabel = new JLabel("Horizontal depth [%]:"); mHorizontalDepthLabel = new JLabel("Horizontal depth [%]:");
mHorizontalDepthLabel.setPreferredSize(new Dimension(100, 30));
mHorizontalDepthLabel.setMaximumSize(new Dimension(150, 30));
add(mHorizontalDepthLabel); add(mHorizontalDepthLabel);
mHorizontalDepthSpinner = new JSpinner(new SpinnerNumberModel(5.0, 1.0, 100.0, 1.0)); mHorizontalDepthSpinner = new JSpinner(new SpinnerNumberModel(5.0, 1.0, 100.0, 1.0));
mHorizontalDepthSpinner.setPreferredSize(new Dimension(150, 30));
mHorizontalDepthSpinner.setMaximumSize(new Dimension(250, 30));
mHorizontalDepthSpinner.addChangeListener(mChangeListener); mHorizontalDepthSpinner.addChangeListener(mChangeListener);
add(mHorizontalDepthSpinner); add(mHorizontalDepthSpinner);
mVerticalDepthLabel = new JLabel("Vertical depth [%]:"); mVerticalDepthLabel = new JLabel("Vertical depth [%]:");
mVerticalDepthLabel.setPreferredSize(new Dimension(100, 30));
mVerticalDepthLabel.setMaximumSize(new Dimension(150, 30));
add(mVerticalDepthLabel); add(mVerticalDepthLabel);
mVerticalDepthSpinner = new JSpinner(new SpinnerNumberModel(5.0, 1.0, 100.0, 1.0)); mVerticalDepthSpinner = new JSpinner(new SpinnerNumberModel(5.0, 1.0, 100.0, 1.0));
mVerticalDepthSpinner.setPreferredSize(new Dimension(150, 30));
mVerticalDepthSpinner.setMaximumSize(new Dimension(250, 30));
mVerticalDepthSpinner.addChangeListener(mChangeListener); mVerticalDepthSpinner.addChangeListener(mChangeListener);
add(mVerticalDepthSpinner); add(mVerticalDepthSpinner);
mHorizontalGapLabel = new JLabel("Horizontal gap [%]:"); mHorizontalGapLabel = new JLabel("Horizontal gap [%]:");
mHorizontalGapLabel.setPreferredSize(new Dimension(100, 30));
mHorizontalGapLabel.setMaximumSize(new Dimension(150, 30));
add(mHorizontalGapLabel); add(mHorizontalGapLabel);
mHorizontalGapSpinner = new JSpinner(new SpinnerNumberModel(0.0, 0.0, 50.0, 1.0)); mHorizontalGapSpinner = new JSpinner(new SpinnerNumberModel(0.0, 0.0, 50.0, 1.0));
mHorizontalGapSpinner.setPreferredSize(new Dimension(150, 30));
mHorizontalGapSpinner.setMaximumSize(new Dimension(250, 30));
mHorizontalGapSpinner.addChangeListener(mChangeListener); mHorizontalGapSpinner.addChangeListener(mChangeListener);
add(mHorizontalGapSpinner); add(mHorizontalGapSpinner);
mVerticalGapLabel = new JLabel("Vertical gap [%]:"); mVerticalGapLabel = new JLabel("Vertical gap [%]:");
mVerticalGapLabel.setPreferredSize(new Dimension(100, 30));
mVerticalGapLabel.setMaximumSize(new Dimension(150, 30));
add(mVerticalGapLabel); add(mVerticalGapLabel);
mVerticalGapSpinner = new JSpinner(new SpinnerNumberModel(0.0, 0.0, 50.0, 1.0)); mVerticalGapSpinner = new JSpinner(new SpinnerNumberModel(0.0, 0.0, 50.0, 1.0));
mVerticalGapSpinner.setPreferredSize(new Dimension(150, 30));
mVerticalGapSpinner.setMaximumSize(new Dimension(250, 30));
mVerticalGapSpinner.addChangeListener(mChangeListener); mVerticalGapSpinner.addChangeListener(mChangeListener);
add(mVerticalGapSpinner); add(mVerticalGapSpinner);
mOverlapLabel = new JLabel("Overlap [%]:"); mOverlapLabel = new JLabel("Overlap [%]:");
mOverlapLabel.setPreferredSize(new Dimension(100, 30));
mOverlapLabel.setMaximumSize(new Dimension(150, 30));
add(mOverlapLabel); add(mOverlapLabel);
mOverlapSpinner = new JSpinner(new SpinnerNumberModel(0.0, -100.0, 100.0, 1.0)); mOverlapSpinner = new JSpinner(new SpinnerNumberModel(0.0, -100.0, 100.0, 1.0));
mOverlapSpinner.setPreferredSize(new Dimension(150, 30));
mOverlapSpinner.setMaximumSize(new Dimension(250, 30));
mOverlapSpinner.addChangeListener(mChangeListener); mOverlapSpinner.addChangeListener(mChangeListener);
add(mOverlapSpinner); add(mOverlapSpinner);

33
src/config-tool/ConfigTool/src/org/hyperion/hypercon/gui/LedFramePanel.java
View File

@ -1,6 +1,5 @@
package org.hyperion.hypercon.gui; package org.hyperion.hypercon.gui;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -52,83 +51,51 @@ public class LedFramePanel extends JPanel {
private void initialise() { private void initialise() {
mTypeLabel = new JLabel("LED Type:"); mTypeLabel = new JLabel("LED Type:");
mTypeLabel.setPreferredSize(new Dimension(100, 30));
mTypeLabel.setMaximumSize(new Dimension(150, 30));
add(mTypeLabel); add(mTypeLabel);
mTypeCombo = new JComboBox<>(DeviceType.values()); mTypeCombo = new JComboBox<>(DeviceType.values());
mTypeCombo.addActionListener(mActionListener); mTypeCombo.addActionListener(mActionListener);
mTypeCombo.setPreferredSize(new Dimension(150, 30));
mTypeCombo.setMaximumSize(new Dimension(250, 30));
add(mTypeCombo); add(mTypeCombo);
mTopCornerLabel = new JLabel("Led in top corners"); mTopCornerLabel = new JLabel("Led in top corners");
mTopCornerLabel.setPreferredSize(new Dimension(100, 30));
mTopCornerLabel.setMaximumSize(new Dimension(150, 30));
add(mTopCornerLabel); add(mTopCornerLabel);
mTopCornerCombo = new JComboBox<>(new Boolean[] {true, false}); mTopCornerCombo = new JComboBox<>(new Boolean[] {true, false});
mTopCornerCombo.addActionListener(mActionListener); mTopCornerCombo.addActionListener(mActionListener);
mTopCornerCombo.setPreferredSize(new Dimension(150, 30));
mTopCornerCombo.setMaximumSize(new Dimension(250, 30));
add(mTopCornerCombo); add(mTopCornerCombo);
mBottomCornerLabel = new JLabel("Led in bottom corners"); mBottomCornerLabel = new JLabel("Led in bottom corners");
mBottomCornerLabel.setPreferredSize(new Dimension(100, 30));
mBottomCornerLabel.setMaximumSize(new Dimension(150, 30));
add(mBottomCornerLabel); add(mBottomCornerLabel);
mBottomCornerCombo = new JComboBox<>(new Boolean[] {true, false}); mBottomCornerCombo = new JComboBox<>(new Boolean[] {true, false});
mBottomCornerCombo.addActionListener(mActionListener); mBottomCornerCombo.addActionListener(mActionListener);
mBottomCornerCombo.setPreferredSize(new Dimension(150, 30));
mBottomCornerCombo.setMaximumSize(new Dimension(250, 30));
add(mBottomCornerCombo); add(mBottomCornerCombo);
mDirectionLabel = new JLabel("Direction"); mDirectionLabel = new JLabel("Direction");
mDirectionLabel.setPreferredSize(new Dimension(100, 30));
mDirectionLabel.setMaximumSize(new Dimension(150, 30));
add(mDirectionLabel); add(mDirectionLabel);
mDirectionCombo = new JComboBox<>(LedFrameConstruction.Direction.values()); mDirectionCombo = new JComboBox<>(LedFrameConstruction.Direction.values());
mDirectionCombo.addActionListener(mActionListener); mDirectionCombo.addActionListener(mActionListener);
mDirectionCombo.setPreferredSize(new Dimension(150, 30));
mDirectionCombo.setMaximumSize(new Dimension(250, 30));
add(mDirectionCombo); add(mDirectionCombo);
mHorizontalCountLabel = new JLabel("Horizontal #:"); mHorizontalCountLabel = new JLabel("Horizontal #:");
mHorizontalCountLabel.setPreferredSize(new Dimension(100, 30));
mHorizontalCountLabel.setMaximumSize(new Dimension(150, 30));
add(mHorizontalCountLabel); add(mHorizontalCountLabel);
mHorizontalCountSpinner = new JSpinner(new SpinnerNumberModel(mLedFrameSpec.topLedCnt, 0, 1024, 1)); mHorizontalCountSpinner = new JSpinner(new SpinnerNumberModel(mLedFrameSpec.topLedCnt, 0, 1024, 1));
mHorizontalCountSpinner.addChangeListener(mChangeListener); mHorizontalCountSpinner.addChangeListener(mChangeListener);
mHorizontalCountSpinner.setPreferredSize(new Dimension(150, 30));
mHorizontalCountSpinner.setMaximumSize(new Dimension(250, 30));
add(mHorizontalCountSpinner); add(mHorizontalCountSpinner);
mBottomGapCountLabel = new JLabel("Bottom Gap #:"); mBottomGapCountLabel = new JLabel("Bottom Gap #:");
mBottomGapCountLabel.setPreferredSize(new Dimension(100, 30));
mBottomGapCountLabel.setMaximumSize(new Dimension(150, 30));
add(mBottomGapCountLabel); add(mBottomGapCountLabel);
mBottomGapCountSpinner = new JSpinner(new SpinnerNumberModel(mLedFrameSpec.topLedCnt - mLedFrameSpec.bottomLedCnt, 0, 1024, 1)); mBottomGapCountSpinner = new JSpinner(new SpinnerNumberModel(mLedFrameSpec.topLedCnt - mLedFrameSpec.bottomLedCnt, 0, 1024, 1));
mBottomGapCountSpinner.addChangeListener(mChangeListener); mBottomGapCountSpinner.addChangeListener(mChangeListener);
mBottomGapCountSpinner.setPreferredSize(new Dimension(150, 30));
mBottomGapCountSpinner.setMaximumSize(new Dimension(250, 30));
add(mBottomGapCountSpinner); add(mBottomGapCountSpinner);
mVerticalCountLabel = new JLabel("Vertical #:"); mVerticalCountLabel = new JLabel("Vertical #:");
mVerticalCountLabel.setPreferredSize(new Dimension(100, 30));
mVerticalCountLabel.setMaximumSize(new Dimension(150, 30));
add(mVerticalCountLabel); add(mVerticalCountLabel);
mVerticalCountSpinner = new JSpinner(new SpinnerNumberModel(mLedFrameSpec.rightLedCnt, 0, 1024, 1)); mVerticalCountSpinner = new JSpinner(new SpinnerNumberModel(mLedFrameSpec.rightLedCnt, 0, 1024, 1));
mVerticalCountSpinner.addChangeListener(mChangeListener); mVerticalCountSpinner.addChangeListener(mChangeListener);
mVerticalCountSpinner.setPreferredSize(new Dimension(150, 30));
mVerticalCountSpinner.setMaximumSize(new Dimension(250, 30));
add(mVerticalCountSpinner); add(mVerticalCountSpinner);
mOffsetLabel = new JLabel("1st LED offset"); mOffsetLabel = new JLabel("1st LED offset");
mOffsetLabel.setPreferredSize(new Dimension(100, 30));
mOffsetLabel.setMaximumSize(new Dimension(150, 30));
add(mOffsetLabel); add(mOffsetLabel);
mOffsetSpinner = new JSpinner(new SpinnerNumberModel(mLedFrameSpec.firstLedOffset, Integer.MIN_VALUE, Integer.MAX_VALUE, 1)); mOffsetSpinner = new JSpinner(new SpinnerNumberModel(mLedFrameSpec.firstLedOffset, Integer.MIN_VALUE, Integer.MAX_VALUE, 1));
mOffsetSpinner.addChangeListener(mChangeListener); mOffsetSpinner.addChangeListener(mChangeListener);
mOffsetSpinner.setPreferredSize(new Dimension(150, 30));
mOffsetSpinner.setMaximumSize(new Dimension(250, 30));
add(mOffsetSpinner); add(mOffsetSpinner);
GroupLayout layout = new GroupLayout(this); GroupLayout layout = new GroupLayout(this);