синхрон панелей сравнения сапфор, ++

This commit is contained in:
2024-03-15 16:26:01 +03:00
parent 1b91cff318
commit 4e611e4333
4 changed files with 31 additions and 14 deletions

11
.idea/workspace.xml generated
View File

@@ -7,19 +7,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/CredentialsBar/CredentialsBar.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/CollapseUp.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/ExpandDown.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
</list> </list>

View File

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
//http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
@Override @Override
public void GetVersionInfo() { public void GetVersionInfo() {
version = 1079; version = 1080;
String pattern = "MMM dd yyyy HH:mm:ss"; String pattern = "MMM dd yyyy HH:mm:ss";
DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH); DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
date_text = df.format(getClassBuildTime()); date_text = df.format(getClassBuildTime());

View File

@@ -425,7 +425,7 @@
<splitpane position="left"/> <splitpane position="left"/>
</constraints> </constraints>
<properties> <properties>
<dividerLocation value="300"/> <dividerLocation value="250"/>
<dividerSize value="3"/> <dividerSize value="3"/>
<orientation value="0"/> <orientation value="0"/>
</properties> </properties>
@@ -446,7 +446,7 @@
<splitpane position="right"/> <splitpane position="right"/>
</constraints> </constraints>
<properties> <properties>
<dividerLocation value="300"/> <dividerLocation value="250"/>
<dividerSize value="3"/> <dividerSize value="3"/>
<orientation value="0"/> <orientation value="0"/>
</properties> </properties>

View File

@@ -15,6 +15,8 @@ import Visual_DVM_2021.UI.Interface.TestingWindow;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
public class TestingForm implements FormWithSplitters, TestingWindow { public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel content; private JPanel content;
@Override @Override
@@ -71,6 +73,29 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
//-- //--
private final SapforVersionsComparisonForm sapforVersionMaster; //сравнение версий тестов SAPFOR. private final SapforVersionsComparisonForm sapforVersionMaster; //сравнение версий тестов SAPFOR.
private final SapforVersionsComparisonForm sapforVersionSlave; private final SapforVersionsComparisonForm sapforVersionSlave;
private boolean events_on=true;
private final PropertyChangeListener sc65Listener = new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (events_on) {
events_on=false;
SC66.setDividerLocation(SC65.getDividerLocation());
System.out.println("Left");
events_on=true;
}
}
};
private final PropertyChangeListener sc66Listener = new PropertyChangeListener() {
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (events_on) {
events_on=false;
SC65.setDividerLocation(SC66.getDividerLocation());
System.out.println("Right");
events_on=true;
}
}
};
//-- //--
public TestingForm() { public TestingForm() {
content.add(UI.testingBar, BorderLayout.NORTH); content.add(UI.testingBar, BorderLayout.NORTH);
@@ -96,6 +121,9 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
//- //-
SC65.setRightComponent(sapforVersionMaster.getContent()); SC65.setRightComponent(sapforVersionMaster.getContent());
SC66.setRightComponent(sapforVersionSlave.getContent()); SC66.setRightComponent(sapforVersionSlave.getContent());
//--
SC65.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc65Listener);
SC66.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, sc66Listener);
//- //-
Global.db.machines.mountUI(machinesPanel); Global.db.machines.mountUI(machinesPanel);
Global.db.users.mountUI(usersPanel); Global.db.users.mountUI(usersPanel);