4 Commits

Author SHA1 Message Date
d6544b387a Upload 2024-05-19 23:35:14 +04:00
0020757f27 Лабораторная работа №4 2024-05-05 23:23:53 +04:00
7b7d2bb3a3 Лабораторная работа №3 2024-05-05 22:07:16 +04:00
4c5819779a Not Done 2024-05-05 21:09:02 +04:00
17 changed files with 14 additions and 17 deletions

View File

@@ -6,14 +6,10 @@
<component name="ChangeListManager">
<list default="true" id="39e7c520-e505-4e53-a269-c949d7c9f5d1" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/CountWheels.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/DirectionType.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/DrawingField.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/DrawingModernMonorail.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/DrawingWheels.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/EntityModernMonorail.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/FormModernMonorail.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Program.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/AdditionalCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/AdditionalCollection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/StorageCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/CollectionGenericObjects/StorageCollection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/Forms/FormAdditionalCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Forms/FormAdditionalCollection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Scripts/Forms/FormMonorailCollection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Scripts/Forms/FormMonorailCollection.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -23,6 +19,7 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Interface" />
<option value="Class" />
</list>
</option>
@@ -44,8 +41,9 @@
"Application.Program.executor": "Run",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "LabWorking__2",
"kotlin-language-version-configured": "true"
"git-widget-placeholder": "LabWorking__4",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "C:/Учеба/AgarioGame"
}
}]]></component>
<component name="RunManager">
@@ -61,7 +59,6 @@
<attachedChunks>
<set>
<option value="jdk-21.0.2-openjdk-21.0.2-4caba194b151-4f524021" />
<option value="jdk-22-openjdk-22-3183f394aec4-bad0321e" />
</set>
</attachedChunks>
</component>

View File

@@ -44,7 +44,7 @@ public class AdditionalCollection <T extends EntityMonorail, U extends IDrawingW
}
return -1;
}
public DrawingMonorail CreateAdditionalCollectionMonorail() {
public DrawingMonorail CreateAdditionalCollectionStormtrooper() {
Random random = new Random();
if (CollectionEntity == null || CollectionWheels == null) return null;
T entity = CollectionEntity[random.nextInt(CountEntities)];

View File

@@ -24,7 +24,7 @@ public class FormAdditionalCollection extends JFrame {
private JButton buttonGenerate = new JButton("Создать");
private JButton buttonGoToCollection = new JButton("В коллекцию");
private JList<String> listEntity = new JList<String>();
private JList<String> listWheels = new JList<String>();
private JList<String> listEngines = new JList<String>();
public FormAdditionalCollection() {
setTitle("Случайные монорельсы");
setMinimumSize(new Dimension(970,310));
@@ -45,7 +45,7 @@ public class FormAdditionalCollection extends JFrame {
buttonGenerate.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
_drawingMonorail = _additionalCollection.CreateAdditionalCollectionMonorail();
_drawingMonorail = _additionalCollection.CreateAdditionalCollectionStormtrooper();
_drawingMonorail.SetPictureSize(getWidth(), getHeight());
_drawingMonorail.SetPosition(360,30);
_canvasMonorail._drawingMonorail = _drawingMonorail;
@@ -60,11 +60,11 @@ public class FormAdditionalCollection extends JFrame {
buttonGoToCollection.setBounds(830,200,120,60);
buttonGenerate.setBounds(830, 130, 120, 60);
listEntity.setBounds(10,200,400,60);
listWheels.setBounds(420,200,400,60);
listEngines.setBounds(420,200,400,60);
add(buttonGenerate);
add(buttonGoToCollection);
add(listEntity);
add(listWheels);
add(listEngines);
add(_canvasMonorail);
setVisible(true);
}
@@ -128,6 +128,6 @@ public class FormAdditionalCollection extends JFrame {
data2[i] = ToString(wheels);
}
listEntity.setListData(data1);
listWheels.setListData(data2);
listEngines.setListData(data2);
}
}