Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert 22 dev4 #41

Open
wants to merge 26 commits into
base: revert-22-dev4
Choose a base branch
from
Open

Revert 22 dev4 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a9cc021
abababaa
MengWhite Sep 11, 2024
fc22c96
new file: GUI/ChildWindow_1.py
MengWhite Sep 11, 2024
9522dfe
new file: GUI/main_window_2.py
MengWhite Sep 11, 2024
c6f6359
Merge branch 'revert-22-dev4' of https://github.com/MengWhite/Thermal…
MengWhite Sep 11, 2024
b896a7d
modified: main.py
MengWhite Sep 11, 2024
d4e1aa2
new file: GUI/MainWindow_GUI.py
MengWhite Sep 11, 2024
9c5535d
modified: output/plot_2d.py
MengWhite Sep 11, 2024
5aee5c3
modified: main.py
MengWhite Sep 11, 2024
2bf9319
new file: GUI/MainWindow_GUI.ui
MengWhite Sep 11, 2024
8d9f5e8
new file: GUI/ChildWindow_1.ui
MengWhite Sep 11, 2024
b335985
new file: GUI/ChildWindow_2.ui
MengWhite Sep 11, 2024
dc37ffe
modified: GUI/MainWindow_GUI.py
MengWhite Sep 11, 2024
38d6b11
modified: output/lattice_set.py
MengWhite Sep 11, 2024
642cec0
new file: data/Cu.eam.alloy
MengWhite Sep 11, 2024
01a11ae
modified: melolular_dynamics/lammps_calculation.py
MengWhite Sep 11, 2024
d83f777
modified: GUI/MainWindow_GUI.py
MengWhite Sep 11, 2024
e7d4628
Merge branch 'revert-22-dev4' into revert-22-dev4
MengWhite Sep 11, 2024
7131aa2
Merge branch 'alight-lab:revert-22-dev4' into revert-22-dev4
MengWhite Sep 11, 2024
4d6b04f
modified: GUI/ChildWindow_1.py
MengWhite Sep 11, 2024
a0ea977
modified: GUI/MainWindow_GUI.py
MengWhite Sep 13, 2024
9cd532d
Delete result_pdos.txt
MengWhite Sep 13, 2024
179d0b9
Delete log.lammps
MengWhite Sep 13, 2024
9b5da57
Delete result_heat_1.txt
MengWhite Sep 13, 2024
c1eb087
Delete result_heat_2.txt
MengWhite Sep 13, 2024
39c7758
Delete result_iterate.txt
MengWhite Sep 13, 2024
41e588d
Merge branch 'MengWhite-revert-22-dev4' into revert-22-dev4
MengWhite Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions GUI/ChildWindow_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,9 @@ def retranslateUi(self, Form):
self.label_13.setText(QCoreApplication.translate("Form", u"\u5f17\u5170\u514b\u5c14\n"
"\u7f3a\u9677\u5bf9\u6570\u91cf", None))
self.finish.setText(QCoreApplication.translate("Form", u"\u5b8c\u6210", None))
#if QT_CONFIG(shortcut)
self.finish.setShortcut(QCoreApplication.translate("Form", u"Return", None))
#endif // QT_CONFIG(shortcut)
self.label_14.setText(QCoreApplication.translate("Form", u"K", None))
self.label_15.setText(QCoreApplication.translate("Form", u"K", None))
self.label_16.setText(QCoreApplication.translate("Form", u"ps", None))
Expand Down
3 changes: 3 additions & 0 deletions GUI/ChildWindow_1.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,9 @@ color: rgb(0, 0, 0);</string>
<property name="text">
<string>完成</string>
</property>
<property name="shortcut">
<string>Return</string>
</property>
</widget>
<widget class="QLabel" name="label_14">
<property name="geometry">
Expand Down
3 changes: 3 additions & 0 deletions GUI/ChildWindow_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,9 @@ def retranslateUi(self, Form):
self.label_11.setText(QCoreApplication.translate("Form", u"\u7cfb\u7efc", None))
self.label_9.setText(QCoreApplication.translate("Form", u"\u5f1b\u8c6b\u65f6\u95f4", None))
self.finish.setText(QCoreApplication.translate("Form", u"\u5b8c\u6210", None))
#if QT_CONFIG(shortcut)
self.finish.setShortcut(QCoreApplication.translate("Form", u"Return", None))
#endif // QT_CONFIG(shortcut)
self.label_12.setText(QCoreApplication.translate("Form", u"\u6a21\u62df\u65f6\u95f4", None))
self.label_6.setText(QCoreApplication.translate("Form", u"\u521d\u59cb\u6e29\u5ea6", None))
self.label.setText(QCoreApplication.translate("Form", u"\u5b9e\u9a8c\u4e8c", None))
Expand Down
3 changes: 3 additions & 0 deletions GUI/ChildWindow_2.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ color: rgb(0, 0, 0);</string>
<property name="text">
<string>完成</string>
</property>
<property name="shortcut">
<string>Return</string>
</property>
</widget>
<widget class="QLabel" name="label_12">
<property name="geometry">
Expand Down
17 changes: 8 additions & 9 deletions GUI/MainWindow_GUI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
QIcon, QImage, QKeySequence, QLinearGradient,
QPainter, QPalette, QPixmap, QRadialGradient,
QTransform)

