Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Melhorias Tela de Navegação #18

Merged
merged 4 commits into from
Feb 19, 2019
Merged

Melhorias Tela de Navegação #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ba7432
Troca de classe de botao utilizados para a navegação
rafacasa Feb 19, 2019
ec0cff0
Ajustado dimensões janela de ajustes
rafacasa Feb 19, 2019
16d8861
Corrigido espaçamento entre botões
rafacasa Feb 19, 2019
0b5bc93
Remover itens desnecessários
rafacasa Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions src/SIGPROD2/auxiliar/ArrowButton.java
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/SIGPROD2/gui/AjusteFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ public AjusteFrame(sigprod2.gui.MainFrame frame) {
}

private void initComponents() {
this.panelAjuste = new JPanel();
this.panelAjuste.add(Box.createRigidArea(new Dimension(400, 400)));

this.navegacao = new PanelNavegacao(this.rede, this);
this.navegacao.atualizarPontoAtual();

this.panelAjuste = new JPanel();
this.panelAjuste.add(Box.createRigidArea(this.navegacao.getPreferredSize()));

addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent evt) {
limparPanel();
Expand Down Expand Up @@ -109,7 +109,7 @@ public boolean ajustar(Ponto ponto, boolean inicioRede) {
ponto.resetAtributos(true);
this.panelAjuste.removeAll();
this.panelAjuste.add(new PanelAjusteEloElo(metricas, this));
this.revalidate();
this.pack();
} catch (AjusteImpossivelException ex) {
ex.printStackTrace();
return false;
Expand Down
1 change: 1 addition & 0 deletions src/SIGPROD2/gui/ajustepanels/PanelAjusteEloElo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ private void listaActionPerformed(java.awt.event.ActionEvent evt) {
this.labelIFTMin.setText(metrica.getiFTMinI300() + "");
this.labelIFTMinSel.setText(metrica.getiFTMinSelI300() + "");
this.labelPorcentagem.setText((metrica.getPorcentagemProtegida() * 100) + "%");
this.ajusteFrame.pack();
}

private void botaoSelecionarActionPerformed(java.awt.event.ActionEvent evt) {
Expand Down
35 changes: 20 additions & 15 deletions src/SIGPROD2/gui/ajustepanels/PanelNavegacao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package SIGPROD2.gui.ajustepanels;

import SIGPROD2.auxiliar.ArrowButton;
import SIGPROD2.gui.AjusteFrame;
import java.awt.Component;
import java.awt.Dimension;
import java.util.List;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.plaf.basic.BasicArrowButton;
import sigprod2.modelo.Ponto;
import sigprod2.modelo.Rede;

Expand All @@ -24,7 +24,7 @@ public class PanelNavegacao extends JPanel {
private int camadaAtual, pontoAtual;
private AjusteFrame ajusteFrame;

private ArrowButton up, down, left, right;
private JButton up, down, left, right;
private JLabel labelCamadas, labelPontos;

public PanelNavegacao(Rede rede, AjusteFrame ajusteFrame) {
Expand All @@ -38,10 +38,10 @@ public PanelNavegacao(Rede rede, AjusteFrame ajusteFrame) {
}

private void initComponents() {
this.up = new ArrowButton(BasicArrowButton.NORTH);
this.down = new ArrowButton(BasicArrowButton.SOUTH);
this.left = new ArrowButton(BasicArrowButton.WEST);
this.right = new ArrowButton(BasicArrowButton.EAST);
this.up = new JButton("↑");
this.down = new JButton("↓");
this.left = new JButton("←");
this.right = new JButton("→");

this.up.addActionListener(this::subirCamada);
this.down.addActionListener(this::descerCamada);
Expand All @@ -53,6 +53,11 @@ private void initComponents() {
this.left.setAlignmentX(Component.CENTER_ALIGNMENT);
this.right.setAlignmentX(Component.CENTER_ALIGNMENT);

this.up.setAlignmentY(Component.CENTER_ALIGNMENT);
this.down.setAlignmentY(Component.CENTER_ALIGNMENT);
this.left.setAlignmentY(Component.CENTER_ALIGNMENT);
this.right.setAlignmentY(Component.CENTER_ALIGNMENT);

this.up.setEnabled(false);
this.down.setEnabled(false);
this.left.setEnabled(false);
Expand All @@ -69,29 +74,29 @@ private void placeComponents() {
panel1.setLayout(new BoxLayout(panel1, BoxLayout.LINE_AXIS));
panel2.setLayout(new BoxLayout(panel2, BoxLayout.LINE_AXIS));

panel1.add(Box.createHorizontalStrut(10));
panel1.add(Box.createRigidArea(new Dimension(10, 0)));
panel1.add(this.labelCamadas);
panel1.add(Box.createHorizontalStrut(10));
panel1.add(Box.createRigidArea(new Dimension(10, 0)));
panel1.add(this.up);
panel1.add(Box.createHorizontalStrut(10));
panel1.add(Box.createRigidArea(new Dimension(10, 0)));
panel1.add(this.down);
panel1.add(Box.createHorizontalGlue());

panel2.add(Box.createHorizontalStrut(10));
panel2.add(Box.createRigidArea(new Dimension(10, 0)));
panel2.add(this.labelPontos);
panel2.add(Box.createHorizontalStrut(10));
panel2.add(Box.createRigidArea(new Dimension(10, 0)));
panel2.add(this.left);
panel2.add(Box.createHorizontalStrut(10));
panel2.add(Box.createRigidArea(new Dimension(10, 0)));
panel2.add(this.right);
panel2.add(Box.createHorizontalGlue());

this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));

this.add(Box.createVerticalGlue());
this.add(panel1);
this.add(Box.createVerticalStrut(20));
this.add(Box.createRigidArea(new Dimension(0, 20)));
this.add(panel2);
this.add(Box.createVerticalStrut(20));
this.add(Box.createRigidArea(new Dimension(0, 20)));
}

public Ponto getPontoAtual() {
Expand Down