oami / lleakres (public) (License: Unspecified) (since 2022-03-17) (hash sha1)
No description available
Clone URLs: https://rocketgit.com/user/oami/lleakres ssh://rocketgit@ssh.rocketgit.com/user/oami/lleakres git://git.rocketgit.com/user/oami/lleakres
master
List of commits:
Subject Hash Author Date (UTC)
TimeMenu - реализованы кнопки "очистить выбор", "выбрать всё". 684d7c56012361a388ffe2210ec0b7e425ebcd8d AnMikhaylova 2022-04-05 11:15:49
Переименован класс ChanProf из пакета channel для избежания конфликта имён. Добавлен пробный вариант выбора параметров в окне TimeMenu. 022e133a15f37f403a53232c9b6f81218532dd33 AnMikhaylova 2022-04-04 09:29:18
Реализованы классы для описания файла с результатами расчетов; создан тест b9eb54937916bf4538dc559ea3c391f0855d4280 oam 2022-04-03 18:51:28
Вспомогательные классы для описания переменных канала в определенный момент времени 33e512158850d511534458dda088a71386044de0 OAM 2022-04-01 07:22:42
В окне TimeMenu добавлены кнопки для выбора нужных координат. В окно нужно добавить функцию выбора параметров. 2cd07ab29c86f397b297576a753f96f5fcb0a567 AnMikhaylova 2022-03-26 11:08:53
В класс TimeReader добавлен метод getPointsInTime(), который вычисляет допустимые моменты времени для моделирования. Расчёт производится по данным из файла timescen.txt. Добавлено окно TimeMenu для выбора нужных моментов времени и выбора параметров. В окне реализован только вывод допустимых значений времени. 672abb1bfe2906250806e02c36273d561a67d098 AnMikhaylova 2022-03-25 20:13:56
Добавлено главное меню (MainMenu). Добавлено меню выбора канала (ChanMenu). В данном окне кнопка "выбрать" выступает в качестве загшлушки. Добавлено меню выбора директории файлов конфигурации (DirMenu). c8d0f12754cf04c526636136484fb552a61878be AnMikhaylova 2022-03-24 16:35:56
The FileReader class has been renamed (to DefaultReader). TimeInterval - added a method that calculates the total duration of the interval. TimeReader - added a method for calculating the total duration of the simulation. Changed directory with source files. 7d82fe691e99d1c76e74a7e95496ca14cd9786e3 AnMikhaylova 2022-03-17 20:05:59
The FileReader class has been renamed (to DefaultReader). TimeInterval - added a method that calculates the total duration of the interval. TimeReader - added a method for calculating the total duration of the simulation. Changed directory with source files. e348951a762aed7ed2bf0a6d61a06b7873a73518 AnMikhaylova 2022-03-17 20:01:36
initial commit 07cb3f608489e2df5cda5655d3055d7c7e46b522 oam 2022-03-17 19:33:58
Commit 684d7c56012361a388ffe2210ec0b7e425ebcd8d - TimeMenu - реализованы кнопки "очистить выбор", "выбрать всё".
Author: AnMikhaylova
Author date (UTC): 2022-04-05 11:15
Committer name: AnMikhaylova
Committer date (UTC): 2022-04-05 11:15
Parent(s): 022e133a15f37f403a53232c9b6f81218532dd33
Signer:
Signing key:
Signing status: N
Tree: 3a47e594ddefbe9ec8c56b9df576426886f467dc
File Lines added Lines deleted
src/menu/TimeMenu.form 29 2
src/menu/TimeMenu.java 54 5
File src/menu/TimeMenu.form changed (mode: 100644) (index 637aa2f..9ee9e1c)
34 34 <Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
35 35 <Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
36 36 <Component id="jPanel1" min="-2" max="-2" attributes="0"/> <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
37 <EmptySpace pref="106" max="32767" attributes="0"/>
37 <EmptySpace min="0" pref="9" max="32767" attributes="0"/>
38 38 </Group> </Group>
39 39 </Group> </Group>
40 40 </DimensionLayout> </DimensionLayout>
 