from PySide6.QtWidgets import (QApplication, QLabel, QLineEdit, QMainWindow,
QMenu, QMenuBar, QPushButton, QSizePolicy,
QStatusBar, QVBoxLayout, QWidget)
from PySide6.QtWidgets import (QApplication, QComboBox, QLabel, QLineEdit,
QMainWindow, QMenu, QMenuBar, QPushButton,
QSizePolicy, QStatusBar, QVBoxLayout, QWidget)

class Ui_MainWindow(object):
def setupUi(self, MainWindow):
Expand Down Expand Up @@ -76,9 +75,6 @@ def setupUi(self, MainWindow):
self.label_2.setObjectName(u"label_2")
self.label_2.setGeometry(QRect(1240, 830, 111, 31))
self.label_2.setFont(font1)
self.pushButton_2 = QPushButton(self.centralwidget)
self.pushButton_2.setObjectName(u"pushButton_2")
self.pushButton_2.setGeometry(QRect(810, 877, 681, 41))
self.pushButton_3 = QPushButton(self.centralwidget)
self.pushButton_3.setObjectName(u"pushButton_3")
self.pushButton_3.setGeometry(QRect(10, 880, 221, 41))
Expand All @@ -91,6 +87,10 @@ def setupUi(self, MainWindow):
self.exp_res_lineEdit_2 = QLineEdit(self.centralwidget)
self.exp_res_lineEdit_2.setObjectName(u"exp_res_lineEdit_2")
self.exp_res_lineEdit_2.setGeometry(QRect(1160, 830, 71, 31))
self.exp_res_lineEdit_2.setFont(font1)
self.comboBox = QComboBox(self.centralwidget)
self.comboBox.setObjectName(u"comboBox")
self.comboBox.setGeometry(QRect(810, 877, 681, 41))
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QMenuBar(MainWindow)
self.menubar.setObjectName(u"menubar")
Expand Down Expand Up @@ -133,8 +133,7 @@ def retranslateUi(self, MainWindow):
self.action_save.setText(QCoreApplication.translate("MainWindow", u"\u53e6\u5b58\u4e3a", None))
self.label.setText(QCoreApplication.translate("MainWindow", u"\u754c\u9762\u70ed\u5bfc\u7387\uff1a", None))
self.label_2.setText(QCoreApplication.translate("MainWindow", u"W*K-1*m-1", None))
self.pushButton_2.setText(QCoreApplication.translate("MainWindow", u"PushButton", None))
self.pushButton_3.setText(QCoreApplication.translate("MainWindow", u"\u5207\u6362", None))
self.pushButton_3.setText(QCoreApplication.translate("MainWindow", u"\u65e0\u9ad8\u4eae\u663e\u793a", None))
self.menu.setTitle(QCoreApplication.translate("MainWindow", u"\u6587\u4ef6", None))
self.menu_2.setTitle(QCoreApplication.translate("MainWindow", u"\u65b0\u5efa", None))
self.menu_3.setTitle(QCoreApplication.translate("MainWindow", u"\u7f16\u8f91", None))
Expand Down
33 changes: 18 additions & 15 deletions GUI/MainWindow_GUI.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<rect>
<x>1030</x>
<y>540</y>
<width>521</width>
<width>471</width>
<height>271</height>
</rect>
</property>
Expand Down Expand Up @@ -96,19 +96,6 @@
<string>W*K-1*m-1</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_2">
<property name="geometry">
<rect>
<x>810</x>
<y>877</y>
<width>681</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>PushButton</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_3">
<property name="geometry">
<rect>
Expand All @@ -119,7 +106,7 @@
</rect>
</property>
<property name="text">
<string>切换</string>
<string>无高亮显示</string>
</property>
</widget>
<widget class="QWidget" name="verticalLayoutWidget_5">
Expand All @@ -142,6 +129,22 @@
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<family>宋体</family>
<pointsize>12</pointsize>
</font>
</property>
</widget>
<widget class="QComboBox" name="comboBox">
<property name="geometry">
<rect>
<x>810</x>
<y>877</y>
<width>681</width>
<height>41</height>
</rect>
</property>
</widget>
</widget>
<widget class="QMenuBar" name="menubar">
Expand Down
Loading