hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed broken scrolling panel in custom expressions list.

Browse Source
This commit is contained in:
Richard Graham 2012-09-12 07:32:58 +00:00
parent efe18d33ea
commit 3fea838fab
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java
View File

@ -46,14 +46,14 @@ public class CustomExpressionPanel extends JPanel {
expressionSelectorPanel = new JPanel(new MigLayout("gapy rel")); expressionSelectorPanel = new JPanel(new MigLayout("gapy rel"));
expressionSelectorPanel.setToolTipText(trans.get("customExpressionPanel.lbl.CalcNote")); expressionSelectorPanel.setToolTipText(trans.get("customExpressionPanel.lbl.CalcNote"));
JScrollPane scroll = new JScrollPane(); JScrollPane scroll = new JScrollPane(expressionSelectorPanel);
Border bdr = BorderFactory.createTitledBorder(trans.get("customExpressionPanel.lbl.CustomExpressions"));
//Border bdr = BorderFactory.createTitledBorder(trans.get("customExpressionPanel.lbl.CustomExpressions"));
expressionSelectorPanel.setBorder(bdr); //scroll.setBorder(bdr);
expressionSelectorPanel.add(scroll); //expressionSelectorPanel.add(scroll);
//this.add(expressionSelectorPanel, "spany 1, height 10px, wmin 600lp, grow 100, gapright para"); //this.add(expressionSelectorPanel, "spany 1, height 10px, wmin 600lp, grow 100, gapright para");
this.add(expressionSelectorPanel, "hmin 200lp, wmin 700lp, grow 100, wrap"); this.add(scroll, "hmin 200lp, wmin 700lp, grow 100, wrap");
//DescriptionArea desc = new DescriptionArea(trans.get("customExpressionPanel.lbl.UpdateNote")+"\n\n"+trans.get("customExpressionPanel.lbl.CalcNote"), 8, -2f); //DescriptionArea desc = new DescriptionArea(trans.get("customExpressionPanel.lbl.UpdateNote")+"\n\n"+trans.get("customExpressionPanel.lbl.CalcNote"), 8, -2f);
//desc.setViewportBorder(BorderFactory.createEmptyBorder()); //desc.setViewportBorder(BorderFactory.createEmptyBorder());

13
core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
View File

@ -7,6 +7,8 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.Vector; import java.util.Vector;
import javax.swing.JTable; import javax.swing.JTable;
@ -28,7 +30,7 @@ public class VariableTableModel extends AbstractTableModel {
private static final Translator trans = Application.getTranslator(); private static final Translator trans = Application.getTranslator();
private ArrayList<FlightDataType> types = new ArrayList<FlightDataType>(); private List<FlightDataType> types; // = new ArrayList<FlightDataType>();
private static final String[] columnNames = {trans.get("customExpression.Name"), trans.get("customExpression.Symbol"), trans.get("customExpression.Units")}; private static final String[] columnNames = {trans.get("customExpression.Name"), trans.get("customExpression.Symbol"), trans.get("customExpression.Units")};
/* /*
@ -36,11 +38,12 @@ public class VariableTableModel extends AbstractTableModel {
*/ */
public VariableTableModel(OpenRocketDocument doc){ public VariableTableModel(OpenRocketDocument doc){
Collections.addAll(types, FlightDataType.ALL_TYPES); types = new ArrayList<FlightDataType>( doc.getFlightDataTypes() );
for (CustomExpression expression : doc.getCustomExpressions()){ //Collections.addAll(types, FlightDataType.ALL_TYPES);
types.add(expression.getType()); //for (CustomExpression expression : doc.getCustomExpressions()){
} // types.add(expression.getType());
//}
} }
@Override @Override