diff --git a/mcp/mobius/opis/data/client/DataCache.java b/mcp/mobius/opis/data/client/DataCache.java index d306140..ea6535b 100644 --- a/mcp/mobius/opis/data/client/DataCache.java +++ b/mcp/mobius/opis/data/client/DataCache.java @@ -54,19 +54,6 @@ public class DataCache { private ArrayList timingChunks = new ArrayList(); private ArrayList listPlayers = new ArrayList(); - private double timingHandlersTotal = 0D; - private double timingEntitiesTotal = 0D; - private double timingTileEntsTotal = 0D; - private double timingWorldTickTotal= 0D; - private double timingEntUpdateTotal= 0D; - - private int amountHandlersTotal = 0; - private int amountEntitiesTotal = 0; - private int amountTileEntsTotal = 0; - - private long amountUpload = 0; - private long amountDownload = 0; - private long clockScrew = 0; private AccessLevel clientAccess = AccessLevel.NONE; @@ -100,106 +87,6 @@ public class DataCache { return this.clockScrew; } - public void setAmountUpload(long value){ - this.amountUpload = value; - double uploadKB = (value / 8.0) / 1024.0; - SwingUI.instance().getLblSummaryUpload().setText(String.format("%.3f", uploadKB)); - } - - public void setAmountDownload(long value){ - this.amountDownload = value; - double downloadKB = (value / 8.0) / 1024.0; - SwingUI.instance().getLblSummaryDownload().setText(String.format("%.3f", downloadKB)); - } - - private double getProfiledTickTotalTime(){ - return (timingWorldTickTotal + this.timingHandlersTotal + timingTileEntsTotal + timingEntitiesTotal)/1000.; - } - - public void setTimingEntUpdateTotal(double value){ - this.timingEntUpdateTotal = value; - //SwingUI.instance().getLblSummaryTimingGlobalUpdate().setText(String.format("%.3f", value/1000.)); - //SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() )); - } - - public void setTimingWorldTickTotal(double value){ - this.timingWorldTickTotal = value; - SwingUI.instance().getLblSummaryTimingWorldTick().setText(String.format("%.3f", value/1000.)); - SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() )); - } - - public void setTimingHandlersTotal(double value){ - this.timingHandlersTotal = value; - SwingUI.instance().getLblSummaryTimingHandlers().setText(String.format("%.3f", value/1000.)); - SwingUI.instance().getPanelTimingHandlers().getLblSummary().setText(String.format("Total update time : %.3f µs", value)); - SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f",this.getProfiledTickTotalTime())); - } - public void setTimingEntitiesTotal(double value){ - this.timingEntitiesTotal = value; - SwingUI.instance().getLblSummaryTimingEntities().setText(String.format("%.3f", value/1000.)); - SwingUI.instance().getPanelTimingEntities().getLblSummary().setText(String.format("Total update time : %.3f µs", value)); - SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f",this.getProfiledTickTotalTime())); - } - public void setTimingTileEntsTotal(double value){ - this.timingTileEntsTotal = value; - SwingUI.instance().getLblSummaryTimingTileEnts().setText(String.format("%.3f", value/1000.)); - SwingUI.instance().getPanelTimingTileEnts().getLblSummary().setText(String.format("Total update time : %.3f µs", value)); - SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f",this.getProfiledTickTotalTime())); - } - - public void setAmountHandlersTotal(int value){ - this.amountHandlersTotal = value; - SwingUI.instance().getLblSummaryAmountHandlers().setText(String.valueOf(value)); - } - public void setAmountEntitiesTotal(int value){ - this.amountEntitiesTotal = value; - SwingUI.instance().getLblSummaryAmountEntities().setText(String.valueOf(value)); - } - public void setAmountTileEntsTotal(int value){ - this.amountTileEntsTotal = value; - SwingUI.instance().getLblSummaryAmountTileEnts().setText(String.valueOf(value)); - } - - public void setTimingTick(ISerializable tickStat){ - this.timingTick = (StatsTick)tickStat; - SwingUI.instance().getLblSummaryTimingTick().setText(String.valueOf(String.format("%.3f", this.timingTick.getGeometricMean()/1000.))); - - if (timingTickGraphData.size() > 100) - timingTickGraphData.remove(0); - - timingTickGraphData.add(this.timingTick.getGeometricMean()/1000.); - //timingTickGraphData.addValue(this.timingTick.getGeometricMean()/1000.); - - XYSeries xyData = new XYSeries("Update time"); - - double maxValue = 0D; - for (int i = 0; i < timingTickGraphData.size(); i++){ - xyData.add(i, timingTickGraphData.get(i)); - } - - XYSeriesCollection dataset = new XYSeriesCollection(); - dataset.addSeries(xyData); - - JFreeChart chart = ChartFactory.createXYAreaChart("", "Seconds", "Update Time [ms]", dataset, PlotOrientation.VERTICAL, false, false, false); - chart.setBackgroundPaint(new Color(255,255,255,0)); - XYPlot xyPlot = chart.getXYPlot(); - xyPlot.getRendererForDataset(dataset).setSeriesPaint(0, Color.BLUE); - - for (double y = 25.0; y < 250.0; y += 25.0){ - ValueMarker marker = new ValueMarker(y); - marker.setPaint(Color.black); - xyPlot.addRangeMarker(marker); - } - - Double verticalScale = 50.0 * (MathHelper.floor_double(xyData.getMaxY() / 50.0D) + 1); - ((NumberAxis)xyPlot.getRangeAxis()).setRange(0.0, verticalScale); - - Dimension dim = SwingUI.instance().getLblSummaryTickChart().getSize(); - - BufferedImage image = chart.createBufferedImage(dim.width,dim.height); - SwingUI.instance().getLblSummaryTickChart().setIcon(new ImageIcon(image)); - } - public ArrayList getAmountEntities(){ return this.amountEntities; } diff --git a/mcp/mobius/opis/network/ClientMessageHandler.java b/mcp/mobius/opis/network/ClientMessageHandler.java index 7ca5bf1..b423997 100644 --- a/mcp/mobius/opis/network/ClientMessageHandler.java +++ b/mcp/mobius/opis/network/ClientMessageHandler.java @@ -108,75 +108,65 @@ public class ClientMessageHandler { } public void handle(Message msg, ISerializable data){ - if (msg == Message.VALUE_TIMING_TILEENTS) - DataCache.instance().setTimingTileEntsTotal(((SerialDouble)data).value); + if (msg == Message.VALUE_TIMING_TILEENTS){ + SwingUI.instance().getPanelSummary().setTimingTileEntsTotal(((SerialDouble)data).value); + SwingUI.instance().getPanelTimingTileEnts().getLblSummary().setText(String.format("Total update time : %.3f µs", ((SerialDouble)data).value)); + } - else if (msg == Message.VALUE_TIMING_ENTITIES) - DataCache.instance().setTimingEntitiesTotal(((SerialDouble)data).value); + else if (msg == Message.VALUE_TIMING_ENTITIES){ + SwingUI.instance().getPanelSummary().setTimingEntitiesTotal(((SerialDouble)data).value); + SwingUI.instance().getPanelTimingEntities().getLblSummary().setText(String.format("Total update time : %.3f µs", ((SerialDouble)data).value)); + } - else if (msg == Message.VALUE_TIMING_HANDLERS) - DataCache.instance().setTimingHandlersTotal(((SerialDouble)data).value); + else if (msg == Message.VALUE_TIMING_HANDLERS){ + SwingUI.instance().getPanelSummary().setTimingHandlersTotal(((SerialDouble)data).value); + SwingUI.instance().getPanelTimingHandlers().getLblSummary().setText(String.format("Total update time : %.3f µs", ((SerialDouble)data).value)); + } - else if (msg == Message.VALUE_TIMING_WORLDTICK) - DataCache.instance().setTimingWorldTickTotal(((SerialDouble)data).value); + else if (msg == Message.VALUE_TIMING_WORLDTICK){ + SwingUI.instance().getPanelSummary().setTimingWorldTickTotal(((SerialDouble)data).value); + } else if (msg == Message.VALUE_TIMING_ENTUPDATE) - DataCache.instance().setTimingEntUpdateTotal(((SerialDouble)data).value); + SwingUI.instance().getPanelSummary().setTimingEntUpdateTotal(((SerialDouble)data).value); else if (msg == Message.VALUE_AMOUNT_TILEENTS) - DataCache.instance().setAmountTileEntsTotal(((SerialInt)data).value); + SwingUI.instance().getPanelSummary().setAmountTileEntsTotal(((SerialInt)data).value); else if (msg == Message.VALUE_AMOUNT_ENTITIES) - DataCache.instance().setAmountEntitiesTotal(((SerialInt)data).value); + SwingUI.instance().getPanelSummary().setAmountEntitiesTotal(((SerialInt)data).value); else if (msg == Message.VALUE_AMOUNT_HANDLERS) - DataCache.instance().setAmountHandlersTotal(((SerialInt)data).value); + SwingUI.instance().getPanelSummary().setAmountHandlersTotal(((SerialInt)data).value); else if (msg == Message.VALUE_TIMING_TICK) - DataCache.instance().setTimingTick(data); + SwingUI.instance().getPanelSummary().setTimingTick(data); - else if (msg == Message.VALUE_AMOUNT_UPLOAD) - DataCache.instance().setAmountUpload(((SerialLong)data).value); + else if (msg == Message.VALUE_AMOUNT_UPLOAD){ + SwingUI.instance().getPanelSummary().setAmountUpload(((SerialLong)data).value); + } - else if (msg == Message.VALUE_AMOUNT_DOWNLOAD) - DataCache.instance().setAmountDownload(((SerialLong)data).value); + else if (msg == Message.VALUE_AMOUNT_DOWNLOAD){ + SwingUI.instance().getPanelSummary().setAmountDownload(((SerialLong)data).value); + } else if (msg == Message.STATUS_START){ - SwingUI.instance().getPanelTimingChunks().getBtnRun().setText("Running..."); - SwingUI.instance().getPanelTimingHandlers().getBtnRun().setText("Running..."); - SwingUI.instance().getPanelTimingEntities().getBtnRun().setText("Running..."); - SwingUI.instance().getPanelTimingTileEnts().getBtnRun().setText("Running..."); - SwingUI.instance().getBtnSummaryRefresh().setText("Running..."); - - SwingUI.instance().getProgBarSummaryOpis().setValue(0); - SwingUI.instance().getProgBarSummaryOpis().setMinimum(0); - SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)data).value); + SwingUI.instance().setTextRunButton("Running..."); + SwingUI.instance().getPanelSummary().setProgressBar(0, ((SerialInt)data).value, 0); } else if (msg == Message.STATUS_STOP){ - SwingUI.instance().getPanelTimingChunks().getBtnRun().setText("Run Opis"); - SwingUI.instance().getPanelTimingHandlers().getBtnRun().setText("Run Opis"); - SwingUI.instance().getPanelTimingEntities().getBtnRun().setText("Run Opis"); - SwingUI.instance().getPanelTimingTileEnts().getBtnRun().setText("Run Opis"); - SwingUI.instance().getBtnSummaryRefresh().setText("Run Opis"); - - SwingUI.instance().getProgBarSummaryOpis().setValue(((SerialInt)data).value); - SwingUI.instance().getProgBarSummaryOpis().setMinimum(0); - SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)data).value); + SwingUI.instance().setTextRunButton("Run Opis"); + SwingUI.instance().getPanelSummary().setProgressBar(0, ((SerialInt)data).value, ((SerialInt)data).value); } else if (msg == Message.STATUS_RUN_UPDATE){ - SwingUI.instance().getProgBarSummaryOpis().setValue(((SerialInt)data).value); + SwingUI.instance().getPanelSummary().setProgressBar(-1, -1, ((SerialInt)data).value); } else if (msg == Message.STATUS_RUNNING){ - SwingUI.instance().getPanelTimingChunks().getBtnRun().setText("Running..."); - SwingUI.instance().getPanelTimingHandlers().getBtnRun().setText("Running..."); - SwingUI.instance().getPanelTimingEntities().getBtnRun().setText("Running..."); - SwingUI.instance().getPanelTimingTileEnts().getBtnRun().setText("Running..."); - SwingUI.instance().getBtnSummaryRefresh().setText("Running..."); - - SwingUI.instance().getProgBarSummaryOpis().setMaximum(((SerialInt)data).value); + SwingUI.instance().setTextRunButton("Running..."); + SwingUI.instance().getPanelSummary().setProgressBar(-1, ((SerialInt)data).value, -1); } else if (msg == Message.STATUS_CURRENT_TIME){ @@ -186,13 +176,13 @@ public class ClientMessageHandler { else if (msg == Message.STATUS_TIME_LAST_RUN){ long serverLastRun = ((SerialLong)data).value; if (serverLastRun == 0){ - SwingUI.instance().getLblSummaryTimeStampLastRun().setText("Last run : "); + SwingUI.instance().getPanelSummary().getLblTimeStamp().setText("Last run : "); } else { long clientLastRun = serverLastRun + DataCache.instance().getClockScrew(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date resultdate = new Date(clientLastRun); - SwingUI.instance().getLblSummaryTimeStampLastRun().setText(String.format("Last run : %s", sdf.format(resultdate))); + SwingUI.instance().getPanelSummary().getLblTimeStamp().setText(String.format("Last run : %s", sdf.format(resultdate))); } } @@ -203,15 +193,15 @@ public class ClientMessageHandler { else if(msg == Message.CLIENT_HIGHLIGHT_BLOCK){ modOpis.selectedBlock = (CoordinatesBlock)data; - SwingUI.instance().getBtnTimingTERemoveHighlight().setEnabled(true); + SwingUI.instance().getPanelTimingTileEnts().getBtnReset().setEnabled(true); } else if(msg == Message.VALUE_CHUNK_FORCED){ - SwingUI.instance().getLblSummaryForcedChunks().setText(String.valueOf(((SerialInt)data).value)); + SwingUI.instance().getPanelSummary().getLblAmountForced().setText(String.valueOf(((SerialInt)data).value)); } else if(msg == Message.VALUE_CHUNK_LOADED){ - SwingUI.instance().getLblSummaryLoadedChunks().setText(String.valueOf(((SerialInt)data).value)); + SwingUI.instance().getPanelSummary().getLblAmountLoaded().setText(String.valueOf(((SerialInt)data).value)); } } } diff --git a/mcp/mobius/opis/swing/PanelAmountEntities.java b/mcp/mobius/opis/swing/PanelAmountEntities.java index cad4310..8bf0cbe 100644 --- a/mcp/mobius/opis/swing/PanelAmountEntities.java +++ b/mcp/mobius/opis/swing/PanelAmountEntities.java @@ -2,6 +2,8 @@ package mcp.mobius.opis.swing; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import javax.swing.JPanel; @@ -17,7 +19,7 @@ import javax.swing.ListSelectionModel; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; -public class PanelAmountEntities extends JPanel implements ActionListener{ +public class PanelAmountEntities extends JPanel implements ActionListener, ItemListener{ private JTable table; private JCheckBox chckbxFilter; private JButtonAccess btnKillAll; @@ -32,6 +34,7 @@ public class PanelAmountEntities extends JPanel implements ActionListener{ chckbxFilter = new JCheckBox("Filter Entities"); add(chckbxFilter, "cell 0 0"); + chckbxFilter.addItemListener(this); btnKillAll = new JButtonAccess("Kill All", AccessLevel.PRIVILEGED); add(btnKillAll, "cell 1 0"); @@ -85,4 +88,7 @@ public class PanelAmountEntities extends JPanel implements ActionListener{ @Override public void actionPerformed(ActionEvent arg0) {} + + @Override + public void itemStateChanged(ItemEvent arg0) {} } diff --git a/mcp/mobius/opis/swing/PanelSummary.java b/mcp/mobius/opis/swing/PanelSummary.java index e69a3d5..03d2bcb 100644 --- a/mcp/mobius/opis/swing/PanelSummary.java +++ b/mcp/mobius/opis/swing/PanelSummary.java @@ -5,6 +5,8 @@ import java.awt.event.ActionListener; import javax.swing.JPanel; +import mcp.mobius.opis.data.holders.ISerializable; +import mcp.mobius.opis.data.holders.stats.StatsTick; import mcp.mobius.opis.network.enums.AccessLevel; import net.miginfocom.swing.MigLayout; @@ -169,4 +171,111 @@ public class PanelSummary extends JPanel implements ActionListener{ @Override public void actionPerformed(ActionEvent e) {} + + public void setProgressBar(int min, int max, int value){ + if (min != -1) + this.getProgressBarRun().setMinimum(min); + + if (max != -1) + this.getProgressBarRun().setMaximum(max); + + if (value != -1) + this.getProgressBarRun().setValue(value); + } + + public void setAmountUpload(long value){ + double uploadKB = (value / 8.0) / 1024.0; + this.getLblAmountUpload().setText(String.format("%.3f", uploadKB)); + } + + public void setAmountDownload(long value){ + double downloadKB = (value / 8.0) / 1024.0; + this.getLblAmountDownload().setText(String.format("%.3f", downloadKB)); + } + + private double timingWorldTickTotal; + private double timingHandlersTotal; + private double timingTileEntsTotal; + private double timingEntitiesTotal; + + public void setTimingWorldTickTotal(double value){ + this.timingWorldTickTotal = value; + this.getLblTimingWorldTick().setText(String.format("%.3f", value/1000.)); + this.getLblTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() )); + } + + public void setTimingEntUpdateTotal(double value){ + } + + public void setTimingHandlersTotal(double value){ + this.timingHandlersTotal = value; + this.getLblTimingHandlers().setText(String.format("%.3f", value/1000.)); + this.getLblTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() )); + } + public void setTimingEntitiesTotal(double value){ + this.timingEntitiesTotal = value; + this.getLblTimingEntities().setText(String.format("%.3f", value/1000.)); + this.getLblTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() )); + } + public void setTimingTileEntsTotal(double value){ + this.timingTileEntsTotal = value; + this.getLblTimingTileEnts().setText(String.format("%.3f", value/1000.)); + this.getLblTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() )); + } + + public void setAmountHandlersTotal(int value){ + this.getLblAmountHandlers().setText(String.valueOf(value)); + } + public void setAmountEntitiesTotal(int value){ + this.getLblAmountEntities().setText(String.valueOf(value)); + } + public void setAmountTileEntsTotal(int value){ + this.getLblAmountTileEnts().setText(String.valueOf(value)); + } + + public void setTimingTick(ISerializable tickStat){ + this.getLblTickTime().setText(String.valueOf(String.format("%.3f", ((StatsTick)tickStat).getGeometricMean()/1000.))); + + /* + if (timingTickGraphData.size() > 100) + timingTickGraphData.remove(0); + + timingTickGraphData.add(this.timingTick.getGeometricMean()/1000.); + //timingTickGraphData.addValue(this.timingTick.getGeometricMean()/1000.); + + XYSeries xyData = new XYSeries("Update time"); + + double maxValue = 0D; + for (int i = 0; i < timingTickGraphData.size(); i++){ + xyData.add(i, timingTickGraphData.get(i)); + } + + XYSeriesCollection dataset = new XYSeriesCollection(); + dataset.addSeries(xyData); + + JFreeChart chart = ChartFactory.createXYAreaChart("", "Seconds", "Update Time [ms]", dataset, PlotOrientation.VERTICAL, false, false, false); + chart.setBackgroundPaint(new Color(255,255,255,0)); + XYPlot xyPlot = chart.getXYPlot(); + xyPlot.getRendererForDataset(dataset).setSeriesPaint(0, Color.BLUE); + + for (double y = 25.0; y < 250.0; y += 25.0){ + ValueMarker marker = new ValueMarker(y); + marker.setPaint(Color.black); + xyPlot.addRangeMarker(marker); + } + + Double verticalScale = 50.0 * (MathHelper.floor_double(xyData.getMaxY() / 50.0D) + 1); + ((NumberAxis)xyPlot.getRangeAxis()).setRange(0.0, verticalScale); + + Dimension dim = SwingUI.instance().getLblSummaryTickChart().getSize(); + + BufferedImage image = chart.createBufferedImage(dim.width,dim.height); + SwingUI.instance().getLblSummaryTickChart().setIcon(new ImageIcon(image)); + */ + } + + private double getProfiledTickTotalTime(){ + return (timingWorldTickTotal + timingHandlersTotal + timingTileEntsTotal + timingEntitiesTotal)/1000.; + } + } diff --git a/mcp/mobius/opis/swing/SwingUI.java b/mcp/mobius/opis/swing/SwingUI.java index ed75643..5d86990 100644 --- a/mcp/mobius/opis/swing/SwingUI.java +++ b/mcp/mobius/opis/swing/SwingUI.java @@ -66,7 +66,7 @@ import javax.swing.JProgressBar; import net.miginfocom.swing.MigLayout; -public class SwingUI extends JFrame implements ActionListener, ItemListener, WindowListener{ +public class SwingUI extends JFrame implements WindowListener{ public static HashSet registeredButtons = new HashSet(); @@ -77,47 +77,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi private JPanel contentPane; - private JPanel panelSummary; - private JLabel lblSummary_3; - private JLabel lblSummary_4; - private JLabel lblSummary_5; - private JLabel lblSummary_6; - private JLabel lblSummaryTimingTileEnts; - private JLabel lblSummaryTimingHandlers; - private JLabel lblSummaryTimingEntities; - private JLabel lblSummaryTimingTotal; - private JLabel lblSummary_7; - private JLabel lblSummary_8; - private JLabel lblSummary_9; - private JLabel lblSummary_10; - private JLabel lblSummaryAmountTileEnts; - private JLabel lblSummaryAmountEntities; - private JLabel lblSummaryAmountHandlers; - private JLabel lblSummary_1; - private JLabel label; - private JButtonAccess btnSummaryRefresh; - private JLabel lblSummary_11; - private JLabel lblSummary_12; - private JLabel lblSummaryTimingTick; - private JLabel lblSummaryTickChart; - private JLabel lblSummary_13; - private JLabel lblSummaryTimingWorldTick; - private JLabel lblSummary_14; - private JLabel lblNewLabel; - private JLabel lblSummary_15; - private JLabel lblSummaryDownload; - private JLabel lblSummaryUpload; - private JLabel lblNewLabel_4; - private JLabel lblNewLabel_5; - private JLabel lblNewLabel_6; - private JProgressBar progBarSummaryOpis; - private JLabel lblSummaryTimeStampLastRun; - private JButton btnTimingTERemoveHighlight; - private JLabel lblSummary_16; - private JLabel lblSummary_17; - private JLabel lblSummaryForcedChunks; - private JLabel lblSummaryLoadedChunk; - + private PanelSummary panelSummary; private PanelPlayers panelPlayers; private PanelAmountEntities panelAmountEntities; private PanelTimingTileEnts panelTimingTileEnts; @@ -151,321 +111,10 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); contentPane.add(tabbedPane, BorderLayout.CENTER); - - panelSummary = new JPanel(); - tabbedPane.addTab("Summary", null, panelSummary, null); - GridBagLayout gbl_panelSummary = new GridBagLayout(); - gbl_panelSummary.columnWidths = new int[]{0, 50, 20, 0, 70, 0, 20, 50, 50, 0, 20, 70, 0, 0, 42, 0, 0}; - gbl_panelSummary.rowHeights = new int[]{0, -4, 0, 0, 0, 0, 20, 10, 30, 0, 0, 0, 0, 0}; - gbl_panelSummary.columnWeights = new double[]{0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, Double.MIN_VALUE}; - gbl_panelSummary.rowWeights = new double[]{0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, Double.MIN_VALUE}; - panelSummary.setLayout(gbl_panelSummary); - - lblSummary_1 = new JLabel("Update time"); - GridBagConstraints gbc_lblSummary_1 = new GridBagConstraints(); - gbc_lblSummary_1.anchor = GridBagConstraints.EAST; - gbc_lblSummary_1.gridwidth = 2; - gbc_lblSummary_1.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_1.gridx = 4; - gbc_lblSummary_1.gridy = 1; - panelSummary.add(lblSummary_1, gbc_lblSummary_1); - - label = new JLabel("Amount"); - GridBagConstraints gbc_label = new GridBagConstraints(); - gbc_label.anchor = GridBagConstraints.LINE_END; - gbc_label.insets = new Insets(0, 0, 5, 5); - gbc_label.gridx = 7; - gbc_label.gridy = 1; - panelSummary.add(label, gbc_label); - - lblNewLabel_6 = new JLabel("Amount"); - GridBagConstraints gbc_lblNewLabel_6 = new GridBagConstraints(); - gbc_lblNewLabel_6.anchor = GridBagConstraints.EAST; - gbc_lblNewLabel_6.gridwidth = 2; - gbc_lblNewLabel_6.insets = new Insets(0, 0, 5, 5); - gbc_lblNewLabel_6.gridx = 11; - gbc_lblNewLabel_6.gridy = 1; - panelSummary.add(lblNewLabel_6, gbc_lblNewLabel_6); - - btnSummaryRefresh = new JButtonAccess("Run Opis", AccessLevel.PRIVILEGED); - GridBagConstraints gbc_btnSummaryReset = new GridBagConstraints(); - gbc_btnSummaryReset.anchor = GridBagConstraints.EAST; - gbc_btnSummaryReset.insets = new Insets(0, 0, 5, 0); - gbc_btnSummaryReset.gridx = 15; - gbc_btnSummaryReset.gridy = 1; - btnSummaryRefresh.addActionListener(this); - panelSummary.add(btnSummaryRefresh, gbc_btnSummaryReset); - - lblSummary_13 = new JLabel("World Tick"); - lblSummary_13.setToolTipText("This is the world tick profiling.\nThe server will update the time, do random block ticks\nand this kind of things while inside this code part."); - GridBagConstraints gbc_lblSummary_13 = new GridBagConstraints(); - gbc_lblSummary_13.anchor = GridBagConstraints.LINE_START; - gbc_lblSummary_13.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_13.gridx = 1; - gbc_lblSummary_13.gridy = 2; - panelSummary.add(lblSummary_13, gbc_lblSummary_13); - - lblSummaryTimingWorldTick = new JLabel("0"); - GridBagConstraints gbc_lblSummaryTimingWorldTick = new GridBagConstraints(); - gbc_lblSummaryTimingWorldTick.anchor = GridBagConstraints.EAST; - gbc_lblSummaryTimingWorldTick.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryTimingWorldTick.gridx = 4; - gbc_lblSummaryTimingWorldTick.gridy = 2; - panelSummary.add(lblSummaryTimingWorldTick, gbc_lblSummaryTimingWorldTick); - - lblSummary_14 = new JLabel("ms"); - GridBagConstraints gbc_lblSummary_14 = new GridBagConstraints(); - gbc_lblSummary_14.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_14.gridx = 5; - gbc_lblSummary_14.gridy = 2; - panelSummary.add(lblSummary_14, gbc_lblSummary_14); - - lblNewLabel = new JLabel("Upload"); - GridBagConstraints gbc_lblNewLabel = new GridBagConstraints(); - gbc_lblNewLabel.anchor = GridBagConstraints.WEST; - gbc_lblNewLabel.insets = new Insets(0, 0, 5, 5); - gbc_lblNewLabel.gridx = 9; - gbc_lblNewLabel.gridy = 2; - panelSummary.add(lblNewLabel, gbc_lblNewLabel); - - lblSummaryUpload = new JLabel("0"); - GridBagConstraints gbc_lblSummaryUpload = new GridBagConstraints(); - gbc_lblSummaryUpload.anchor = GridBagConstraints.EAST; - gbc_lblSummaryUpload.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryUpload.gridx = 11; - gbc_lblSummaryUpload.gridy = 2; - panelSummary.add(lblSummaryUpload, gbc_lblSummaryUpload); - - lblNewLabel_4 = new JLabel("kB/s"); - GridBagConstraints gbc_lblNewLabel_4 = new GridBagConstraints(); - gbc_lblNewLabel_4.insets = new Insets(0, 0, 5, 5); - gbc_lblNewLabel_4.gridx = 12; - gbc_lblNewLabel_4.gridy = 2; - panelSummary.add(lblNewLabel_4, gbc_lblNewLabel_4); - - progBarSummaryOpis = new JProgressBar(); - GridBagConstraints gbc_progBarSummaryOpis = new GridBagConstraints(); - gbc_progBarSummaryOpis.fill = GridBagConstraints.HORIZONTAL; - gbc_progBarSummaryOpis.insets = new Insets(0, 0, 5, 0); - gbc_progBarSummaryOpis.gridx = 15; - gbc_progBarSummaryOpis.gridy = 2; - panelSummary.add(progBarSummaryOpis, gbc_progBarSummaryOpis); - - lblSummary_3 = new JLabel("Tile Entities"); - GridBagConstraints gbc_lblSummary_3 = new GridBagConstraints(); - gbc_lblSummary_3.anchor = GridBagConstraints.LINE_START; - gbc_lblSummary_3.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_3.gridx = 1; - gbc_lblSummary_3.gridy = 3; - panelSummary.add(lblSummary_3, gbc_lblSummary_3); - - lblSummaryTimingTileEnts = new JLabel("0"); - lblSummaryTimingTileEnts.setHorizontalAlignment(SwingConstants.CENTER); - GridBagConstraints gbc_lblSummaryTimingTileEnts = new GridBagConstraints(); - gbc_lblSummaryTimingTileEnts.anchor = GridBagConstraints.EAST; - gbc_lblSummaryTimingTileEnts.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryTimingTileEnts.gridx = 4; - gbc_lblSummaryTimingTileEnts.gridy = 3; - panelSummary.add(lblSummaryTimingTileEnts, gbc_lblSummaryTimingTileEnts); - - lblSummary_9 = new JLabel("ms"); - GridBagConstraints gbc_lblSummary_9 = new GridBagConstraints(); - gbc_lblSummary_9.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_9.gridx = 5; - gbc_lblSummary_9.gridy = 3; - panelSummary.add(lblSummary_9, gbc_lblSummary_9); - - lblSummaryAmountTileEnts = new JLabel("0"); - GridBagConstraints gbc_lblSummaryAmountTileEnts = new GridBagConstraints(); - gbc_lblSummaryAmountTileEnts.anchor = GridBagConstraints.LINE_END; - gbc_lblSummaryAmountTileEnts.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryAmountTileEnts.gridx = 7; - gbc_lblSummaryAmountTileEnts.gridy = 3; - panelSummary.add(lblSummaryAmountTileEnts, gbc_lblSummaryAmountTileEnts); - - lblSummary_15 = new JLabel("Download"); - GridBagConstraints gbc_lblSummary_15 = new GridBagConstraints(); - gbc_lblSummary_15.anchor = GridBagConstraints.WEST; - gbc_lblSummary_15.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_15.gridx = 9; - gbc_lblSummary_15.gridy = 3; - panelSummary.add(lblSummary_15, gbc_lblSummary_15); - - lblSummaryDownload = new JLabel("0"); - GridBagConstraints gbc_lblSummaryDownload = new GridBagConstraints(); - gbc_lblSummaryDownload.anchor = GridBagConstraints.EAST; - gbc_lblSummaryDownload.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryDownload.gridx = 11; - gbc_lblSummaryDownload.gridy = 3; - panelSummary.add(lblSummaryDownload, gbc_lblSummaryDownload); - - lblNewLabel_5 = new JLabel("kB/s"); - GridBagConstraints gbc_lblNewLabel_5 = new GridBagConstraints(); - gbc_lblNewLabel_5.insets = new Insets(0, 0, 5, 5); - gbc_lblNewLabel_5.gridx = 12; - gbc_lblNewLabel_5.gridy = 3; - panelSummary.add(lblNewLabel_5, gbc_lblNewLabel_5); - - lblSummaryTimeStampLastRun = new JLabel("Last run : Never"); - GridBagConstraints gbc_lblSummaryTimeStampLastRun = new GridBagConstraints(); - gbc_lblSummaryTimeStampLastRun.anchor = GridBagConstraints.EAST; - gbc_lblSummaryTimeStampLastRun.insets = new Insets(0, 0, 5, 0); - gbc_lblSummaryTimeStampLastRun.gridx = 15; - gbc_lblSummaryTimeStampLastRun.gridy = 3; - panelSummary.add(lblSummaryTimeStampLastRun, gbc_lblSummaryTimeStampLastRun); - - lblSummary_4 = new JLabel("Entities"); - GridBagConstraints gbc_lblSummary_4 = new GridBagConstraints(); - gbc_lblSummary_4.anchor = GridBagConstraints.WEST; - gbc_lblSummary_4.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_4.gridx = 1; - gbc_lblSummary_4.gridy = 4; - panelSummary.add(lblSummary_4, gbc_lblSummary_4); - - lblSummaryTimingEntities = new JLabel("0"); - GridBagConstraints gbc_lblSummaryTimingEntities = new GridBagConstraints(); - gbc_lblSummaryTimingEntities.anchor = GridBagConstraints.EAST; - gbc_lblSummaryTimingEntities.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryTimingEntities.gridx = 4; - gbc_lblSummaryTimingEntities.gridy = 4; - panelSummary.add(lblSummaryTimingEntities, gbc_lblSummaryTimingEntities); - - lblSummary_7 = new JLabel("ms"); - GridBagConstraints gbc_lblSummary_7 = new GridBagConstraints(); - gbc_lblSummary_7.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_7.gridx = 5; - gbc_lblSummary_7.gridy = 4; - panelSummary.add(lblSummary_7, gbc_lblSummary_7); - - lblSummaryAmountEntities = new JLabel("0"); - GridBagConstraints gbc_lblSummaryAmountEntities = new GridBagConstraints(); - gbc_lblSummaryAmountEntities.anchor = GridBagConstraints.LINE_END; - gbc_lblSummaryAmountEntities.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryAmountEntities.gridx = 7; - gbc_lblSummaryAmountEntities.gridy = 4; - panelSummary.add(lblSummaryAmountEntities, gbc_lblSummaryAmountEntities); - - lblSummary_5 = new JLabel("Handlers"); - lblSummary_5.setToolTipText("This is a generic profiling of server side tickhandlers.\nTickHandlers are a part of Forge and used by mods to do specific\nthings at the start and end of every tick."); - GridBagConstraints gbc_lblSummary_5 = new GridBagConstraints(); - gbc_lblSummary_5.anchor = GridBagConstraints.WEST; - gbc_lblSummary_5.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_5.gridx = 1; - gbc_lblSummary_5.gridy = 5; - panelSummary.add(lblSummary_5, gbc_lblSummary_5); - - lblSummaryTimingHandlers = new JLabel("0"); - GridBagConstraints gbc_lblSummaryTimingHandlers = new GridBagConstraints(); - gbc_lblSummaryTimingHandlers.anchor = GridBagConstraints.EAST; - gbc_lblSummaryTimingHandlers.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryTimingHandlers.gridx = 4; - gbc_lblSummaryTimingHandlers.gridy = 5; - panelSummary.add(lblSummaryTimingHandlers, gbc_lblSummaryTimingHandlers); - - lblSummary_8 = new JLabel("ms"); - GridBagConstraints gbc_lblSummary_8 = new GridBagConstraints(); - gbc_lblSummary_8.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_8.gridx = 5; - gbc_lblSummary_8.gridy = 5; - panelSummary.add(lblSummary_8, gbc_lblSummary_8); - - lblSummaryAmountHandlers = new JLabel("0"); - GridBagConstraints gbc_lblSummaryAmountHandlers = new GridBagConstraints(); - gbc_lblSummaryAmountHandlers.anchor = GridBagConstraints.LINE_END; - gbc_lblSummaryAmountHandlers.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryAmountHandlers.gridx = 7; - gbc_lblSummaryAmountHandlers.gridy = 5; - panelSummary.add(lblSummaryAmountHandlers, gbc_lblSummaryAmountHandlers); - - lblSummary_16 = new JLabel("Forced chunks"); - GridBagConstraints gbc_lblSummary_16 = new GridBagConstraints(); - gbc_lblSummary_16.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_16.gridx = 9; - gbc_lblSummary_16.gridy = 5; - panelSummary.add(lblSummary_16, gbc_lblSummary_16); - - lblSummaryForcedChunks = new JLabel("0"); - GridBagConstraints gbc_lblSummaryForcedChunks = new GridBagConstraints(); - gbc_lblSummaryForcedChunks.anchor = GridBagConstraints.EAST; - gbc_lblSummaryForcedChunks.gridwidth = 2; - gbc_lblSummaryForcedChunks.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryForcedChunks.gridx = 11; - gbc_lblSummaryForcedChunks.gridy = 5; - panelSummary.add(lblSummaryForcedChunks, gbc_lblSummaryForcedChunks); - - lblSummary_17 = new JLabel("Loaded chunks"); - GridBagConstraints gbc_lblSummary_17 = new GridBagConstraints(); - gbc_lblSummary_17.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_17.gridx = 9; - gbc_lblSummary_17.gridy = 6; - panelSummary.add(lblSummary_17, gbc_lblSummary_17); - - lblSummaryLoadedChunk = new JLabel("0"); - GridBagConstraints gbc_lblSummaryLoadedChunk = new GridBagConstraints(); - gbc_lblSummaryLoadedChunk.anchor = GridBagConstraints.EAST; - gbc_lblSummaryLoadedChunk.gridwidth = 2; - gbc_lblSummaryLoadedChunk.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryLoadedChunk.gridx = 11; - gbc_lblSummaryLoadedChunk.gridy = 6; - panelSummary.add(lblSummaryLoadedChunk, gbc_lblSummaryLoadedChunk); - - lblSummary_6 = new JLabel("Total"); - GridBagConstraints gbc_lblSummary_6 = new GridBagConstraints(); - gbc_lblSummary_6.anchor = GridBagConstraints.WEST; - gbc_lblSummary_6.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_6.gridx = 1; - gbc_lblSummary_6.gridy = 7; - panelSummary.add(lblSummary_6, gbc_lblSummary_6); - - lblSummaryTimingTotal = new JLabel("0"); - GridBagConstraints gbc_lblSummaryTimingTotal = new GridBagConstraints(); - gbc_lblSummaryTimingTotal.anchor = GridBagConstraints.EAST; - gbc_lblSummaryTimingTotal.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryTimingTotal.gridx = 4; - gbc_lblSummaryTimingTotal.gridy = 7; - panelSummary.add(lblSummaryTimingTotal, gbc_lblSummaryTimingTotal); - - lblSummary_10 = new JLabel("ms"); - GridBagConstraints gbc_lblSummary_10 = new GridBagConstraints(); - gbc_lblSummary_10.anchor = GridBagConstraints.WEST; - gbc_lblSummary_10.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_10.gridx = 5; - gbc_lblSummary_10.gridy = 7; - panelSummary.add(lblSummary_10, gbc_lblSummary_10); - - lblSummary_11 = new JLabel("Tick Time"); - GridBagConstraints gbc_lblSummary_11 = new GridBagConstraints(); - gbc_lblSummary_11.anchor = GridBagConstraints.WEST; - gbc_lblSummary_11.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_11.gridx = 1; - gbc_lblSummary_11.gridy = 9; - panelSummary.add(lblSummary_11, gbc_lblSummary_11); - - lblSummaryTimingTick = new JLabel("0"); - GridBagConstraints gbc_lblSummaryTimingTick = new GridBagConstraints(); - gbc_lblSummaryTimingTick.anchor = GridBagConstraints.EAST; - gbc_lblSummaryTimingTick.insets = new Insets(0, 0, 5, 5); - gbc_lblSummaryTimingTick.gridx = 4; - gbc_lblSummaryTimingTick.gridy = 9; - panelSummary.add(lblSummaryTimingTick, gbc_lblSummaryTimingTick); - - lblSummary_12 = new JLabel("ms"); - GridBagConstraints gbc_lblSummary_12 = new GridBagConstraints(); - gbc_lblSummary_12.anchor = GridBagConstraints.WEST; - gbc_lblSummary_12.insets = new Insets(0, 0, 5, 5); - gbc_lblSummary_12.gridx = 5; - gbc_lblSummary_12.gridy = 9; - panelSummary.add(lblSummary_12, gbc_lblSummary_12); - - lblSummaryTickChart = new JLabel(""); - GridBagConstraints gbc_lblSummaryTickChart = new GridBagConstraints(); - gbc_lblSummaryTickChart.fill = GridBagConstraints.BOTH; - gbc_lblSummaryTickChart.gridwidth = 16; - gbc_lblSummaryTickChart.gridx = 0; - gbc_lblSummaryTickChart.gridy = 12; - panelSummary.add(lblSummaryTickChart, gbc_lblSummaryTickChart); - + panelSummary = new PanelSummary(); + tabbedPane.addTab("Summary", null, panelSummary, null); + panelPlayers = new PanelPlayers(); tabbedPane.addTab("Players", null, panelPlayers, null); @@ -487,56 +136,6 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi this.addWindowListener(this); } - public JLabel getLblSummaryTimingTileEnts() { - return lblSummaryTimingTileEnts; - } - public JLabel getLblSummaryAmountTileEnts() { - return lblSummaryAmountTileEnts; - } - public JLabel getLblSummaryTimingEntities() { - return lblSummaryTimingEntities; - } - public JLabel getLblSummaryAmountEntities() { - return lblSummaryAmountEntities; - } - public JLabel getLblSummaryTimingHandlers() { - return lblSummaryTimingHandlers; - } - public JLabel getLblSummaryAmountHandlers() { - return lblSummaryAmountHandlers; - } - public JLabel getLblSummaryTimingTotal() { - return lblSummaryTimingTotal; - } - public JLabel getLblSummaryTimingTick() { - return lblSummaryTimingTick; - } - public JLabel getLblSummaryTickChart() { - return lblSummaryTickChart; - } - public JLabel getLblSummaryTimingWorldTick() { - return lblSummaryTimingWorldTick; - } - public JLabel getLblSummaryUpload() { - return lblSummaryUpload; - } - public JLabel getLblSummaryDownload() { - return lblSummaryDownload; - } - - public JButton getBtnSummaryRefresh() { - return btnSummaryRefresh; - } - - @Override - public void actionPerformed(ActionEvent e) { - - } - - @Override - public void itemStateChanged(ItemEvent e) { - } - @Override public void windowActivated(WindowEvent arg0) {} @@ -559,23 +158,6 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi @Override public void windowOpened(WindowEvent arg0) {} - - public JProgressBar getProgBarSummaryOpis() { - return progBarSummaryOpis; - } - - public JLabel getLblSummaryTimeStampLastRun() { - return lblSummaryTimeStampLastRun; - } - public JButton getBtnTimingTERemoveHighlight() { - return btnTimingTERemoveHighlight; - } - public JLabel getLblSummaryForcedChunks() { - return lblSummaryForcedChunks; - } - public JLabel getLblSummaryLoadedChunks() { - return lblSummaryLoadedChunk; - } public PanelTimingChunks getPanelTimingChunks() { @@ -596,4 +178,15 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener, Wi public PanelPlayers getPanelPlayers() { return panelPlayers; } + public PanelSummary getPanelSummary() { + return panelSummary; + } + + public void setTextRunButton(String s){ + this.getPanelSummary().getBtnRun().setText(s); + this.getPanelTimingTileEnts().getBtnRun().setText(s); + this.getPanelTimingEntities().getBtnRun().setText(s); + this.getPanelTimingHandlers().getBtnRun().setText(s); + this.getPanelTimingChunks().getBtnRun().setText(s); + } }