85 85 </Group> </Group>
86 86 <EmptySpace min="18" pref="18" max="-2" attributes="0"/> <EmptySpace min="18" pref="18" max="-2" attributes="0"/>
87 87 </Group> </Group>
88 <Group type="102" alignment="0" attributes="0">
89 <Component id="jButton7" min="-2" max="-2" attributes="0"/>
90 <EmptySpace type="unrelated" max="-2" attributes="0"/>
91 <Component id="jButton8" min="-2" max="-2" attributes="0"/>
92 <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
93 </Group>
88 94 </Group> </Group>
89 95 </Group> </Group>
90 96 </Group> </Group>
 
123 129 <Component id="jScrollPane3" max="32767" attributes="0"/> <Component id="jScrollPane3" max="32767" attributes="0"/>
124 130 </Group> </Group>
125 131 </Group> </Group>
126 <EmptySpace max="32767" attributes="0"/>
132 <EmptySpace pref="14" max="32767" attributes="0"/>
133 <Group type="103" groupAlignment="3" attributes="0">
134 <Component id="jButton7" alignment="3" min="-2" max="-2" attributes="0"/>
135 <Component id="jButton8" alignment="3" min="-2" max="-2" attributes="0"/>
136 </Group>
137 <EmptySpace type="separate" max="-2" attributes="0"/>
127 138 <Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
128 139 <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
129 140 <Component id="jButton4" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="jButton4" alignment="3" min="-2" max="-2" attributes="0"/>
 
