diff --git a/.gitignore b/.gitignore index e70d614..86473cc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,9 @@ c_cpp_properties.json launch.json tasks.json settings.json +main - +# Keil *.dbgconf *.lst *.crf @@ -35,3 +36,78 @@ JLinkSettings.ini *.pdf *.docx *.doc + + + + +#qt +**/build* +*~ +*.autosave +*.a +*.core +*.moc +*.o +*.obj +*.orig +*.rej +*.so +*.so.* +*_pch.h.cpp +*_resource.rc +*.qm +.#* +*.*# +core +!core/ +tags +.DS_Store +.directory +*.debug +Makefile* +*.prl +*.app +moc_*.cpp +ui_*.h +qrc_*.cpp +Thumbs.db +*.res +*.rc +/.qmake.cache +/.qmake.stash + +# qtcreator generated files +*.pro.user* + +# xemacs temporary files +*.flc + +# Vim temporary files +.*.swp + +# Visual Studio generated files +*.ib_pdb_index +*.idb +*.ilk +*.pdb +*.sln +*.suo +*.vcproj +*vcproj.*.*.user +*.ncb +*.sdf +*.opensdf +*.vcxproj +*vcxproj.* + +# MinGW generated files +*.Debug +*.Release + +# Python byte code +*.pyc + +# Binaries +# -------- +*.dll +*.exe diff --git a/SoftwareDesign/Code/2-1/.gitignore b/SoftwareDesign/Code/2-1/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/SoftwareDesign/Code/2-1/2-1.pro b/SoftwareDesign/Code/2-1/2-1.pro new file mode 100644 index 0000000..d01e364 --- /dev/null +++ b/SoftwareDesign/Code/2-1/2-1.pro @@ -0,0 +1,24 @@ +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++11 + +# You can make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp \ + mainwindow.cpp + +HEADERS += \ + mainwindow.h + +FORMS += \ + mainwindow.ui + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target diff --git a/SoftwareDesign/Code/2-1/main.cpp b/SoftwareDesign/Code/2-1/main.cpp new file mode 100644 index 0000000..fd3e533 --- /dev/null +++ b/SoftwareDesign/Code/2-1/main.cpp @@ -0,0 +1,11 @@ +#include "mainwindow.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + return a.exec(); +} diff --git a/SoftwareDesign/Code/2-1/mainwindow.cpp b/SoftwareDesign/Code/2-1/mainwindow.cpp new file mode 100644 index 0000000..920463b --- /dev/null +++ b/SoftwareDesign/Code/2-1/mainwindow.cpp @@ -0,0 +1,24 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::MainWindow) +{ + ui->setupUi(this); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + + +void MainWindow::on_cal_clicked() +{ + int a = ui->num1->value(); + int b = ui->num2->value(); + ui->answer->setText(QString::number(a+b)); + +} + diff --git a/SoftwareDesign/Code/2-1/mainwindow.h b/SoftwareDesign/Code/2-1/mainwindow.h new file mode 100644 index 0000000..07b6ec6 --- /dev/null +++ b/SoftwareDesign/Code/2-1/mainwindow.h @@ -0,0 +1,24 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +QT_BEGIN_NAMESPACE +namespace Ui { class MainWindow; } +QT_END_NAMESPACE + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + MainWindow(QWidget *parent = nullptr); + ~MainWindow(); + +private slots: + void on_cal_clicked(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H diff --git a/SoftwareDesign/Code/2-1/mainwindow.ui b/SoftwareDesign/Code/2-1/mainwindow.ui new file mode 100644 index 0000000..033b8f0 --- /dev/null +++ b/SoftwareDesign/Code/2-1/mainwindow.ui @@ -0,0 +1,70 @@ + + + MainWindow + + + + 0 + 0 + 595 + 214 + + + + 简易计算器 + + + + + + 80 + 16 + 411 + 121 + + + + + 20 + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + 0 + 0 + 595 + 30 + + + + + + + + diff --git a/SoftwareDesign/Code/2-2-1/2-2.pro b/SoftwareDesign/Code/2-2-1/2-2.pro new file mode 100644 index 0000000..d01e364 --- /dev/null +++ b/SoftwareDesign/Code/2-2-1/2-2.pro @@ -0,0 +1,24 @@ +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++11 + +# You can make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp \ + mainwindow.cpp + +HEADERS += \ + mainwindow.h + +FORMS += \ + mainwindow.ui + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target diff --git a/SoftwareDesign/Code/2-2-1/main.cpp b/SoftwareDesign/Code/2-2-1/main.cpp new file mode 100644 index 0000000..fd3e533 --- /dev/null +++ b/SoftwareDesign/Code/2-2-1/main.cpp @@ -0,0 +1,11 @@ +#include "mainwindow.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + return a.exec(); +} diff --git a/SoftwareDesign/Code/2-2-1/mainwindow.cpp b/SoftwareDesign/Code/2-2-1/mainwindow.cpp new file mode 100644 index 0000000..7c743ac --- /dev/null +++ b/SoftwareDesign/Code/2-2-1/mainwindow.cpp @@ -0,0 +1,17 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::MainWindow) +{ + ui->setupUi(this); + +} + +MainWindow::~MainWindow() +{ + delete ui; +} + + diff --git a/SoftwareDesign/Code/2-2-1/mainwindow.h b/SoftwareDesign/Code/2-2-1/mainwindow.h new file mode 100644 index 0000000..4643e32 --- /dev/null +++ b/SoftwareDesign/Code/2-2-1/mainwindow.h @@ -0,0 +1,21 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +QT_BEGIN_NAMESPACE +namespace Ui { class MainWindow; } +QT_END_NAMESPACE + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + MainWindow(QWidget *parent = nullptr); + ~MainWindow(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H diff --git a/SoftwareDesign/Code/2-2-1/mainwindow.ui b/SoftwareDesign/Code/2-2-1/mainwindow.ui new file mode 100644 index 0000000..8c90bf1 --- /dev/null +++ b/SoftwareDesign/Code/2-2-1/mainwindow.ui @@ -0,0 +1,125 @@ + + + MainWindow + + + + 0 + 0 + 800 + 600 + + + + MainWindow + + + + + + 120 + 70 + 521 + 451 + + + + + 30 + + + + + 0 + + + + + 1 + + + + + + + 2 + + + + + + + 3 + + + + + + + + + 4 + + + + + + + 5 + + + + + + + 6 + + + + + + + + + + 9 + + + + + + + 7 + + + + + + + 8 + + + + + + + + + + + + 140 + 10 + 341 + 25 + + + + ***REMOVED*** ***REMOVED*** + + + + + + +