diff --git a/src/tauargus/gui/DialogSpecifyTablesMicro.form b/src/tauargus/gui/DialogSpecifyTablesMicro.form index 1cb4ae1..72df605 100644 --- a/src/tauargus/gui/DialogSpecifyTablesMicro.form +++ b/src/tauargus/gui/DialogSpecifyTablesMicro.form @@ -80,12 +80,13 @@ - + - - - + + + + diff --git a/src/tauargus/gui/DialogSpecifyTablesMicro.java b/src/tauargus/gui/DialogSpecifyTablesMicro.java index 0b23a19..e648546 100644 --- a/src/tauargus/gui/DialogSpecifyTablesMicro.java +++ b/src/tauargus/gui/DialogSpecifyTablesMicro.java @@ -1688,11 +1688,12 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(panelParameters, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(scrollPaneTables, javax.swing.GroupLayout.DEFAULT_SIZE, 113, Short.MAX_VALUE) + .addComponent(scrollPaneTables, javax.swing.GroupLayout.DEFAULT_SIZE, 102, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(buttonComputeTables) - .addComponent(buttonCancel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(buttonComputeTables, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(buttonCancel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); panelExplanatoryVariables.getAccessibleContext().setAccessibleName("Explanatory variables"); diff --git a/src/tauargus/gui/PanelTable.form b/src/tauargus/gui/PanelTable.form index 0646209..c691b3e 100644 --- a/src/tauargus/gui/PanelTable.form +++ b/src/tauargus/gui/PanelTable.form @@ -68,7 +68,7 @@ - + @@ -136,8 +136,9 @@ - + + @@ -805,21 +806,19 @@ - - - - - - - - + + + + + + - + - + @@ -841,7 +840,7 @@ - + @@ -974,12 +973,12 @@ - + - + - + diff --git a/src/tauargus/gui/PanelTable.java b/src/tauargus/gui/PanelTable.java index 9d66930..ece5469 100644 --- a/src/tauargus/gui/PanelTable.java +++ b/src/tauargus/gui/PanelTable.java @@ -274,7 +274,7 @@ public java.awt.Component getTableCellRendererComponent(javax.swing.JTable table } setForeground(cell.status.getForegroundColor()); - if (!(checkBoxCKMView.isEnabled() && checkBoxCKMView.isSelected())){ + if (!(checkBoxColoredView.isEnabled() && checkBoxColoredView.isSelected())){ setBackground(getBackgroundColor(cell, getRowCode(rowIndex))); } else{ @@ -665,8 +665,8 @@ public void updateSuppressButtons() { } boolean b = (s == TableSet.SUP_CKM || s == TableSet.SUP_NO); - checkBoxCKMView.setEnabled(b); - if (!b) checkBoxCKMView.setSelected(false); + checkBoxColoredView.setEnabled(b); + if (!b) checkBoxColoredView.setSelected(false); b = (s == TableSet.SUP_ROUNDING) || (s == TableSet.SUP_CTA) || (s == TableSet.SUP_CKM); checkBoxOutputView.setEnabled(!b); @@ -894,7 +894,7 @@ private void initComponents() { comboBoxDecimals = new javax.swing.JComboBox(); checkBoxOutputView = new javax.swing.JCheckBox(); checkBoxThousandSeparator = new javax.swing.JCheckBox(); - checkBoxCKMView = new javax.swing.JCheckBox(); + checkBoxColoredView = new javax.swing.JCheckBox(); table.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -1330,10 +1330,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { } }); - checkBoxCKMView.setText("Difference view"); - checkBoxCKMView.addActionListener(new java.awt.event.ActionListener() { + checkBoxColoredView.setText("Colored view"); + checkBoxColoredView.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { - checkBoxCKMViewActionPerformed(evt); + checkBoxColoredViewActionPerformed(evt); } }); @@ -1357,18 +1357,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(LabelNrOfVertLevels) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addComponent(comboBoxNrOfVertLevels, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE))) - .addGap(0, 0, Short.MAX_VALUE) - .addGroup(panelBottomButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(panelBottomButtonsLayout.createSequentialGroup() - .addComponent(labelDecimals) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(comboBoxDecimals, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addGroup(panelBottomButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(labelDecimals) .addComponent(checkBoxThousandSeparator)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(comboBoxDecimals, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(18, 18, 18) .addGroup(panelBottomButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(checkBoxCKMView) + .addComponent(checkBoxColoredView) .addComponent(checkBoxOutputView)) - .addGap(3, 3, 3)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); panelBottomButtonsLayout.setVerticalGroup( panelBottomButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -1387,7 +1386,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addComponent(LabelNrOfVertLevels) .addComponent(comboBoxNrOfVertLevels, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(checkBoxThousandSeparator) - .addComponent(checkBoxCKMView)) + .addComponent(checkBoxColoredView)) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -1434,7 +1433,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(scrollPane) - .addGroup(layout.createSequentialGroup() + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addComponent(panelBottomButtons, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, Short.MAX_VALUE))) .addGap(18, 18, 18) @@ -1487,8 +1486,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() .addComponent(scrollPane) - .addGap(18, 18, 18) - .addComponent(panelBottomButtons, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) + .addComponent(panelBottomButtons, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(7, 7, 7)) .addGroup(layout.createSequentialGroup() .addComponent(panelCellInformation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) @@ -2143,10 +2143,10 @@ private void radioButtonCellKeyActionPerformed(java.awt.event.ActionEvent evt) { updateSuppressButtons(); }//GEN-LAST:event_radioButtonCellKeyActionPerformed - private void checkBoxCKMViewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkBoxCKMViewActionPerformed + private void checkBoxColoredViewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkBoxColoredViewActionPerformed ((AbstractTableModel)table.getModel()).fireTableDataChanged(); adjustColumnWidths(); - }//GEN-LAST:event_checkBoxCKMViewActionPerformed + }//GEN-LAST:event_checkBoxColoredViewActionPerformed private void organiseSafetyButtons(CellStatus status) { if (status.isEmpty()) { @@ -2218,7 +2218,7 @@ private void organiseSafetyButtons(CellStatus status) { private javax.swing.JButton buttonTableSummary; private javax.swing.JButton buttonUndoSuppress; private javax.swing.JButton buttonUnsafe; - private javax.swing.JCheckBox checkBoxCKMView; + private javax.swing.JCheckBox checkBoxColoredView; private javax.swing.JCheckBox checkBoxInverseWeight; private javax.swing.JCheckBox checkBoxOutputView; private javax.swing.JCheckBox checkBoxThousandSeparator;