289 300 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton6ActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton6ActionPerformed"/>
290 301 </Events> </Events>
291 302 </Component> </Component>
303 <Component class="javax.swing.JButton" name="jButton7">
304 <Properties>
305 <Property name="text" type="java.lang.String" value="&#x41e;&#x447;&#x438;&#x441;&#x442;&#x438;&#x442;&#x44c; &#x432;&#x44b;&#x431;&#x43e;&#x440;"/>
306 </Properties>
307 <Events>
308 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton7ActionPerformed"/>
309 </Events>
310 </Component>
311 <Component class="javax.swing.JButton" name="jButton8">
312 <Properties>
313 <Property name="text" type="java.lang.String" value="&#x412;&#x44b;&#x431;&#x440;&#x430;&#x442;&#x44c; &#x432;&#x441;&#x451;"/>
314 </Properties>
315 <Events>
316 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton8ActionPerformed"/>
317 </Events>
318 </Component>
292 319 </SubComponents> </SubComponents>
293 320 </Container> </Container>
294 321 </SubComponents> </SubComponents>
File src/menu/TimeMenu.java changed (mode: 100644) (index 7b9683c..04beefa)
... ... public class TimeMenu extends javax.swing.JDialog {
68 68 for (ChanCol c : cols) { for (ChanCol c : cols) {
69 69 lmod3.addElement(c.getFullname()); lmod3.addElement(c.getFullname());
70 70 } }
71
72
71
73 72 } }
74 73
75 74 /** /**
 
... ... public class TimeMenu extends javax.swing.JDialog {
98 97 jList4 = new javax.swing.JList<>(); jList4 = new javax.swing.JList<>();
99 98 jButton5 = new javax.swing.JButton(); jButton5 = new javax.swing.JButton();
100 99 jButton6 = new javax.swing.JButton(); jButton6 = new javax.swing.JButton();
100 jButton7 = new javax.swing.JButton();
101 jButton8 = new javax.swing.JButton();
101 102
102 103 setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
103 104
 
... ... public class TimeMenu extends javax.swing.JDialog {
170 171 } }
171 172 }); });
172 173
174 jButton7.setText("Очистить выбор");
175 jButton7.addActionListener(new java.awt.event.ActionListener() {
176 public void actionPerformed(java.awt.event.ActionEvent evt) {
177 jButton7ActionPerformed(evt);
178 }
179 });
180
181 jButton8.setText("Выбрать всё");
182 jButton8.addActionListener(new java.awt.event.ActionListener() {
183 public void actionPerformed(java.awt.event.ActionEvent evt) {
184 jButton8ActionPerformed(evt);
185 }
186 });
187
173 188 javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
174 189 jPanel1.setLayout(jPanel1Layout); jPanel1.setLayout(jPanel1Layout);
175 190 jPanel1Layout.setHorizontalGroup( jPanel1Layout.setHorizontalGroup(
 
... ... public class TimeMenu extends javax.swing.JDialog {
204 219 .addComponent(jButton5, javax.swing.GroupLayout.Alignment.LEADING)) .addComponent(jButton5, javax.swing.GroupLayout.Alignment.LEADING))
205 220 .addGap(10, 10, 10) .addGap(10, 10, 10)
206 221 .addComponent(jScrollPane4, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE))) .addComponent(jScrollPane4, javax.swing.GroupLayout.PREFERRED_SIZE, 105, javax.swing.GroupLayout.PREFERRED_SIZE)))
207 .addGap(18, 18, 18))))
222 .addGap(18, 18, 18))
223 .addGroup(jPanel1Layout.createSequentialGroup()
224 .addComponent(jButton7)
225 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
226 .addComponent(jButton8)
227 .addGap(0, 0, Short.MAX_VALUE))))
208 228 ); );
209 229 jPanel1Layout.setVerticalGroup( jPanel1Layout.setVerticalGroup(
210 230 jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
 
... ... public class TimeMenu extends javax.swing.JDialog {
233 253 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
234 254 .addComponent(jScrollPane4, javax.swing.GroupLayout.DEFAULT_SIZE, 169, Short.MAX_VALUE) .addComponent(jScrollPane4, javax.swing.GroupLayout.DEFAULT_SIZE, 169, Short.MAX_VALUE)
235 255 .addComponent(jScrollPane3))) .addComponent(jScrollPane3)))
236 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
256 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 14, Short.MAX_VALUE)
257 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
258 .addComponent(jButton7)
259 .addComponent(jButton8))
260 .addGap(18, 18, 18)
237 261 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
238 262 .addComponent(jButton1) .addComponent(jButton1)
239 263 .addComponent(jButton4)) .addComponent(jButton4))
 
... ... public class TimeMenu extends javax.swing.JDialog {
253 277 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
254 278 .addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
255 279 .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
256 .addContainerGap(106, Short.MAX_VALUE))
280 .addGap(0, 9, Short.MAX_VALUE))
257 281 ); );
258 282
259 283 pack(); pack();
 
... ... public class TimeMenu extends javax.swing.JDialog {
321 345 } }
322 346 }//GEN-LAST:event_jButton6ActionPerformed }//GEN-LAST:event_jButton6ActionPerformed
323 347
348 private void jButton7ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton7ActionPerformed
349 // clear
350
351 setInf();
352 jList3.setModel(lmod3);
353 lmod4.clear();
354 jList4.setModel(lmod4);
355 }//GEN-LAST:event_jButton7ActionPerformed
356
357 private void jButton8ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton8ActionPerformed
358 // select all
359
360 lmod4.clear();
361 ArrayList<ChanCol> cols = cf.getColumns();
362 for (ChanCol c : cols) {
363 lmod4.addElement(c.getFullname());
364 }
365 jList4.setModel(lmod4);
366
367 lmod3.clear();
368 jList3.setModel(lmod3);
369 }//GEN-LAST:event_jButton8ActionPerformed
370
324 371
325 372 // Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
326 373 private javax.swing.JButton jButton1; private javax.swing.JButton jButton1;
 
... ... public class TimeMenu extends javax.swing.JDialog {
329 376 private javax.swing.JButton jButton4; private javax.swing.JButton jButton4;
330 377 private javax.swing.JButton jButton5; private javax.swing.JButton jButton5;
331 378 private javax.swing.JButton jButton6; private javax.swing.JButton jButton6;
379 private javax.swing.JButton jButton7;
380 private javax.swing.JButton jButton8;
332 381 private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel1;
333 382 private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel2;
334 383 private javax.swing.JList<String> jList1; private javax.swing.JList<String> jList1;
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/oami/lleakres

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/oami/lleakres

Clone this repository using git:
git clone git://git.rocketgit.com/user/oami/lleakres

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main