diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..0907065
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,9 @@
+{
+ "ExpandedNodes": [
+ "",
+ "\\ArmoredVehicle",
+ "\\ArmoredVehicle\\src"
+ ],
+ "SelectedNode": "\\ArmoredVehicle\\src\\PolimorphClass.java",
+ "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index ab0c3bf..5592d42 100644
Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ
diff --git a/ArmoredVehicle/src/FormArmoredVehicleConfig.form b/ArmoredVehicle/src/FormArmoredVehicleConfig.form
index 144e564..106c6d6 100644
--- a/ArmoredVehicle/src/FormArmoredVehicleConfig.form
+++ b/ArmoredVehicle/src/FormArmoredVehicleConfig.form
@@ -29,8 +29,21 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -38,8 +51,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -53,9 +76,7 @@
-
-
@@ -67,10 +88,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -92,13 +135,35 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
@@ -139,10 +204,36 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -150,7 +241,23 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,9 +268,309 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ArmoredVehicle/src/FormArmoredVehicleConfig.java b/ArmoredVehicle/src/FormArmoredVehicleConfig.java
index 30817ac..5524039 100644
--- a/ArmoredVehicle/src/FormArmoredVehicleConfig.java
+++ b/ArmoredVehicle/src/FormArmoredVehicleConfig.java
@@ -36,6 +36,24 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame {
SpinnerWeight = new javax.swing.JSpinner();
panelColors = new java.awt.Panel();
labelColors = new java.awt.Label();
+ PanelRed = new javax.swing.JPanel();
+ PanelGray = new javax.swing.JPanel();
+ PanelBlack = new javax.swing.JPanel();
+ PanelOrange = new javax.swing.JPanel();
+ PanelPink = new javax.swing.JPanel();
+ PanelGreen = new javax.swing.JPanel();
+ PanelBlue = new javax.swing.JPanel();
+ PanelYellow = new javax.swing.JPanel();
+ LabelCountRollers = new javax.swing.JLabel();
+ ComboBoxCountRollers = new javax.swing.JComboBox<>();
+ LabelModify = new javax.swing.JLabel();
+ LabelSimple = new javax.swing.JLabel();
+ panelObject = new java.awt.Panel();
+ LabelDopColor = new javax.swing.JLabel();
+ LabelColor = new javax.swing.JLabel();
+ panelDraw = new java.awt.Panel();
+ buttonAdd = new java.awt.Button();
+ buttonCancel = new java.awt.Button();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
@@ -52,22 +70,172 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame {
labelColors.setText("Цвета");
+ PanelRed.setBackground(java.awt.Color.red);
+
+ javax.swing.GroupLayout PanelRedLayout = new javax.swing.GroupLayout(PanelRed);
+ PanelRed.setLayout(PanelRedLayout);
+ PanelRedLayout.setHorizontalGroup(
+ PanelRedLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 45, Short.MAX_VALUE)
+ );
+ PanelRedLayout.setVerticalGroup(
+ PanelRedLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 37, Short.MAX_VALUE)
+ );
+
+ PanelGray.setBackground(java.awt.Color.gray);
+
+ javax.swing.GroupLayout PanelGrayLayout = new javax.swing.GroupLayout(PanelGray);
+ PanelGray.setLayout(PanelGrayLayout);
+ PanelGrayLayout.setHorizontalGroup(
+ PanelGrayLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 39, Short.MAX_VALUE)
+ );
+ PanelGrayLayout.setVerticalGroup(
+ PanelGrayLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 37, Short.MAX_VALUE)
+ );
+
+ PanelBlack.setBackground(java.awt.Color.black);
+
+ javax.swing.GroupLayout PanelBlackLayout = new javax.swing.GroupLayout(PanelBlack);
+ PanelBlack.setLayout(PanelBlackLayout);
+ PanelBlackLayout.setHorizontalGroup(
+ PanelBlackLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 0, Short.MAX_VALUE)
+ );
+ PanelBlackLayout.setVerticalGroup(
+ PanelBlackLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 0, Short.MAX_VALUE)
+ );
+
+ PanelOrange.setBackground(java.awt.Color.orange);
+
+ javax.swing.GroupLayout PanelOrangeLayout = new javax.swing.GroupLayout(PanelOrange);
+ PanelOrange.setLayout(PanelOrangeLayout);
+ PanelOrangeLayout.setHorizontalGroup(
+ PanelOrangeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 39, Short.MAX_VALUE)
+ );
+ PanelOrangeLayout.setVerticalGroup(
+ PanelOrangeLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 39, Short.MAX_VALUE)
+ );
+
+ PanelPink.setBackground(java.awt.Color.pink);
+
+ javax.swing.GroupLayout PanelPinkLayout = new javax.swing.GroupLayout(PanelPink);
+ PanelPink.setLayout(PanelPinkLayout);
+ PanelPinkLayout.setHorizontalGroup(
+ PanelPinkLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 39, Short.MAX_VALUE)
+ );
+ PanelPinkLayout.setVerticalGroup(
+ PanelPinkLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 0, Short.MAX_VALUE)
+ );
+
+ PanelGreen.setBackground(java.awt.Color.green);
+
+ javax.swing.GroupLayout PanelGreenLayout = new javax.swing.GroupLayout(PanelGreen);
+ PanelGreen.setLayout(PanelGreenLayout);
+ PanelGreenLayout.setHorizontalGroup(
+ PanelGreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 39, Short.MAX_VALUE)
+ );
+ PanelGreenLayout.setVerticalGroup(
+ PanelGreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 0, Short.MAX_VALUE)
+ );
+
+ PanelBlue.setBackground(java.awt.Color.blue);
+
+ javax.swing.GroupLayout PanelBlueLayout = new javax.swing.GroupLayout(PanelBlue);
+ PanelBlue.setLayout(PanelBlueLayout);
+ PanelBlueLayout.setHorizontalGroup(
+ PanelBlueLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 39, Short.MAX_VALUE)
+ );
+ PanelBlueLayout.setVerticalGroup(
+ PanelBlueLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 0, Short.MAX_VALUE)
+ );
+
+ PanelYellow.setBackground(java.awt.Color.yellow);
+
+ javax.swing.GroupLayout PanelYellowLayout = new javax.swing.GroupLayout(PanelYellow);
+ PanelYellow.setLayout(PanelYellowLayout);
+ PanelYellowLayout.setHorizontalGroup(
+ PanelYellowLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 39, Short.MAX_VALUE)
+ );
+ PanelYellowLayout.setVerticalGroup(
+ PanelYellowLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 0, Short.MAX_VALUE)
+ );
+
+ label2.setText("label2");
+
javax.swing.GroupLayout panelColorsLayout = new javax.swing.GroupLayout(panelColors);
panelColors.setLayout(panelColorsLayout);
panelColorsLayout.setHorizontalGroup(
panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelColorsLayout.createSequentialGroup()
- .addGap(22, 22, 22)
- .addComponent(labelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(166, Short.MAX_VALUE))
+ .addContainerGap()
+ .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelColorsLayout.createSequentialGroup()
+ .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(PanelOrange, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(PanelBlack, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGap(18, 18, 18)
+ .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addGroup(panelColorsLayout.createSequentialGroup()
+ .addComponent(PanelGray, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(PanelRed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(panelColorsLayout.createSequentialGroup()
+ .addComponent(PanelYellow, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(PanelGreen, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(PanelPink, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(PanelBlue, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(labelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(28, Short.MAX_VALUE))
);
panelColorsLayout.setVerticalGroup(
panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelColorsLayout.createSequentialGroup()
.addComponent(labelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 130, Short.MAX_VALUE))
+ .addGap(20, 20, 20)
+ .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(PanelRed, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(PanelBlack, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(PanelPink, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(PanelGray, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(panelColorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(PanelOrange, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(PanelGreen, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(PanelBlue, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(PanelYellow, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGap(0, 62, Short.MAX_VALUE))
);
+ label1.setText("label1");
+
+ LabelCountRollers.setText("Количество катков");
+
+ ComboBoxCountRollers.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "4", "5", "6" }));
+
+ LabelModify.setText("Продвинутый");
+ LabelModify.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
+
+ LabelSimple.setText("Простой");
+ LabelSimple.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
+
javax.swing.GroupLayout panelParamsLayout = new javax.swing.GroupLayout(panelParams);
panelParams.setLayout(panelParamsLayout);
panelParamsLayout.setHorizontalGroup(
@@ -75,9 +243,7 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame {
.addGroup(panelParamsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(checkboxGun, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(checkboxTower, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGroup(panelParamsLayout.createSequentialGroup()
.addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(labelSpeed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -85,10 +251,26 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(SpinnerWeight, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(SpinnerSpeed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
- .addGap(21, 21, 21)
- .addComponent(panelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(145, Short.MAX_VALUE))
+ .addComponent(SpinnerSpeed, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addGroup(panelParamsLayout.createSequentialGroup()
+ .addComponent(LabelCountRollers)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(ComboBoxCountRollers, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(checkboxTower, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(checkboxGun, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelParamsLayout.createSequentialGroup()
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelColors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(panelParamsLayout.createSequentialGroup()
+ .addGap(115, 115, 115)
+ .addComponent(LabelModify, javax.swing.GroupLayout.PREFERRED_SIZE, 87, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelParamsLayout.createSequentialGroup()
+ .addGap(227, 227, 227)
+ .addComponent(LabelSimple, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(159, Short.MAX_VALUE)))
);
panelParamsLayout.setVerticalGroup(
panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -106,28 +288,115 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame {
.addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(labelWeight, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(SpinnerWeight, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(20, 20, 20)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(LabelCountRollers)
+ .addComponent(ComboBoxCountRollers, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(40, 40, 40)))
+ .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelParamsLayout.createSequentialGroup()
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkboxTower, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(checkboxGun, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addContainerGap(116, Short.MAX_VALUE))
+ .addComponent(checkboxGun, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(59, 59, 59))
+ .addGroup(panelParamsLayout.createSequentialGroup()
+ .addGap(20, 20, 20)
+ .addComponent(LabelModify, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .addGroup(panelParamsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelParamsLayout.createSequentialGroup()
+ .addContainerGap(216, Short.MAX_VALUE)
+ .addComponent(LabelSimple, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(68, 68, 68)))
);
+ LabelDopColor.setText("Доп. цвет");
+ LabelDopColor.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
+
+ LabelColor.setText("Цвет");
+ LabelColor.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0)));
+
+ javax.swing.GroupLayout panelDrawLayout = new javax.swing.GroupLayout(panelDraw);
+ panelDraw.setLayout(panelDrawLayout);
+ panelDrawLayout.setHorizontalGroup(
+ panelDrawLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 0, Short.MAX_VALUE)
+ );
+ panelDrawLayout.setVerticalGroup(
+ panelDrawLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 177, Short.MAX_VALUE)
+ );
+
+ javax.swing.GroupLayout panelObjectLayout = new javax.swing.GroupLayout(panelObject);
+ panelObject.setLayout(panelObjectLayout);
+ panelObjectLayout.setHorizontalGroup(
+ panelObjectLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelObjectLayout.createSequentialGroup()
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(LabelDopColor, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(60, 60, 60))
+ .addGroup(panelObjectLayout.createSequentialGroup()
+ .addGap(20, 20, 20)
+ .addComponent(panelDraw, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap())
+ .addGroup(panelObjectLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelObjectLayout.createSequentialGroup()
+ .addGap(42, 42, 42)
+ .addComponent(LabelColor, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(157, Short.MAX_VALUE)))
+ );
+ panelObjectLayout.setVerticalGroup(
+ panelObjectLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelObjectLayout.createSequentialGroup()
+ .addGap(15, 15, 15)
+ .addComponent(LabelDopColor, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelDraw, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap())
+ .addGroup(panelObjectLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelObjectLayout.createSequentialGroup()
+ .addGap(16, 16, 16)
+ .addComponent(LabelColor, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(196, Short.MAX_VALUE)))
+ );
+
+ buttonAdd.setLabel("Добавить");
+
+ buttonCancel.setLabel("Отмена");
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
- .addComponent(panelParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(139, Short.MAX_VALUE))
+ .addComponent(panelParams, javax.swing.GroupLayout.PREFERRED_SIZE, 420, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(panelObject, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap())
+ .addGroup(layout.createSequentialGroup()
+ .addGap(10, 10, 10)
+ .addComponent(buttonAdd, javax.swing.GroupLayout.PREFERRED_SIZE, 69, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(42, 42, 42)
+ .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 70, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(85, Short.MAX_VALUE))))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
- .addComponent(panelParams, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addContainerGap())
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(panelObject, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(buttonAdd, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(panelParams, javax.swing.GroupLayout.PREFERRED_SIZE, 268, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
pack();
@@ -169,16 +438,36 @@ public class FormArmoredVehicleConfig extends javax.swing.JFrame {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JComboBox ComboBoxCountRollers;
+ private javax.swing.JLabel LabelColor;
+ private javax.swing.JLabel LabelCountRollers;
+ private javax.swing.JLabel LabelDopColor;
+ private javax.swing.JLabel LabelModify;
+ private javax.swing.JLabel LabelSimple;
+ private javax.swing.JPanel PanelBlack;
+ private javax.swing.JPanel PanelBlue;
+ private javax.swing.JPanel PanelGray;
+ private javax.swing.JPanel PanelGreen;
+ private javax.swing.JPanel PanelOrange;
+ private javax.swing.JPanel PanelPink;
+ private javax.swing.JPanel PanelRed;
+ private javax.swing.JPanel PanelYellow;
private javax.swing.JSpinner SpinnerSpeed;
private javax.swing.JSpinner SpinnerWeight;
+ private java.awt.Button buttonAdd;
+ private java.awt.Button buttonCancel;
private java.awt.Checkbox checkboxGun;
private java.awt.Checkbox checkboxTower;
private java.awt.Choice choice1;
+ private java.awt.Label label1;
+ private java.awt.Label label2;
private java.awt.Label labelColors;
private java.awt.Label labelParams;
private java.awt.Label labelSpeed;
private java.awt.Label labelWeight;
private java.awt.Panel panelColors;
+ private java.awt.Panel panelDraw;
+ private java.awt.Panel panelObject;
private java.awt.Panel panelParams;
// End of variables declaration//GEN-END:variables
}