qt_code
/
qt_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(merge): merge.

This commit is contained in:
chenyf 2024-12-08 09:42:48 +08:00
parent 7728129d55 605bb4981f
commit 36e06da497
4 changed files with 1055 additions and 787 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1108
CMakeLists.txt.user
View File

File diff suppressed because it is too large Load Diff

711
mainwindow.cpp
View File

File diff suppressed because it is too large Load Diff

3
mainwindow.h
View File

@ -103,7 +103,8 @@ class MainWindow : public QMainWindow {
void choose_pump_page();
void write_fpga_cfg();
void read_fpga_cfg();
void wave_open();
void wave_close();
private:
Ui::MainWindow *ui;
QTcpSocket *tcp_socket;

20
mainwindow.ui
View File

@ -964,6 +964,13 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="bt_stop_fpga">
<property name="text">
<string>关闭fpga</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="bt_start_fpga">
<property name="text">
@ -971,10 +978,17 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="bt_stop_fpga">
<item row="2" column="0">
<widget class="QPushButton" name="bt_wave_open">
<property name="text">
<string>关闭fpga</string>
<string>wave打开</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="bt_wave_close">
<property name="text">
<string>wave关闭</string>
</property>
</widget>
</item>