From 4c690bbc6e7cbe6e3315629fa1206e7e1e40e18a Mon Sep 17 00:00:00 2001 From: Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 01:43:57 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=202021=E5=B9=B41=E6=9C=8824=E6=97=A5=2001:43:51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eda/eda_qt/eda_qt.pro | 6 +- eda/eda_qt/eda_qt.pro.user | 568 ++----------------------------------- eda/eda_qt/mainwindow.ui | 5 +- eda/eda_qt/port.cpp | 13 + eda/eda_qt/port.h | 17 ++ 5 files changed, 63 insertions(+), 546 deletions(-) create mode 100644 eda/eda_qt/port.cpp create mode 100644 eda/eda_qt/port.h diff --git a/eda/eda_qt/eda_qt.pro b/eda/eda_qt/eda_qt.pro index e1a2046..298b4d1 100644 --- a/eda/eda_qt/eda_qt.pro +++ b/eda/eda_qt/eda_qt.pro @@ -18,11 +18,13 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += \ main.cpp \ mainwindow.cpp \ - new_file.cpp + new_file.cpp \ + port.cpp HEADERS += \ mainwindow.h \ - new_file.h + new_file.h \ + port.h FORMS += \ mainwindow.ui \ diff --git a/eda/eda_qt/eda_qt.pro.user b/eda/eda_qt/eda_qt.pro.user index 4d0e24b..9ea309e 100644 --- a/eda/eda_qt/eda_qt.pro.user +++ b/eda/eda_qt/eda_qt.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {f13ef12e-62a1-4aaf-ac39-302b77838bbe} + {c7d49916-8da1-4252-9fa0-c2c4861f43da} ProjectExplorer.Project.ActiveTarget @@ -55,14 +55,21 @@ ProjectExplorer.Project.PluginSettings + + true + true + true + true + + 0 + true -fno-delayed-template-parsing true - Builtin.Questionable true - Builtin.DefaultTidyAndClazy + Builtin.TidyAndClazy 2 @@ -73,260 +80,6 @@ ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit - 0 - 0 - 0 - - true - 0 - C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro - C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro - - false - - false - true - true - false - false - true - - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 Desktop Qt 5.14.2 MinGW 64-bit Desktop Qt 5.14.2 MinGW 64-bit @@ -335,17 +88,16 @@ 0 0 - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + C:/Users/Dell/Desktop/eda_qt/eda/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true QtProjectManager.QMakeBuildStep + true false - + false + false true @@ -382,21 +134,18 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - 2 - 2 - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + C:/Users/Dell/Desktop/eda_qt/eda/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release true QtProjectManager.QMakeBuildStep + false false - + false + true true @@ -433,21 +182,18 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - 0 - 2 - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + C:/Users/Dell/Desktop/eda_qt/eda/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true QtProjectManager.QMakeBuildStep + true false - + true + true true @@ -484,8 +230,6 @@ Profile Qt4ProjectManager.Qt4BuildConfiguration 0 - 0 - 0 3 @@ -496,8 +240,6 @@ ProjectExplorer.BuildSteps.Deploy 1 - - false ProjectExplorer.DefaultDeployConfiguration 1 @@ -562,280 +304,26 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.2 - - Desktop Qt 5.9.9 MinGW 32bit - Desktop Qt 5.9.9 MinGW 32bit - qt.qt5.599.win32_mingw53_kit - 0 - 0 - 0 - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 2 - 2 - - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 2 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Dell/Desktop/eda_qt/eda/eda_qt/eda_qt.pro + C:/Users/Dell/Desktop/eda_qt/eda/eda_qt/eda_qt.pro false false true + true false false true - + C:/Users/Dell/Desktop/eda_qt/eda/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug 1 ProjectExplorer.Project.TargetCount - 3 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/eda/eda_qt/mainwindow.ui b/eda/eda_qt/mainwindow.ui index b3db998..6c166d4 100644 --- a/eda/eda_qt/mainwindow.ui +++ b/eda/eda_qt/mainwindow.ui @@ -24,9 +24,6 @@ - - - @@ -39,7 +36,7 @@ 0 0 1056 - 25 + 23 diff --git a/eda/eda_qt/port.cpp b/eda/eda_qt/port.cpp new file mode 100644 index 0000000..210f5ae --- /dev/null +++ b/eda/eda_qt/port.cpp @@ -0,0 +1,13 @@ +#include "port.h" + +Port::Port() +{ + +} + +Port::Port(std::string name,bool inOut,bool dataType,int dataSize){ + this->name = name; + this->inOut = inOut; + this->dataSize =dataSize; + this->dataType = dataType; +} diff --git a/eda/eda_qt/port.h b/eda/eda_qt/port.h new file mode 100644 index 0000000..29f035b --- /dev/null +++ b/eda/eda_qt/port.h @@ -0,0 +1,17 @@ +#ifndef PORT_H +#define PORT_H +#include + +class Port +{ +private: + std::string name; //端口名 + bool inOut; //输入或输出 + bool dataType; //数据类型 + int dataSize; //数据长度 +public: + Port(); + Port(std::string,bool,bool,int); +}; + +#endif // PORT_H -- Gitee From edd66ee6939cf6d944060b4cb585c1b29cab24ba Mon Sep 17 00:00:00 2001 From: Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 14:29:28 +0800 Subject: [PATCH 02/12] =?UTF-8?q?1.24-14:29=20=E4=B8=A4=E4=B8=AA=E5=B0=81?= =?UTF-8?q?=E8=A3=85=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eda/eda_qt/eda_qt.pro | 2 ++ eda/eda_qt/module.cpp | 21 +++++++++++++++++++++ eda/eda_qt/module.h | 18 ++++++++++++++++++ eda/eda_qt/port.cpp | 40 +++++++++++++++++++++++++++++++++++++++- eda/eda_qt/port.h | 14 ++++++++++++-- 5 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 eda/eda_qt/module.cpp create mode 100644 eda/eda_qt/module.h diff --git a/eda/eda_qt/eda_qt.pro b/eda/eda_qt/eda_qt.pro index 298b4d1..11f8211 100644 --- a/eda/eda_qt/eda_qt.pro +++ b/eda/eda_qt/eda_qt.pro @@ -18,11 +18,13 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += \ main.cpp \ mainwindow.cpp \ + module.cpp \ new_file.cpp \ port.cpp HEADERS += \ mainwindow.h \ + module.h \ new_file.h \ port.h diff --git a/eda/eda_qt/module.cpp b/eda/eda_qt/module.cpp new file mode 100644 index 0000000..c3022ea --- /dev/null +++ b/eda/eda_qt/module.cpp @@ -0,0 +1,21 @@ +#include "module.h" +#include + +Module::Module() +{ + +} + +Module::Module(std::string name,int inputPorts,int outputPorts) +{ + this->name = name; + int portsNum = 0; + for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),0,0,1)); + } + for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),1,0,1)); + } +} diff --git a/eda/eda_qt/module.h b/eda/eda_qt/module.h new file mode 100644 index 0000000..2010b55 --- /dev/null +++ b/eda/eda_qt/module.h @@ -0,0 +1,18 @@ +#ifndef MODULE_H +#define MODULE_H +#include +#include +#include "port.h" +class Module +{ +private: + std::string name; + int inputPorts; + int ouputPorts; + std::vector ports; +public: + Module(); + Module(std::string,int,int); +}; + +#endif // MODULE_H diff --git a/eda/eda_qt/port.cpp b/eda/eda_qt/port.cpp index 210f5ae..b6377ff 100644 --- a/eda/eda_qt/port.cpp +++ b/eda/eda_qt/port.cpp @@ -5,9 +5,47 @@ Port::Port() } -Port::Port(std::string name,bool inOut,bool dataType,int dataSize){ +Port::Port(std::string name,bool inOut,bool dataType,int dataSize) +{ this->name = name; this->inOut = inOut; this->dataSize =dataSize; this->dataType = dataType; } + +void Port::setName(std::string name) +{ + this->name = name; +} + +std::string Port::getName() +{ + return this->name; +} + +void Port::setInOut(bool inOut) +{ + this->inOut = inOut; +} +bool Port::getInOut() +{ + return this->inOut; +} + +void Port::setDataType(bool dataType) +{ + this->dataType = dataType; +} +bool Port::getDataType() +{ + return this->dataType; +} + +void Port::setDataSize(int dataSize) +{ + this->dataSize = dataSize; +} +int Port::getDataSize() +{ + return this->dataSize; +} diff --git a/eda/eda_qt/port.h b/eda/eda_qt/port.h index 29f035b..69a6fb4 100644 --- a/eda/eda_qt/port.h +++ b/eda/eda_qt/port.h @@ -2,16 +2,26 @@ #define PORT_H #include + class Port { private: std::string name; //端口名 - bool inOut; //输入或输出 - bool dataType; //数据类型 + bool inOut; //输入或输出 0为in 1为out + bool dataType; //数据类型 0为wire 1为reg int dataSize; //数据长度 public: Port(); Port(std::string,bool,bool,int); + void setName(std::string); + std::string getName(); + void setInOut(bool); + bool getInOut(); + void setDataType(bool); + bool getDataType(); + void setDataSize(int); + int getDataSize(); + }; #endif // PORT_H -- Gitee From 5360e1288b22ac731df41d5b254ab7a4876951a7 Mon Sep 17 00:00:00 2001 From: King_Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 16:53:38 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20eda=20?= =?UTF-8?q?=E4=B8=BA=20src?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {eda => src}/.keep | 0 {eda => src}/eda_qt/eda_qt.pro | 0 {eda => src}/eda_qt/eda_qt.pro.user | 0 {eda => src}/eda_qt/main.cpp | 0 {eda => src}/eda_qt/mainwindow.cpp | 0 {eda => src}/eda_qt/mainwindow.h | 0 {eda => src}/eda_qt/mainwindow.ui | 0 {eda => src}/eda_qt/module.cpp | 0 {eda => src}/eda_qt/module.h | 0 {eda => src}/eda_qt/new_file.cpp | 0 {eda => src}/eda_qt/new_file.h | 0 {eda => src}/eda_qt/new_file.ui | 0 {eda => src}/eda_qt/port.cpp | 0 {eda => src}/eda_qt/port.h | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename {eda => src}/.keep (100%) rename {eda => src}/eda_qt/eda_qt.pro (100%) rename {eda => src}/eda_qt/eda_qt.pro.user (100%) rename {eda => src}/eda_qt/main.cpp (100%) rename {eda => src}/eda_qt/mainwindow.cpp (100%) rename {eda => src}/eda_qt/mainwindow.h (100%) rename {eda => src}/eda_qt/mainwindow.ui (100%) rename {eda => src}/eda_qt/module.cpp (100%) rename {eda => src}/eda_qt/module.h (100%) rename {eda => src}/eda_qt/new_file.cpp (100%) rename {eda => src}/eda_qt/new_file.h (100%) rename {eda => src}/eda_qt/new_file.ui (100%) rename {eda => src}/eda_qt/port.cpp (100%) rename {eda => src}/eda_qt/port.h (100%) diff --git a/eda/.keep b/src/.keep similarity index 100% rename from eda/.keep rename to src/.keep diff --git a/eda/eda_qt/eda_qt.pro b/src/eda_qt/eda_qt.pro similarity index 100% rename from eda/eda_qt/eda_qt.pro rename to src/eda_qt/eda_qt.pro diff --git a/eda/eda_qt/eda_qt.pro.user b/src/eda_qt/eda_qt.pro.user similarity index 100% rename from eda/eda_qt/eda_qt.pro.user rename to src/eda_qt/eda_qt.pro.user diff --git a/eda/eda_qt/main.cpp b/src/eda_qt/main.cpp similarity index 100% rename from eda/eda_qt/main.cpp rename to src/eda_qt/main.cpp diff --git a/eda/eda_qt/mainwindow.cpp b/src/eda_qt/mainwindow.cpp similarity index 100% rename from eda/eda_qt/mainwindow.cpp rename to src/eda_qt/mainwindow.cpp diff --git a/eda/eda_qt/mainwindow.h b/src/eda_qt/mainwindow.h similarity index 100% rename from eda/eda_qt/mainwindow.h rename to src/eda_qt/mainwindow.h diff --git a/eda/eda_qt/mainwindow.ui b/src/eda_qt/mainwindow.ui similarity index 100% rename from eda/eda_qt/mainwindow.ui rename to src/eda_qt/mainwindow.ui diff --git a/eda/eda_qt/module.cpp b/src/eda_qt/module.cpp similarity index 100% rename from eda/eda_qt/module.cpp rename to src/eda_qt/module.cpp diff --git a/eda/eda_qt/module.h b/src/eda_qt/module.h similarity index 100% rename from eda/eda_qt/module.h rename to src/eda_qt/module.h diff --git a/eda/eda_qt/new_file.cpp b/src/eda_qt/new_file.cpp similarity index 100% rename from eda/eda_qt/new_file.cpp rename to src/eda_qt/new_file.cpp diff --git a/eda/eda_qt/new_file.h b/src/eda_qt/new_file.h similarity index 100% rename from eda/eda_qt/new_file.h rename to src/eda_qt/new_file.h diff --git a/eda/eda_qt/new_file.ui b/src/eda_qt/new_file.ui similarity index 100% rename from eda/eda_qt/new_file.ui rename to src/eda_qt/new_file.ui diff --git a/eda/eda_qt/port.cpp b/src/eda_qt/port.cpp similarity index 100% rename from eda/eda_qt/port.cpp rename to src/eda_qt/port.cpp diff --git a/eda/eda_qt/port.h b/src/eda_qt/port.h similarity index 100% rename from eda/eda_qt/port.h rename to src/eda_qt/port.h -- Gitee From e93b543249c67131b96bed1aae427c05a4ea7e6d Mon Sep 17 00:00:00 2001 From: Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 17:33:37 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9Port=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E5=AE=8C=E5=96=84Module=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/eda_qt/eda_qt.pro.user | 7 ++++--- src/eda_qt/module.cpp | 25 ++++++++++++++++++++++--- src/eda_qt/module.h | 7 ++++++- src/eda_qt/port.cpp | 12 ++++++------ src/eda_qt/port.h | 9 +++++---- 5 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/eda_qt/eda_qt.pro.user b/src/eda_qt/eda_qt.pro.user index 9ea309e..3f8d8c8 100644 --- a/src/eda_qt/eda_qt.pro.user +++ b/src/eda_qt/eda_qt.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -304,8 +304,9 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Dell/Desktop/eda_qt/eda/eda_qt/eda_qt.pro - C:/Users/Dell/Desktop/eda_qt/eda/eda_qt/eda_qt.pro + eda_qt2 + Qt4ProjectManager.Qt4RunConfiguration:F:/Leoric/新建文件夹 (2)/eda_qt/eda/eda_qt/eda_qt.pro + F:/Leoric/新建文件夹 (2)/eda_qt/eda/eda_qt/eda_qt.pro false diff --git a/src/eda_qt/module.cpp b/src/eda_qt/module.cpp index c3022ea..5ea69e2 100644 --- a/src/eda_qt/module.cpp +++ b/src/eda_qt/module.cpp @@ -6,16 +6,35 @@ Module::Module() } -Module::Module(std::string name,int inputPorts,int outputPorts) +Module::Module(std::string name,int inputPorts,int outputPorts,int inOutPorts) { this->name = name; int portsNum = 0; for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),0,0,1)); + this->ports.push_back(Port("p"+std::to_string(portsNum),INPUT,0,1)); } for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),1,0,1)); + this->ports.push_back(Port("p"+std::to_string(portsNum),OUTPUT,0,1)); } + for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),INOUT,0,1)); + } +} + +void Module::setCode(std::string code) +{ + this->code = code; +} + +std::string Module::getCode() +{ + return this->code; +} + +std::string Module::generateCode() +{ + } diff --git a/src/eda_qt/module.h b/src/eda_qt/module.h index 2010b55..804962c 100644 --- a/src/eda_qt/module.h +++ b/src/eda_qt/module.h @@ -9,10 +9,15 @@ private: std::string name; int inputPorts; int ouputPorts; + int inOutPorts; + std::string code; std::vector ports; public: Module(); - Module(std::string,int,int); + Module(std::string,int,int,int); + void setCode(std::string); + std::string getCode(); + std::string generateCode(); }; #endif // MODULE_H diff --git a/src/eda_qt/port.cpp b/src/eda_qt/port.cpp index b6377ff..077830f 100644 --- a/src/eda_qt/port.cpp +++ b/src/eda_qt/port.cpp @@ -5,10 +5,10 @@ Port::Port() } -Port::Port(std::string name,bool inOut,bool dataType,int dataSize) +Port::Port(std::string name,PortType portType,bool dataType,int dataSize) { this->name = name; - this->inOut = inOut; + this->portType = portType; this->dataSize =dataSize; this->dataType = dataType; } @@ -23,13 +23,13 @@ std::string Port::getName() return this->name; } -void Port::setInOut(bool inOut) +void Port::setPortType(PortType portType) { - this->inOut = inOut; + this->portType = portType; } -bool Port::getInOut() +PortType Port::getPortType() { - return this->inOut; + return this->portType; } void Port::setDataType(bool dataType) diff --git a/src/eda_qt/port.h b/src/eda_qt/port.h index 69a6fb4..813d0ec 100644 --- a/src/eda_qt/port.h +++ b/src/eda_qt/port.h @@ -2,21 +2,22 @@ #define PORT_H #include +enum PortType{INPUT,OUTPUT,INOUT}; class Port { private: std::string name; //端口名 - bool inOut; //输入或输出 0为in 1为out + PortType portType; //输入或输出 0为in 1为out bool dataType; //数据类型 0为wire 1为reg int dataSize; //数据长度 public: Port(); - Port(std::string,bool,bool,int); + Port(std::string,PortType,bool,int); void setName(std::string); std::string getName(); - void setInOut(bool); - bool getInOut(); + void setPortType(PortType); + PortType getPortType(); void setDataType(bool); bool getDataType(); void setDataSize(int); -- Gitee From ffa0ef94b5c33a2185173ab3319ab4c08846238e Mon Sep 17 00:00:00 2001 From: alainchen <8607408+alainchen@user.noreply.gitee.com> Date: Sun, 24 Jan 2021 17:36:32 +0800 Subject: [PATCH 05/12] update README.md. --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5311b32..19ab2a1 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,12 @@ wire a; reg b; reg c; 另外要注意：当端口的数据长度定义为i（正整数）时，相应的在上述 **第二段、第三段** 代码中要有所改变，在端口名前加[i-1:0] 例如：![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234717_374091e7_8607408.png "QQ截图20210123234621.png")用户定义了p0为3位 ![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234922_d18c6d0d_8607408.png "QQ截图20210123234626.png") ![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234930_6490091b_8607408.png "QQ截图20210123234630.png") -则p0前面加[2:0] +则p0前面加[2:0] +### ------------003------------ +应有“保存模块”和“生成代码”两个按钮。其中： +保存模块：做到将此次用户新建的模块里的所有内容打包保存 下次用户双击时可以直接在软件里打开 +生成代码：将软件生成的代码 让用户选择位置保存。保存为verilog目录 目录下应有此模块及其内部子模块所有的verilog代码文件 扩展名为.v + -- Gitee From 4e7383be423c2996f29df8335a936e1539b39b5a Mon Sep 17 00:00:00 2001 From: alainchen <8607408+alainchen@user.noreply.gitee.com> Date: Sun, 24 Jan 2021 17:37:12 +0800 Subject: [PATCH 06/12] update README.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 19ab2a1..6e293a4 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ wire a; reg b; reg c; ### ------------003------------ 应有“保存模块”和“生成代码”两个按钮。其中： 保存模块：做到将此次用户新建的模块里的所有内容打包保存 下次用户双击时可以直接在软件里打开 -生成代码：将软件生成的代码 让用户选择位置保存。保存为verilog目录 目录下应有此模块及其内部子模块所有的verilog代码文件 扩展名为.v +生成代码：将软件生成的代码 让用户选择位置保存。保存为 **verilog目录** 目录下应有 **此模块及其内部子模块** 所有的verilog代码文件 **扩展名为.v** -- Gitee From 3a9d70781b6c0aafe3fe5f9a9e1d1b2f8096cc64 Mon Sep 17 00:00:00 2001 From: alainchen <8607408+alainchen@user.noreply.gitee.com> Date: Sun, 24 Jan 2021 17:49:57 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=201.?= =?UTF-8?q?txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 1.txt diff --git a/1.txt b/1.txt deleted file mode 100644 index e69de29..0000000 -- Gitee From 5df416c0c51222481e9315f2a94c91ed2a7d146c Mon Sep 17 00:00:00 2001 From: Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 17:58:01 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 259148f..b14041c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ *.exe *.out *.app + +/eda/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug \ No newline at end of file -- Gitee From 66292a1d7329b506e5c29d7a7113d64ff9729493 Mon Sep 17 00:00:00 2001 From: Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 18:00:21 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/eda_qt 1-24 2_06/eda_qt.pro | 34 + src/eda_qt 1-24 2_06/eda_qt.pro.user | 328 +++++++ .../eda_qt.pro.user.f13ef12.22 | 848 ++++++++++++++++++ src/eda_qt 1-24 2_06/main.cpp | 11 + src/eda_qt 1-24 2_06/mainwindow.cpp | 24 + src/eda_qt 1-24 2_06/mainwindow.h | 28 + src/eda_qt 1-24 2_06/mainwindow.ui | 266 ++++++ src/eda_qt 1-24 2_06/new_file.cpp | 20 + src/eda_qt 1-24 2_06/new_file.h | 25 + src/eda_qt 1-24 2_06/new_file.ui | 129 +++ 10 files changed, 1713 insertions(+) create mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro create mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro.user create mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 create mode 100644 src/eda_qt 1-24 2_06/main.cpp create mode 100644 src/eda_qt 1-24 2_06/mainwindow.cpp create mode 100644 src/eda_qt 1-24 2_06/mainwindow.h create mode 100644 src/eda_qt 1-24 2_06/mainwindow.ui create mode 100644 src/eda_qt 1-24 2_06/new_file.cpp create mode 100644 src/eda_qt 1-24 2_06/new_file.h create mode 100644 src/eda_qt 1-24 2_06/new_file.ui diff --git a/src/eda_qt 1-24 2_06/eda_qt.pro b/src/eda_qt 1-24 2_06/eda_qt.pro new file mode 100644 index 0000000..44b31ed --- /dev/null +++ b/src/eda_qt 1-24 2_06/eda_qt.pro @@ -0,0 +1,34 @@ +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp \ + mainwindow.cpp \ + new_file.cpp + +HEADERS += \ + mainwindow.h \ + new_file.h + +FORMS += \ + mainwindow.ui \ + new_file.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/src/eda_qt 1-24 2_06/eda_qt.pro.user b/src/eda_qt 1-24 2_06/eda_qt.pro.user new file mode 100644 index 0000000..5a3c130 --- /dev/null +++ b/src/eda_qt 1-24 2_06/eda_qt.pro.user @@ -0,0 +1,328 @@ + + + + + + EnvironmentId + {d7319875-1e1d-4456-a97d-d87e35d07a5e} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.12.1 MinGW 64-bit + Desktop Qt 5.12.1 MinGW 64-bit + qt.qt5.5121.win64_mingw73_kit + 0 + 0 + 0 + + F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + 部署 + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + eda_qt + + Qt4ProjectManager.Qt4RunConfiguration:F:/eda_dev/eda_qt/src/eda_qt 1-24 2_06/eda_qt.pro + eda_qt.pro + + 3768 + false + true + true + false + false + true + + F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 20 + + + Version + 20 + + diff --git a/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 b/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 new file mode 100644 index 0000000..2e506bf --- /dev/null +++ b/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 @@ -0,0 +1,848 @@ + + + + + + EnvironmentId + {f13ef12e-62a1-4aaf-ac39-302b77838bbe} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + Builtin.Questionable + + true + Builtin.DefaultTidyAndClazy + 2 + + + + true + + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + true + 0 + C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro + C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro + + false + + false + true + true + false + false + true + + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop Qt 5.9.9 MinGW 32bit + Desktop Qt 5.9.9 MinGW 32bit + qt.qt5.599.win32_mingw53_kit + 0 + 0 + 0 + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 2 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 2 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/src/eda_qt 1-24 2_06/main.cpp b/src/eda_qt 1-24 2_06/main.cpp new file mode 100644 index 0000000..fd3e533 --- /dev/null +++ b/src/eda_qt 1-24 2_06/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/src/eda_qt 1-24 2_06/mainwindow.cpp b/src/eda_qt 1-24 2_06/mainwindow.cpp new file mode 100644 index 0000000..cc2f93c --- /dev/null +++ b/src/eda_qt 1-24 2_06/mainwindow.cpp @@ -0,0 +1,24 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +#include "new_file.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::MainWindow) +{ + ui->setupUi(this); + this->showMaximized(); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + + +void MainWindow::on_actionNew_triggered() +{ + new_file *s = new new_file(this); + s->show(); +} diff --git a/src/eda_qt 1-24 2_06/mainwindow.h b/src/eda_qt 1-24 2_06/mainwindow.h new file mode 100644 index 0000000..509979f --- /dev/null +++ b/src/eda_qt 1-24 2_06/mainwindow.h @@ -0,0 +1,28 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +#include +#include +#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_actionNew_triggered(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H diff --git a/src/eda_qt 1-24 2_06/mainwindow.ui b/src/eda_qt 1-24 2_06/mainwindow.ui new file mode 100644 index 0000000..3a30ab5 --- /dev/null +++ b/src/eda_qt 1-24 2_06/mainwindow.ui @@ -0,0 +1,266 @@ + + + MainWindow + + + + 0 + 0 + 1056 + 672 + + + + MainWindow + + + + + 0 + 0 + + + + Qt::DefaultContextMenu + + + Qt::LeftToRight + + + + + + 2 + + + QLayout::SetMaximumSize + + + + + QLayout::SetMinimumSize + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + 0 + 0 + + + + 1 + + + + + 0 + 0 + 83 + 312 + + + + Page 1 + + + + + + 0 + 0 + 83 + 312 + + + + Page 2 + + + + + + + + 0 + + + + Tab 1 + + + + + Tab 2 + + + + + + + + + 0 + 0 + + + + 1 + + + + + 0 + 0 + 83 + 312 + + + + Page 1 + + + + + + 0 + 0 + 83 + 312 + + + + Page 2 + + + + + + + + + + QLayout::SetDefaultConstraint + + + + + + 0 + 0 + + + + + + + + + + + + + + 0 + 0 + 1056 + 25 + + + + + File + + + + + + Edit + + + + + + + + + New + + + + + + diff --git a/src/eda_qt 1-24 2_06/new_file.cpp b/src/eda_qt 1-24 2_06/new_file.cpp new file mode 100644 index 0000000..5b9d09d --- /dev/null +++ b/src/eda_qt 1-24 2_06/new_file.cpp @@ -0,0 +1,20 @@ +#include "new_file.h" +#include "ui_new_file.h" + +new_file::new_file(QWidget *parent) : + QDialog(parent), + ui(new Ui::new_file) +{ + ui->setupUi(this); + this->setModal(true); +} + +new_file::~new_file() +{ + delete ui; +} + +void new_file::on_pushButton_clicked() +{ + this->exec(); +} diff --git a/src/eda_qt 1-24 2_06/new_file.h b/src/eda_qt 1-24 2_06/new_file.h new file mode 100644 index 0000000..d11e8d7 --- /dev/null +++ b/src/eda_qt 1-24 2_06/new_file.h @@ -0,0 +1,25 @@ +#ifndef NEW_FILE_H +#define NEW_FILE_H + +#include + +namespace Ui { +class new_file; +} + +class new_file : public QDialog +{ + Q_OBJECT + +public: + explicit new_file(QWidget *parent = nullptr); + ~new_file(); + +private slots: + void on_pushButton_clicked(); + +private: + Ui::new_file *ui; +}; + +#endif // NEW_FILE_H diff --git a/src/eda_qt 1-24 2_06/new_file.ui b/src/eda_qt 1-24 2_06/new_file.ui new file mode 100644 index 0000000..1a661d9 --- /dev/null +++ b/src/eda_qt 1-24 2_06/new_file.ui @@ -0,0 +1,129 @@ + + + new_file + + + + 0 + 0 + 373 + 406 + + + + Dialog + + + + + 20 + -10 + 341 + 371 + + + + + QLayout::SetDefaultConstraint + + + + + + + Module Name: + + + + + + + + + + + + + + Input Ports: + + + + + + + + + + + + + + Output Ports: + + + + + + + + + + + + + + Input Ports: + + + + + + + + + + + + + + 20 + 350 + 341 + 41 + + + + + + + Ok + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + + + -- Gitee From c49ecf54dae3fd4189f143cbbb66197c04c557fc Mon Sep 17 00:00:00 2001 From: Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 18:14:43 +0800 Subject: [PATCH 10/12] test --- src/eda_qt/eda_qt.pro | 45 ++- src/eda_qt/eda_qt.pro.user | 569 +++++++++++++++++++++++++++++++++++-- src/eda_qt/main.cpp | 14 + src/eda_qt/mainwindow.cpp | 27 ++ src/eda_qt/mainwindow.h | 31 ++ src/eda_qt/mainwindow.ui | 5 +- src/eda_qt/new_file.cpp | 23 ++ src/eda_qt/new_file.h | 28 ++ 8 files changed, 706 insertions(+), 36 deletions(-) diff --git a/src/eda_qt/eda_qt.pro b/src/eda_qt/eda_qt.pro index 11f8211..f3d1fd2 100644 --- a/src/eda_qt/eda_qt.pro +++ b/src/eda_qt/eda_qt.pro @@ -1,3 +1,4 @@ +<<<<<<< HEAD QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -18,15 +19,11 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += \ main.cpp \ mainwindow.cpp \ - module.cpp \ - new_file.cpp \ - port.cpp + new_file.cpp HEADERS += \ mainwindow.h \ - module.h \ - new_file.h \ - port.h + new_file.h FORMS += \ mainwindow.ui \ @@ -36,3 +33,39 @@ FORMS += \ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target +======= +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp \ + mainwindow.cpp \ + new_file.cpp + +HEADERS += \ + mainwindow.h \ + new_file.h + +FORMS += \ + mainwindow.ui \ + new_file.ui + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/eda_qt.pro.user b/src/eda_qt/eda_qt.pro.user index 3f8d8c8..4d0e24b 100644 --- a/src/eda_qt/eda_qt.pro.user +++ b/src/eda_qt/eda_qt.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {c7d49916-8da1-4252-9fa0-c2c4861f43da} + {f13ef12e-62a1-4aaf-ac39-302b77838bbe} ProjectExplorer.Project.ActiveTarget @@ -55,21 +55,14 @@ ProjectExplorer.Project.PluginSettings - - true - true - true - true - - 0 - true -fno-delayed-template-parsing true + Builtin.Questionable true - Builtin.TidyAndClazy + Builtin.DefaultTidyAndClazy 2 @@ -80,6 +73,260 @@ ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + true + 0 + C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro + C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro + + false + + false + true + true + false + false + true + + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 Desktop Qt 5.14.2 MinGW 64-bit Desktop Qt 5.14.2 MinGW 64-bit @@ -88,16 +335,17 @@ 0 0 - C:/Users/Dell/Desktop/eda_qt/eda/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true QtProjectManager.QMakeBuildStep - true false - false - false + true @@ -134,18 +382,21 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 + 2 + 2 - C:/Users/Dell/Desktop/eda_qt/eda/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release true QtProjectManager.QMakeBuildStep - false false - false - true + true @@ -182,18 +433,21 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 + 0 + 2 - C:/Users/Dell/Desktop/eda_qt/eda/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true QtProjectManager.QMakeBuildStep - true false - true - true + true @@ -230,6 +484,8 @@ Profile Qt4ProjectManager.Qt4BuildConfiguration 0 + 0 + 0 3 @@ -240,6 +496,8 @@ ProjectExplorer.BuildSteps.Deploy 1 + + false ProjectExplorer.DefaultDeployConfiguration 1 @@ -304,27 +562,280 @@ 2 - eda_qt2 - Qt4ProjectManager.Qt4RunConfiguration:F:/Leoric/新建文件夹 (2)/eda_qt/eda/eda_qt/eda_qt.pro - F:/Leoric/新建文件夹 (2)/eda_qt/eda/eda_qt/eda_qt.pro + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop Qt 5.9.9 MinGW 32bit + Desktop Qt 5.9.9 MinGW 32bit + qt.qt5.599.win32_mingw53_kit + 0 + 0 + 0 + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 2 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 2 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + false false true - true false false true - C:/Users/Dell/Desktop/eda_qt/eda/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + 1 ProjectExplorer.Project.TargetCount - 1 + 3 ProjectExplorer.Project.Updater.FileVersion diff --git a/src/eda_qt/main.cpp b/src/eda_qt/main.cpp index aff48df..1d4fe45 100644 --- a/src/eda_qt/main.cpp +++ b/src/eda_qt/main.cpp @@ -1,3 +1,4 @@ +<<<<<<< HEAD #include "mainwindow.h" #include @@ -9,3 +10,16 @@ int main(int argc, char *argv[]) w.show(); return a.exec(); } +======= +#include "mainwindow.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + return a.exec(); +} +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/mainwindow.cpp b/src/eda_qt/mainwindow.cpp index 610e41f..6af3592 100644 --- a/src/eda_qt/mainwindow.cpp +++ b/src/eda_qt/mainwindow.cpp @@ -1,3 +1,4 @@ +<<<<<<< HEAD #include "mainwindow.h" #include "ui_mainwindow.h" @@ -22,3 +23,29 @@ void MainWindow::on_actionNew_triggered() new_file *s = new new_file(this); s->show(); } +======= +#include "mainwindow.h" +#include "ui_mainwindow.h" + +#include "new_file.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::MainWindow) +{ + ui->setupUi(this); + this->showMaximized(); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + + +void MainWindow::on_actionNew_triggered() +{ + new_file *s = new new_file(this); + s->show(); +} +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/mainwindow.h b/src/eda_qt/mainwindow.h index 2f1f23d..d6b54d3 100644 --- a/src/eda_qt/mainwindow.h +++ b/src/eda_qt/mainwindow.h @@ -1,3 +1,4 @@ +<<<<<<< HEAD #ifndef MAINWINDOW_H #define MAINWINDOW_H @@ -26,3 +27,33 @@ private: Ui::MainWindow *ui; }; #endif // MAINWINDOW_H +======= +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +#include +#include +#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_actionNew_triggered(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/mainwindow.ui b/src/eda_qt/mainwindow.ui index 6c166d4..b3db998 100644 --- a/src/eda_qt/mainwindow.ui +++ b/src/eda_qt/mainwindow.ui @@ -24,6 +24,9 @@ + + + @@ -36,7 +39,7 @@ 0 0 1056 - 23 + 25 diff --git a/src/eda_qt/new_file.cpp b/src/eda_qt/new_file.cpp index cff1e2d..68ee09d 100644 --- a/src/eda_qt/new_file.cpp +++ b/src/eda_qt/new_file.cpp @@ -1,3 +1,4 @@ +<<<<<<< HEAD #include "new_file.h" #include "ui_new_file.h" @@ -18,3 +19,25 @@ void new_file::on_pushButton_clicked() { this->exec(); } +======= +#include "new_file.h" +#include "ui_new_file.h" + +new_file::new_file(QWidget *parent) : + QDialog(parent), + ui(new Ui::new_file) +{ + ui->setupUi(this); + this->setModal(true); +} + +new_file::~new_file() +{ + delete ui; +} + +void new_file::on_pushButton_clicked() +{ + this->exec(); +} +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/new_file.h b/src/eda_qt/new_file.h index 4580756..24724f6 100644 --- a/src/eda_qt/new_file.h +++ b/src/eda_qt/new_file.h @@ -1,3 +1,4 @@ +<<<<<<< HEAD #ifndef NEW_FILE_H #define NEW_FILE_H @@ -23,3 +24,30 @@ private: }; #endif // NEW_FILE_H +======= +#ifndef NEW_FILE_H +#define NEW_FILE_H + +#include + +namespace Ui { +class new_file; +} + +class new_file : public QDialog +{ + Q_OBJECT + +public: + explicit new_file(QWidget *parent = nullptr); + ~new_file(); + +private slots: + void on_pushButton_clicked(); + +private: + Ui::new_file *ui; +}; + +#endif // NEW_FILE_H +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 -- Gitee From 9f7c4d7fa32782199ce09bb938eba8d4e82197c1 Mon Sep 17 00:00:00 2001 From: Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 18:23:41 +0800 Subject: [PATCH 11/12] 11 --- .gitignore | 34 - README.md | 52 -- ...346\210\252\345\233\27620210123232228.png" | Bin 9500 -> 0 bytes ...346\210\252\345\233\27620210123232905.png" | Bin 9700 -> 0 bytes ...346\210\252\345\233\27620210123233154.png" | Bin 8294 -> 0 bytes ...346\210\252\345\233\27620210123233330.png" | Bin 2805 -> 0 bytes ...346\210\252\345\233\27620210123233336.png" | Bin 2763 -> 0 bytes ...346\210\252\345\233\27620210123234037.png" | Bin 7545 -> 0 bytes ...346\210\252\345\233\27620210123234621.png" | Bin 1210 -> 0 bytes ...346\210\252\345\233\27620210123234626.png" | Bin 1548 -> 0 bytes ...346\210\252\345\233\27620210123234630.png" | Bin 1167 -> 0 bytes "pics/icon/\347\237\251\345\275\242.png" | Bin 1940 -> 0 bytes ...\345\244\264(input\346\210\226output).png" | Bin 4043 -> 0 bytes ...\275\242\357\274\210inout\357\274\211.png" | Bin 1935 -> 0 bytes "pics/\347\237\251\345\275\242.png" | Bin 1940 -> 0 bytes src/.keep | 0 src/eda_qt 1-24 2_06/eda_qt.pro | 34 - src/eda_qt 1-24 2_06/eda_qt.pro.user | 328 ------- .../eda_qt.pro.user.f13ef12.22 | 848 ------------------ src/eda_qt 1-24 2_06/main.cpp | 11 - src/eda_qt 1-24 2_06/mainwindow.cpp | 24 - src/eda_qt 1-24 2_06/mainwindow.h | 28 - src/eda_qt 1-24 2_06/mainwindow.ui | 266 ------ src/eda_qt 1-24 2_06/new_file.cpp | 20 - src/eda_qt 1-24 2_06/new_file.h | 25 - src/eda_qt 1-24 2_06/new_file.ui | 129 --- src/eda_qt/eda_qt.pro | 35 - src/eda_qt/eda_qt.pro.user | 848 ------------------ src/eda_qt/main.cpp | 12 - src/eda_qt/mainwindow.cpp | 25 - src/eda_qt/mainwindow.h | 29 - src/eda_qt/mainwindow.ui | 68 -- src/eda_qt/module.cpp | 40 - src/eda_qt/module.h | 23 - src/eda_qt/new_file.cpp | 21 - src/eda_qt/new_file.h | 26 - src/eda_qt/new_file.ui | 129 --- src/eda_qt/port.cpp | 51 -- src/eda_qt/port.h | 28 - 39 files changed, 3134 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123232228.png" delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123232905.png" delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123233154.png" delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123233330.png" delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123233336.png" delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123234037.png" delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123234621.png" delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123234626.png" delete mode 100644 "pics/QQ\346\210\252\345\233\27620210123234630.png" delete mode 100644 "pics/icon/\347\237\251\345\275\242.png" delete mode 100644 "pics/icon/\347\256\255\345\244\264(input\346\210\226output).png" delete mode 100644 "pics/icon/\351\225\277\346\226\271\345\275\242\357\274\210inout\357\274\211.png" delete mode 100644 "pics/\347\237\251\345\275\242.png" delete mode 100644 src/.keep delete mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro delete mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro.user delete mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 delete mode 100644 src/eda_qt 1-24 2_06/main.cpp delete mode 100644 src/eda_qt 1-24 2_06/mainwindow.cpp delete mode 100644 src/eda_qt 1-24 2_06/mainwindow.h delete mode 100644 src/eda_qt 1-24 2_06/mainwindow.ui delete mode 100644 src/eda_qt 1-24 2_06/new_file.cpp delete mode 100644 src/eda_qt 1-24 2_06/new_file.h delete mode 100644 src/eda_qt 1-24 2_06/new_file.ui delete mode 100644 src/eda_qt/eda_qt.pro delete mode 100644 src/eda_qt/eda_qt.pro.user delete mode 100644 src/eda_qt/main.cpp delete mode 100644 src/eda_qt/mainwindow.cpp delete mode 100644 src/eda_qt/mainwindow.h delete mode 100644 src/eda_qt/mainwindow.ui delete mode 100644 src/eda_qt/module.cpp delete mode 100644 src/eda_qt/module.h delete mode 100644 src/eda_qt/new_file.cpp delete mode 100644 src/eda_qt/new_file.h delete mode 100644 src/eda_qt/new_file.ui delete mode 100644 src/eda_qt/port.cpp delete mode 100644 src/eda_qt/port.h diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b14041c..0000000 --- a/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -/eda/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 6e293a4..0000000 --- a/README.md +++ /dev/null @@ -1,52 +0,0 @@ -# eda_qt - -### -介绍 -eda软件开发 - -## - 开发需求 -### ------------001------------ -点击“新建模块”按钮后，弹出一对话框，如： -![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/232300_bb1cd7c7_8607408.png "QQ截图20210123232228.png") - -用户可输入：模块名称、input端口数量、output端口数量、inout端口数量 -点击ok后，将出现一“矩形图”，代表着该模块 -![这是我们软件里用的矩形](https://images.gitee.com/uploads/images/2021/0123/232810_4125e7a6_8607408.png "矩形.png") -上图是我们要开发的软件里用的矩形图 -这是我们仿照的软件里的截图，模块名为123，input、output、inout都为1 -![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/232955_c341839e_8607408.png "QQ截图20210123232905.png") -点击某一端口时，应做到可以修改端口的属性，包括：![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/233219_b40e4d51_8607408.png "QQ截图20210123233154.png") -|端口名：要在矩形图上体现 -|输入输出类型：可以在input、output、inout中选![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/233346_328b5e77_8607408.png "QQ截图20210123233330.png") -|数据类型：可以在wire、reg中选![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/233408_06262ce9_8607408.png "QQ截图20210123233336.png") -|数据长度：可设置正整数值 -|颜色：此功能目前可先不做。。 -### ------------002------------ -双击模块矩形，可进入用户代码编辑界面 -此时用户只需要输入算法代码 如：assign c = a & b; -其他代码由软件自动生成。 -![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234049_deade8af_8607408.png "QQ截图20210123234037.png") -其中第一段的格式为module xxx[*](端口名); 如用户在最开始的对话框中填写模块名为123，且整个模块中所有的端口为a、b、c三个时 -软件将会生成module 123[*](a,b,c); - **第二段** 代码为：input/output/inout 端口名；例如用户设置a为input,b为output,c为inout。则代码为 -input a; output b; inout c; - **第三段** 代码为：端口数据类型 端口名；例如用户定义a端口为wire型，b、c端口为reg型，则： -wire a; reg b; reg c; -第四段代码为之前用户输入的算法代码 -最后是固定句式：endmodule 相当于这个模块结束了 -另外要注意：当端口的数据长度定义为i（正整数）时，相应的在上述 **第二段、第三段** 代码中要有所改变，在端口名前加[i-1:0] -例如：![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234717_374091e7_8607408.png "QQ截图20210123234621.png")用户定义了p0为3位 -![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234922_d18c6d0d_8607408.png "QQ截图20210123234626.png") ![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234930_6490091b_8607408.png "QQ截图20210123234630.png") -则p0前面加[2:0] -### ------------003------------ -应有“保存模块”和“生成代码”两个按钮。其中： -保存模块：做到将此次用户新建的模块里的所有内容打包保存 下次用户双击时可以直接在软件里打开 -生成代码：将软件生成的代码 让用户选择位置保存。保存为 **verilog目录** 目录下应有 **此模块及其内部子模块** 所有的verilog代码文件 **扩展名为.v** - - - - - - - - - diff --git "a/pics/QQ\346\210\252\345\233\27620210123232228.png" "b/pics/QQ\346\210\252\345\233\27620210123232228.png" deleted file mode 100644 index 13d9c58fe3ad78c0b7be7c3df3b5c10901109a23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9500 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 Xi6-i=VC^7IJs~N|s>#$ynFs$rkUl_z diff --git "a/pics/QQ\346\210\252\345\233\27620210123232905.png" "b/pics/QQ\346\210\252\345\233\27620210123232905.png" deleted file mode 100644 index b9407beedf26f04aae5be812b5dac38990c2892e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9700 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 c9`JEh4Z=l}o! diff --git "a/pics/QQ\346\210\252\345\233\27620210123233154.png" "b/pics/QQ\346\210\252\345\233\27620210123233154.png" deleted file mode 100644 index ad8a9eb9af3236208eebe33e44489950408e5097..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8294 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 diff --git "a/pics/QQ\346\210\252\345\233\27620210123233330.png" "b/pics/QQ\346\210\252\345\233\27620210123233330.png" deleted file mode 100644 index 5a84cab03c361c652fae0bced315d5b27bb7cda2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2805 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 Hu0mjf=iqW3 diff --git "a/pics/QQ\346\210\252\345\233\27620210123233336.png" "b/pics/QQ\346\210\252\345\233\27620210123233336.png" deleted file mode 100644 index c4385fa550d9ad0e9542256770f457bd48310ad2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2763 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 RMOFX+002ovPDHLkV1n;RCuaZv diff --git "a/pics/QQ\346\210\252\345\233\27620210123234037.png" "b/pics/QQ\346\210\252\345\233\27620210123234037.png" deleted file mode 100644 index a57fe0efb23f3b15496f51ba7ed86d1c255d01a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7545 zcmbt(bzD^6*DfKUbV%obAPob8bPdv=pmevSbR*4>f-t~H>5$S5GPE>9mw-bfNDoL0 zyrbXu{@(iB`?;Tc|2T8b%eGjwKxcjU`hWdUtr9%Z4zx^ zMbw3#5`Ul2+96DcW<4I&OA|r5y<+=Oh&NG?qn<%y`zyz|j|4s)J6;bVySp5_N5S}_ z*rm+1*-eUCp=>&@w0e3+UYGUf(wDD*rpvA8r91i^!#2P>T(T6v-NYdy3v9J7nH5kN z@)ni#JAwJP@<3PYn;*okJl7gLhR!20U5OXCMW$yzv!0f>l32a=WojR~2ApM3CnI(b zrBa@Xa`OnDPuLtdVfK3pKVDi?6x?&IG1(W@Vmh#DZ?S}_@2WN0)EdvSeAbx3=4g&Y zB2D-0x%|K*o5AkivhpY}g&jxDyB$0*hp&5EodXz_|A|tS#e&` zoHyRs75d52y;tEG?jWz|F2ys%mD0U;cqw=@`HSZ)SlTj)35b+6nOp{=t?MI}HF=pF zc^Aafqmd=^Y7QgLTZqdA6SnPyGglw+ih=Q0n-#j-4`e6j9B(SRZlyJ0cFbUYxT7!E z4PDs;`HJ^iR*i0}3Z!9fbzkzrYU@dEj~eXLVW=4D;VoTB8nFyOz#cn(_i;UeV-VHZj+ZXrw&4n z0Q$jg!oJ)g8Hx98H`)W=Sy*Tgq=@axT5;OmRA(|%tS0C6EX4ixHM)oRKD=|a@!Ns6 z?a1!N_NFmk0JXa|cM;e;XvrG^5+#qzTUdCeC&F`_iw`3r37Fp*U~8@qD}t^NTLUR( z&10IBE*ck%$e>QV1daO zMqVVm!v#r45zdb(W!Ce=t!XO=P}D(i2e-lOh%YWxHB}3ZoU0F0W%`p)Mb~^_z24ew zz1V{nUJE|s!(sD=h#?d`nOxiMeA=7$c+aYYtsI)Cn`~N%gIKl0!4}Q9^AFwE-Wi=c z+jrs z>%NrDL4J6Mi49tF$yPWEj%6W6sh|B`WTW%h>d@+QsrS<9zwmbixs4dKJb&9F8LsA} z!hf>;VfMqN%T}{0Pf_IC!hUz-^5RQiql=R%T++0`sQefI`lj+yI*25!l&UENyjSuv}1W{@P7vR-Kr;9PNWT=teE2EX-!Y8o& zWLDpu`F;h?6gw!0gcQXK){D<{<7XMu^9O*>*}a1AhWAO?1t8Yi$`pk^bZ$Fzx)2cOqyC|Mj- zU>P`ULpOd0b%kY>({GUZ*?GwQ_cV{6}7aGI5RH2PzJG)0Gy7N8Tyst8gOvH`1bMH7;76*eaO zxib$FsBZA3I>x(EOjPUA01cgELupMHdZXR3KbaM8a@9_?rb4$%pU;_cOQ0;88ad*J znM3iIQL(-l*7%Yem1UmdJP?4|s` z;OMxPWFZ0x!`+HBt$KNjMjLP?aYJ$S2wuKw?L*xu7q#_)!+zmAiM_(kSO>onr@@OK zHI&)CKe~C}FWj4VG3ws#=FqY!J>nIefQ&EekVG*uRK`g;qFyQiTE1WT^;T{3SIERT zC1NUyAPnl`z-eo3>YxHj#s9o~wN;|`*9N(!eKKy*>@Abu-lN%?1_&xhTNv`wu_LHc zUC(`VO_T}}`9;}ebF5P2#?lUtMRt6HHCuOT}nErP1(; zdQ1#uX|Ja`@iy%*aX@BQH)2mfy28u>I%@6%-{PXFWn;ORzP~9&a+47epJI2!25*b& z_JjapgN{C#9cDmK;L3Zw#nsZ_ds@|kl4Tu4{Fc7C+9rS&H3Qmr=&iGrLT?+ol?qpG zH^)EI{f|Wj6GC|#4aDC$Y@Z6*1ZA4jHJFfTfWDS=ARjGbSM(ut(=%D=jN%lFz&D$Q zh*3IOZ=5od%n+KMRf@VNU$3Fy=)~^i6wJENjcszDh9N(7d?r^IzkRmY%3yJdWnQeq zFO8y zF7I0!E8VkJEwt%%sDU2ky=JskpUAb2JGbXGnE)-3(@_b-??O4>*=+u0IX2dP zpK71+XEH;6{2FdOVVgLaQ7F1seLQxP1A$oJT2@7oG|G(SH2J#tpG7C}0|h7eGT#Mr zM<_ctmH;J=+{}Ug*e@^p1{_+3NNX>E}t@_|CZpR(|Yj1j17^YY&AGDim zayQ1nzMJe6(w*#X^~jSMieSgu5uNPe^3fw9)r1HH4TD~)uX<+K_;STlny5I)Tl;rx zb$0C-7kF3+RT0EHrQ*Y#Wa~09a+Twg;|FZXt)QXsiGcknjw8zhjGAm){nn=HCTZfP zVCwj512dKGtLG-#>`6rXuRUKgT;@Lp+%u2Xu4k91lJUxj1CP>RvTeqJE12>vj5+LZ z6KXW-U7@bFHIK0Dyk1ko;aA#HXa#Wj62S^H`#GGM;OnmDl@HSAwv@^f)vqK-9s&k7 zfs7USPpFogp0oqQkIpEm+OFWw70UB1dHQ1U00uvTXH@y$VlV~u6vKk3J8d{3uAO^H zy*JOPJ5=!wkc<=NxY+=?I9QhTR`+^!O+p}pF6+cG8A03Ko48z}qh^zF06#oxenfGY zP@B0g862%|uJFUov<}7$@_p??5d(M$K$$vx6k%Z>6myR&L1_((%o{Z^H!)v$E z8zgKfE!Wy~q_W%pbVaDoSZ4zJq8BJ!^P{*__eD+87mkR&OA(;bdV_QCv{%-~{3F@i z%efajUFWPVrMMzCCMxVEM<3iax%P%u_VK%&nn+6#UMy*XxG{WKx=p2dZare}3N4rh zqtJMaW1i4_(33$*=>nxFdhlZGajVu3DLPZ^DP=Ufjcy2a32T71W@EyZhhd@XGh1)i z8)*eWrWOMtn|&8&J{`W{+mrOw2jpZ#S(uC$k6@Nv|KYGdc#i>X^R|1`V`gdK9n+-b z7lxZj4}XEvTJEvt*A6lAY?FO1lCpUqshm0WAa0m>!b;FBXj+6@)HR1gp;KqGGJsjf z8=6yZd*it#9OXKP1lg%~+{oSX9_B9uu1RZwDjpL-f3>vwPw1=?+ZJpjzT0h+U=VHn9-&d{Iw9o#glMjkK1>MXPY*h zr1%t|zjjxgPv%FQM-$Oi{!w{4t~;4)moH)bUU!%y1m54bKWPMkSI+ZnpL!tm zqPNqO>MwWx>(oYbi3oRt97uoUsL{p%mE^$kn2?rJ&*pw~y9sZ9oG&P14GXTGeja6A zKK80?e*ask#^=vPb1G!l!*w%pzE7e`(49)Cuf|Qe0TL%vTy@!|mEg?64>?zk0W&w> z%ta3rC%KpSSpAysQ?;_~RJ11yzAT-8^vlR|0FvlIM6Ii-t&3pEIcGWUY@L{h@h20V zxn?r_J0vME-3W+jzi&E0t)n^iTtc2HzxiMX$sJo__6MkS3N0WJFWgzZ?S=<_n=sGyG`{ADDi{`FcR11}C~Rnq&N5e&hQctH?Z24oDQ% zgru0~ngVvBx*pJ)fSyRF5=_y%gJfLkimTCcP{BzLaEN+%2yW?vz0#~%V|*b{{Rk~` zh`whMk`Yn=kvacAH2z-&(|;X_E;*UY(o}|T@@=G7hi?=(z)?;i8XWyF4-NvUaXAiV zTiI**yd|!&miZ|Y%)S)=+Oxkz!$>Tn#y10T9%EoG+np_5^|4B_&00%1T{W+9DQ8V4 zyR zDEUbJ&LwV-FDvgm>WnjyQuTkyX6MMgdQ$gyz{% z660P^i&h^n22c~$!bJ?19bdCw6A(+2^@tUnQYF4b`?H05^fp#Wn-<5)bf3D&vybP zm*M@QOOr*NLzLvKZA#Y1(XN(mfvxTqmuQiTVEbZ`-EOABMry9`yxvwTlN&UIvXc5- z9q|<^#o-qnTe6jwG-yJM!%!s?!&WmA%BmB}_eac&sgVCSS^pXHK5Y~PRSzT?{?@d- z0|HT7{q@P2P!rDe9s z-^e2c2Ng^n>Gw_fk>1a?ke7^V`zuB(##C4Vwg%eI{s>@O+>N;9kUvk5zna}Ig8je4 z8V$x5e+2W@zk^WQk|IS%zW`|Vmjs9Wp5T=E9g?T0>3;;~64I=PJgNXLk%z}*Sy)QJ z;y>**VpRam_A1P11@_9T5@OKt0G{S78_&8+Od>rOL4T$&&w2%IA(IV{14n#Xc>;BA zc~!0cUrr={;s*X@X%?voF{5>>-F4FdB@({1ZJoS-Ow+5V*U7d+px4I+D2(m^=APh6 zsm!6j!3czZLr^9m_oV#U^FFY(^+Ah<1_Z|V$v%7GaId2yYBJ@G^&ECDY_1Vkr6SjbXtCo0D+r_B>mIK&k?r za@h+?&nx2?Uowit)!BDGTnEi z@>7>};>J8_x!9ErY9GHXpDPsKd5B4p?(e=9bC9^t9@yD%6;$_JTKh=kYLBI%lkQ6o z>%SmzqjM2jdj^O!4&{EhPKtey-1LLzNvSa3=dK*+D6YoR`ezKK6ix;#XzPv9aJ3jmS8M07!uiTzY z9g^rGo|0F?Z+(f##l|ahOBtFu)NlJI14!={!IxW@W7c2iQ2H~k2Qpw$`(jyZw~sxg zN#hu__RV3o*nK%_nEvac$%D;qw(OztiS~HBq$1;{0cT55e+O55RO0JxV{*&Q488)= zAV~jNk^6H(OUK&dM=pnDEwuR30w;3yJ}GqKyB7Oi48>EY#!XY(4X43nuHS447`<6_ zNiivcjfwEN^g+(J&0HjYLLD4(370Q~WG6;{w-CjJLM7#R^-V=Zb<2&_imQt4I`kNu z;nGVVFWv4TO7PQ(XnD~&PFJhlVN;P|=xD5W+&@`_n$fjeAk};Al$>1U^^s$Vb{2xKG!=NiO`FKN_?uDYd&XFH>T`D>;eTFB{)K9tJIIe zAhGJxB(ywASU3(UTwEvCW}!?)vPu4lqdp(RT+Fq;#w+#$+#;EKzxs^zWEaCXJbvN@ z>3La-lJE&jX^wt)g%@lZE3L5-$N+Ys%J=MCqZtw++g$3U!tO*XYM1)v%6PZTepS`> zMgikao|;dAGQO$j4KIB&TEr_Bo$PZi#mBCUqKxZMMe@asaCRepaq%UTAC?o3R!~)9 z%+oiz*N0QFko{}FG#M(^mpv!vwgomUJ&5!H!xQ+txF<7i)Dn&)v$_Mw|eq8i7Yw;P_gYAgE;_LJ;6_ddRThNg0nvCr`+x&SCY*z-zAz zI=4EuQTnxUw+WXTNo`*)^cnAjYi?Qpas28kZyGa+8Ap)6eHR?~fZwguV?^Upk*+vQ zF7@N3!F6z4UJvCv=joZ$bphf~bGHm&OB(3c zM2w>2R2O4-SEBVi9vP$}{i-`?IJd`K-1|IV zc(;E$B5`v~IQi4*wVy&?NKV45ff$4uoYS|e1uJPw??p%}@&YCgBPMz=AP3j83qEDk z`LZ*^wlvOHUQzF!Lqx_UWP;9$V#g?z{d-!pH~D8+$IZUm%@PhQ>|c_98Yc>2|9j<* ztn7Bq&r^tg&kBCCpbuN^N&jCVhO@6_-rC5hP)HmER4nh&nbjQ8fr|*otmSc!WXQ%p z6hEq(@eQ~!tD;ygM|SBS>;#|-9*NYovz3j+i;r%8&KV@8{~Alo*%^-gSHZ+#F(dC< z%^7}Gv&?;x5Nyn#EEq&&{&8gA=v>wluPIBbPIC890W>lliO4$5_*Mh49Z)h~o9nGY zomZcRa$DN>c?7Oy-&^j*r_{ zPwHQHYkkw+3wpZ2S<~o2v~2@tbi6~q!Dr?`XH`1nJ>Glg7kf82PPC{xvClKsmkg4X z^!M60hy`6}>l#?PSH)bU^HAFPvj<{*0qv&FKAx}|zF~>h`(KdvP09?5Yur3??pwou z06(++PCoF0Gj1QD2X83lgDMyvKG<-spd8`4t-|B7atzu8SEX-^t3jcwWi<-RjsUUn7F`IT9F7ByrM@AZf+W;Q zzLQbeT2s#Yff2>5w^rhI1+6-@n%gVyS|s@`gsI=9CRg~pBC%um?p9mOJjtQiP@!)x zL}Z)FkMn5%%pkCW@chZ|!E53?PuteaOEQ6gnhZ!V#co1-xv70&;Pj}Ek{IIg6%U^4 z;)C{oW~b@<^K57iKZfBdv~<;|BqDSIoZfdfchRS_JeQRj+O%muTC~3io2qp?raWVB zHx(+buQRPdEJPN%z6rdZ&FUbSnCXGNl4d#VzU`O2oj63Y(5bYpW&G#FzxAIqrt$yC dW$xTzuI*cvkpSa}(Ir(3RV6J@rGiEHzX6WvoZkQd diff --git "a/pics/QQ\346\210\252\345\233\27620210123234621.png" "b/pics/QQ\346\210\252\345\233\27620210123234621.png" deleted file mode 100644 index 7e9974b8c1909ceeaaa09497ced4e13b96387758..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1210 zcmV;r1V#IaP)P03efu68Yp13PaM(XzzY9udug zkxGN5k^#%I#LYknHnfTe2KR2|psAU#I}?sjt_H7Nl_%_H7M!>7>yLYI$_MCnPqB?X zY%Z&4Cp|8D^2S^vkf0Q^;@-wl6bZamBbGI&A_MT#1rIG%6RrHFn#dwr@CLRW&`&SY z#502E_xMfi^&zsChI*H^v_{NYo|HE^=-n>5dhYHq`3Jm7ZbURAp8IPAW33ZN3s@3& z7nfde@NJnF$QV{IYuB?bY_lnH0TD3tI{c7B!jr{TBuTn%MYf4WxN2iaWO>0)eDJ zw`!O__Ge=iT95)<;IiLrJVIO7-iIoteyQLe>{Se^2E5jOm~CW>Q2aP>d1(I9F!fF2K2ueKM;7A;_wx7@j^5c=PS?-J6I^z#7sVHyCH2wkSLb?Ji`^i zKtrV>QvOC*PW0<%%XIw_pj3#53Rh$SQE3oHnJ{aaVYv@w@pBKK7zt=X|M~Rc;=FV_ z6PIe$U}koXf@d%Gc=9f(<^Zzp3HonR%>T{YI#wSFCm*1>Af8t?2?RvNcU}1L*5qKSVP*%RTy<(OY6Okc)nzWrwn6t zewbDGY-o8q8czv^u0XGMpvJea&tP_t({Z{D{Jgo0)Ta1bF5}=-2jc)u>e;}=JyWN}~6H1rJwy^kGIviwV;b6?Oy@!wxPEDeZ=i-knQKtM!bARr>) YA5~Q7TBJC~8~^|S07*qoM6N<$g1QSVga7~l diff --git "a/pics/QQ\346\210\252\345\233\27620210123234626.png" "b/pics/QQ\346\210\252\345\233\27620210123234626.png" deleted file mode 100644 index 4ce31a275337ed5451f480e3c3a041cea9102cc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1548 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 diff --git "a/pics/icon/\347\237\251\345\275\242.png" "b/pics/icon/\347\237\251\345\275\242.png" deleted file mode 100644 index 828bf6a2fbb3fa44b9d9d51d89d5f9f0f25b7f53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1940 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 Aj{pDw diff --git "a/pics/icon/\351\225\277\346\226\271\345\275\242\357\274\210inout\357\274\211.png" "b/pics/icon/\351\225\277\346\226\271\345\275\242\357\274\210inout\357\274\211.png" deleted file mode 100644 index 575fc55443c1483c58205e218decb8dea3ebc47b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1935 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJFtFi#i9kczmsS2pI#go&_T zR82O0V8-(NNZ8|PcX%0(nO$k)F4)yjqyfWwUjhL+>)=NcGx zFtQzDV^OfND`8_fz-u62roiy<<3eKvhP;Nx4UCK&{rqzo84H+sT6j4eDr#Qva5PAd zT0w#y%;G1~Bi@b1~a zzyAM^A3qcsu5urk3yhzaKM!69#>QW!56gj6Ro#bDW~PAs41Y42nI_DWuesa6a7CY? z{#FCSlIQI4<_Zj7xev@A)ixR=qp5^y8Rt5~pO000|E=;qeEz_M#{KipKd;~aX%8=> zQ({BoVn#*_uFrEDRhgMKY*7tkbipmC<0Z5j{9flIR@BrK!^8WtPemy9q{VDQdP xN_>#vz|eQ7COzR~1B1@m&el-_s2c|MjJ`L`Y~N|7J_c5_44$rjF6*2UngDyv-E{x} diff --git "a/pics/\347\237\251\345\275\242.png" "b/pics/\347\237\251\345\275\242.png" deleted file mode 100644 index 828bf6a2fbb3fa44b9d9d51d89d5f9f0f25b7f53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1940 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJFtXipc%kczms*Ejmg1WL4C z{Jw}chK29s%EOb4-E$5FamZS@O<2QS;Jb`TDZ5jSlhNtc0Sl?xbgdcH|5mS_X=%g4 zk;0m0w(|iC2M_ZC7M4RyYzj3s7da&uWEBL&3>Y3h?)E#t@PeUnLjxm+e0&KLn*%#X z3oDPqj~|PK4H&E(6m$|84jmVt+rW5%ktvapS-@`J3l^RRJ^>DHiG~j!UDXp9N*Wv@ z4luOz>sv80FJK-hD;~UIcq7+$|Jj`I4i14E`wmFG{`oZR|L5dMpP4^Y?3tf@FVB7# z3kyfj)_H#Ie_I(Zurj$ep65Fd_4@tk#Q#e()QlU~a=($Q`#Z0==KmM*2F4pztb6Js z4=_wwuU{Q^fZ>TY!vbJXoVq^URzHE^lPE&~F!Y|jK0Qy|fZ-<>g9b1(K7CC+52R{X z8KwXO@aL~h&w_eLN#WDkF2izI|^h8JQ=nXK2{ez^D-)|7}kL z - - - - - EnvironmentId - {d7319875-1e1d-4456-a97d-d87e35d07a5e} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.12.1 MinGW 64-bit - Desktop Qt 5.12.1 MinGW 64-bit - qt.qt5.5121.win64_mingw73_kit - 0 - 0 - 0 - - F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 0 - 部署 - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy Configuration - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - eda_qt - - Qt4ProjectManager.Qt4RunConfiguration:F:/eda_dev/eda_qt/src/eda_qt 1-24 2_06/eda_qt.pro - eda_qt.pro - - 3768 - false - true - true - false - false - true - - F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 20 - - - Version - 20 - - diff --git a/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 b/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 deleted file mode 100644 index 2e506bf..0000000 --- a/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 +++ /dev/null @@ -1,848 +0,0 @@ - - - - - - EnvironmentId - {f13ef12e-62a1-4aaf-ac39-302b77838bbe} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - Builtin.Questionable - - true - Builtin.DefaultTidyAndClazy - 2 - - - - true - - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit - 0 - 0 - 0 - - true - 0 - C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro - C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro - - false - - false - true - true - false - false - true - - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit - 0 - 0 - 0 - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.2 - - Desktop Qt 5.9.9 MinGW 32bit - Desktop Qt 5.9.9 MinGW 32bit - qt.qt5.599.win32_mingw53_kit - 0 - 0 - 0 - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 2 - 2 - - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 2 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.TargetCount - 3 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/src/eda_qt 1-24 2_06/main.cpp b/src/eda_qt 1-24 2_06/main.cpp deleted file mode 100644 index fd3e533..0000000 --- a/src/eda_qt 1-24 2_06/main.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "mainwindow.h" - -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; - w.show(); - return a.exec(); -} diff --git a/src/eda_qt 1-24 2_06/mainwindow.cpp b/src/eda_qt 1-24 2_06/mainwindow.cpp deleted file mode 100644 index cc2f93c..0000000 --- a/src/eda_qt 1-24 2_06/mainwindow.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" - -#include "new_file.h" - -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent) - , ui(new Ui::MainWindow) -{ - ui->setupUi(this); - this->showMaximized(); -} - -MainWindow::~MainWindow() -{ - delete ui; -} - - -void MainWindow::on_actionNew_triggered() -{ - new_file *s = new new_file(this); - s->show(); -} diff --git a/src/eda_qt 1-24 2_06/mainwindow.h b/src/eda_qt 1-24 2_06/mainwindow.h deleted file mode 100644 index 509979f..0000000 --- a/src/eda_qt 1-24 2_06/mainwindow.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include - -#include -#include -#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_actionNew_triggered(); - -private: - Ui::MainWindow *ui; -}; -#endif // MAINWINDOW_H diff --git a/src/eda_qt 1-24 2_06/mainwindow.ui b/src/eda_qt 1-24 2_06/mainwindow.ui deleted file mode 100644 index 3a30ab5..0000000 --- a/src/eda_qt 1-24 2_06/mainwindow.ui +++ /dev/null @@ -1,266 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 1056 - 672 - - - - MainWindow - - - - - 0 - 0 - - - - Qt::DefaultContextMenu - - - Qt::LeftToRight - - - - - - 2 - - - QLayout::SetMaximumSize - - - - - QLayout::SetMinimumSize - - - - - PushButton - - - - - - - PushButton - - - - - - - PushButton - - - - - - - PushButton - - - - - - - PushButton - - - - - - - PushButton - - - - - - - PushButton - - - - - - - PushButton - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 0 - 0 - - - - 1 - - - - - 0 - 0 - 83 - 312 - - - - Page 1 - - - - - - 0 - 0 - 83 - 312 - - - - Page 2 - - - - - - - - 0 - - - - Tab 1 - - - - - Tab 2 - - - - - - - - - 0 - 0 - - - - 1 - - - - - 0 - 0 - 83 - 312 - - - - Page 1 - - - - - - 0 - 0 - 83 - 312 - - - - Page 2 - - - - - - - - - - QLayout::SetDefaultConstraint - - - - - - 0 - 0 - - - - - - - - - - - - - - 0 - 0 - 1056 - 25 - - - - - File - - - - - - Edit - - - - - - - - - New - - - - - - diff --git a/src/eda_qt 1-24 2_06/new_file.cpp b/src/eda_qt 1-24 2_06/new_file.cpp deleted file mode 100644 index 5b9d09d..0000000 --- a/src/eda_qt 1-24 2_06/new_file.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "new_file.h" -#include "ui_new_file.h" - -new_file::new_file(QWidget *parent) : - QDialog(parent), - ui(new Ui::new_file) -{ - ui->setupUi(this); - this->setModal(true); -} - -new_file::~new_file() -{ - delete ui; -} - -void new_file::on_pushButton_clicked() -{ - this->exec(); -} diff --git a/src/eda_qt 1-24 2_06/new_file.h b/src/eda_qt 1-24 2_06/new_file.h deleted file mode 100644 index d11e8d7..0000000 --- a/src/eda_qt 1-24 2_06/new_file.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef NEW_FILE_H -#define NEW_FILE_H - -#include - -namespace Ui { -class new_file; -} - -class new_file : public QDialog -{ - Q_OBJECT - -public: - explicit new_file(QWidget *parent = nullptr); - ~new_file(); - -private slots: - void on_pushButton_clicked(); - -private: - Ui::new_file *ui; -}; - -#endif // NEW_FILE_H diff --git a/src/eda_qt 1-24 2_06/new_file.ui b/src/eda_qt 1-24 2_06/new_file.ui deleted file mode 100644 index 1a661d9..0000000 --- a/src/eda_qt 1-24 2_06/new_file.ui +++ /dev/null @@ -1,129 +0,0 @@ - - - new_file - - - - 0 - 0 - 373 - 406 - - - - Dialog - - - - - 20 - -10 - 341 - 371 - - - - - QLayout::SetDefaultConstraint - - - - - - - Module Name: - - - - - - - - - - - - - - Input Ports: - - - - - - - - - - - - - - Output Ports: - - - - - - - - - - - - - - Input Ports: - - - - - - - - - - - - - - 20 - 350 - 341 - 41 - - - - - - - Ok - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel - - - - - - - - - diff --git a/src/eda_qt/eda_qt.pro b/src/eda_qt/eda_qt.pro deleted file mode 100644 index a199024..0000000 --- a/src/eda_qt/eda_qt.pro +++ /dev/null @@ -1,35 +0,0 @@ -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -CONFIG += c++11 - -# The following define makes your compiler emit warnings if you use -# any Qt feature that has been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if it uses deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -SOURCES += \ - main.cpp \ - mainwindow.cpp \ - new_file.cpp - -HEADERS += \ - mainwindow.h \ - new_file.h - -FORMS += \ - mainwindow.ui \ - new_file.ui - -# Default rules for deployment. -qnx: target.path = /tmp/$${TARGET}/bin -else: unix:!android: target.path = /opt/$${TARGET}/bin -!isEmpty(target.path): INSTALLS += target ->>>>>>> master diff --git a/src/eda_qt/eda_qt.pro.user b/src/eda_qt/eda_qt.pro.user deleted file mode 100644 index 6309f1c..0000000 --- a/src/eda_qt/eda_qt.pro.user +++ /dev/null @@ -1,848 +0,0 @@ - - - - - - EnvironmentId - {f13ef12e-62a1-4aaf-ac39-302b77838bbe} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - -fno-delayed-template-parsing - - true - Builtin.Questionable - - true - Builtin.DefaultTidyAndClazy - 2 - - - - true - - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit - 0 - 0 - 0 - - true - 0 - C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro - C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro - - false - - false - true - true - false - false - true - - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit - 0 - 0 - 0 - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 2 - - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 0 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.Target.2 - - Desktop Qt 5.9.9 MinGW 32bit - Desktop Qt 5.9.9 MinGW 32bit - qt.qt5.599.win32_mingw53_kit - 0 - 0 - 0 - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - 2 - 2 - - - true - 2 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 2 - 2 - - - true - 0 - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile - C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile - - - true - QtProjectManager.QMakeBuildStep - - false - - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - 2 - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - ProjectExplorer.CustomExecutableRunConfiguration - - - false - - false - true - false - false - true - - - - 1 - - - - ProjectExplorer.Project.TargetCount - 3 - - - ProjectExplorer.Project.Updater.FileVersion - 22 - - - Version - 22 - - diff --git a/src/eda_qt/main.cpp b/src/eda_qt/main.cpp deleted file mode 100644 index aa1be9e..0000000 --- a/src/eda_qt/main.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "mainwindow.h" - -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; - w.show(); - return a.exec(); -} ->>>>>>> master diff --git a/src/eda_qt/mainwindow.cpp b/src/eda_qt/mainwindow.cpp deleted file mode 100644 index 6b93038..0000000 --- a/src/eda_qt/mainwindow.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" - -#include "new_file.h" - -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent) - , ui(new Ui::MainWindow) -{ - ui->setupUi(this); - this->showMaximized(); -} - -MainWindow::~MainWindow() -{ - delete ui; -} - - -void MainWindow::on_actionNew_triggered() -{ - new_file *s = new new_file(this); - s->show(); -} ->>>>>>> master diff --git a/src/eda_qt/mainwindow.h b/src/eda_qt/mainwindow.h deleted file mode 100644 index 1ec98fc..0000000 --- a/src/eda_qt/mainwindow.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include - -#include -#include -#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_actionNew_triggered(); - -private: - Ui::MainWindow *ui; -}; -#endif // MAINWINDOW_H ->>>>>>> master diff --git a/src/eda_qt/mainwindow.ui b/src/eda_qt/mainwindow.ui deleted file mode 100644 index d8e3831..0000000 --- a/src/eda_qt/mainwindow.ui +++ /dev/null @@ -1,68 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 1056 - 672 - - - - MainWindow - - - - - - 10 - 10 - 1021 - 601 - - - - - - - - - - - - - - - - 0 - 0 - 1056 - 25 - - - - - File - - - - - - Edit - - - - - - - - - New - - - - - - diff --git a/src/eda_qt/module.cpp b/src/eda_qt/module.cpp deleted file mode 100644 index 5ea69e2..0000000 --- a/src/eda_qt/module.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "module.h" -#include - -Module::Module() -{ - -} - -Module::Module(std::string name,int inputPorts,int outputPorts,int inOutPorts) -{ - this->name = name; - int portsNum = 0; - for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),INPUT,0,1)); - } - for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),OUTPUT,0,1)); - } - for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),INOUT,0,1)); - } -} - -void Module::setCode(std::string code) -{ - this->code = code; -} - -std::string Module::getCode() -{ - return this->code; -} - -std::string Module::generateCode() -{ - -} diff --git a/src/eda_qt/module.h b/src/eda_qt/module.h deleted file mode 100644 index 804962c..0000000 --- a/src/eda_qt/module.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef MODULE_H -#define MODULE_H -#include -#include -#include "port.h" -class Module -{ -private: - std::string name; - int inputPorts; - int ouputPorts; - int inOutPorts; - std::string code; - std::vector ports; -public: - Module(); - Module(std::string,int,int,int); - void setCode(std::string); - std::string getCode(); - std::string generateCode(); -}; - -#endif // MODULE_H diff --git a/src/eda_qt/new_file.cpp b/src/eda_qt/new_file.cpp deleted file mode 100644 index ba5e5c0..0000000 --- a/src/eda_qt/new_file.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "new_file.h" -#include "ui_new_file.h" - -new_file::new_file(QWidget *parent) : - QDialog(parent), - ui(new Ui::new_file) -{ - ui->setupUi(this); - this->setModal(true); -} - -new_file::~new_file() -{ - delete ui; -} - -void new_file::on_pushButton_clicked() -{ - this->exec(); -} ->>>>>>> master diff --git a/src/eda_qt/new_file.h b/src/eda_qt/new_file.h deleted file mode 100644 index beb5a9b..0000000 --- a/src/eda_qt/new_file.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef NEW_FILE_H -#define NEW_FILE_H - -#include - -namespace Ui { -class new_file; -} - -class new_file : public QDialog -{ - Q_OBJECT - -public: - explicit new_file(QWidget *parent = nullptr); - ~new_file(); - -private slots: - void on_pushButton_clicked(); - -private: - Ui::new_file *ui; -}; - -#endif // NEW_FILE_H ->>>>>>> master diff --git a/src/eda_qt/new_file.ui b/src/eda_qt/new_file.ui deleted file mode 100644 index 015f0da..0000000 --- a/src/eda_qt/new_file.ui +++ /dev/null @@ -1,129 +0,0 @@ - - - new_file - - - - 0 - 0 - 373 - 459 - - - - Dialog - - - - - 20 - 20 - 341 - 371 - - - - - QLayout::SetDefaultConstraint - - - - - - - Module Name: - - - - - - - - - - - - - - Input Ports: - - - - - - - - - - - - - - Output Ports: - - - - - - - - - - - - - - Input Ports: - - - - - - - - - - - - - - 20 - 400 - 341 - 41 - - - - - - - Ok - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Cancel - - - - - - - - - diff --git a/src/eda_qt/port.cpp b/src/eda_qt/port.cpp deleted file mode 100644 index 077830f..0000000 --- a/src/eda_qt/port.cpp +++ /dev/null @@ -1,51 +0,0 @@ -#include "port.h" - -Port::Port() -{ - -} - -Port::Port(std::string name,PortType portType,bool dataType,int dataSize) -{ - this->name = name; - this->portType = portType; - this->dataSize =dataSize; - this->dataType = dataType; -} - -void Port::setName(std::string name) -{ - this->name = name; -} - -std::string Port::getName() -{ - return this->name; -} - -void Port::setPortType(PortType portType) -{ - this->portType = portType; -} -PortType Port::getPortType() -{ - return this->portType; -} - -void Port::setDataType(bool dataType) -{ - this->dataType = dataType; -} -bool Port::getDataType() -{ - return this->dataType; -} - -void Port::setDataSize(int dataSize) -{ - this->dataSize = dataSize; -} -int Port::getDataSize() -{ - return this->dataSize; -} diff --git a/src/eda_qt/port.h b/src/eda_qt/port.h deleted file mode 100644 index 813d0ec..0000000 --- a/src/eda_qt/port.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef PORT_H -#define PORT_H -#include - -enum PortType{INPUT,OUTPUT,INOUT}; - -class Port -{ -private: - std::string name; //端口名 - PortType portType; //输入或输出 0为in 1为out - bool dataType; //数据类型 0为wire 1为reg - int dataSize; //数据长度 -public: - Port(); - Port(std::string,PortType,bool,int); - void setName(std::string); - std::string getName(); - void setPortType(PortType); - PortType getPortType(); - void setDataType(bool); - bool getDataType(); - void setDataSize(int); - int getDataSize(); - -}; - -#endif // PORT_H -- Gitee From 0630a66581b5145b62854c74528436a18de16bee Mon Sep 17 00:00:00 2001 From: Leoric <1563827298@qq.com> Date: Sun, 24 Jan 2021 18:25:22 +0800 Subject: [PATCH 12/12] 1111 --- .gitignore | 34 + README.md | 52 ++ ...346\210\252\345\233\27620210123232228.png" | Bin 0 -> 9500 bytes ...346\210\252\345\233\27620210123232905.png" | Bin 0 -> 9700 bytes ...346\210\252\345\233\27620210123233154.png" | Bin 0 -> 8294 bytes ...346\210\252\345\233\27620210123233330.png" | Bin 0 -> 2805 bytes ...346\210\252\345\233\27620210123233336.png" | Bin 0 -> 2763 bytes ...346\210\252\345\233\27620210123234037.png" | Bin 0 -> 7545 bytes ...346\210\252\345\233\27620210123234621.png" | Bin 0 -> 1210 bytes ...346\210\252\345\233\27620210123234626.png" | Bin 0 -> 1548 bytes ...346\210\252\345\233\27620210123234630.png" | Bin 0 -> 1167 bytes "pics/icon/\347\237\251\345\275\242.png" | Bin 0 -> 1940 bytes ...\345\244\264(input\346\210\226output).png" | Bin 0 -> 4043 bytes ...\275\242\357\274\210inout\357\274\211.png" | Bin 0 -> 1935 bytes "pics/\347\237\251\345\275\242.png" | Bin 0 -> 1940 bytes src/.keep | 0 src/eda_qt 1-24 2_06/eda_qt.pro | 34 + src/eda_qt 1-24 2_06/eda_qt.pro.user | 328 +++++++ .../eda_qt.pro.user.f13ef12.22 | 848 ++++++++++++++++++ src/eda_qt 1-24 2_06/main.cpp | 11 + src/eda_qt 1-24 2_06/mainwindow.cpp | 24 + src/eda_qt 1-24 2_06/mainwindow.h | 28 + src/eda_qt 1-24 2_06/mainwindow.ui | 266 ++++++ src/eda_qt 1-24 2_06/module.cpp | 40 + src/eda_qt 1-24 2_06/module.h | 23 + src/eda_qt 1-24 2_06/new_file.cpp | 20 + src/eda_qt 1-24 2_06/new_file.h | 25 + src/eda_qt 1-24 2_06/new_file.ui | 129 +++ src/eda_qt 1-24 2_06/port.cpp | 51 ++ src/eda_qt 1-24 2_06/port.h | 28 + src/eda_qt/eda_qt.pro | 71 ++ src/eda_qt/eda_qt.pro.user | 848 ++++++++++++++++++ src/eda_qt/main.cpp | 25 + src/eda_qt/mainwindow.cpp | 51 ++ src/eda_qt/mainwindow.h | 59 ++ src/eda_qt/mainwindow.ui | 68 ++ src/eda_qt/new_file.cpp | 43 + src/eda_qt/new_file.h | 53 ++ src/eda_qt/new_file.ui | 129 +++ 39 files changed, 3288 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 "pics/QQ\346\210\252\345\233\27620210123232228.png" create mode 100644 "pics/QQ\346\210\252\345\233\27620210123232905.png" create mode 100644 "pics/QQ\346\210\252\345\233\27620210123233154.png" create mode 100644 "pics/QQ\346\210\252\345\233\27620210123233330.png" create mode 100644 "pics/QQ\346\210\252\345\233\27620210123233336.png" create mode 100644 "pics/QQ\346\210\252\345\233\27620210123234037.png" create mode 100644 "pics/QQ\346\210\252\345\233\27620210123234621.png" create mode 100644 "pics/QQ\346\210\252\345\233\27620210123234626.png" create mode 100644 "pics/QQ\346\210\252\345\233\27620210123234630.png" create mode 100644 "pics/icon/\347\237\251\345\275\242.png" create mode 100644 "pics/icon/\347\256\255\345\244\264(input\346\210\226output).png" create mode 100644 "pics/icon/\351\225\277\346\226\271\345\275\242\357\274\210inout\357\274\211.png" create mode 100644 "pics/\347\237\251\345\275\242.png" create mode 100644 src/.keep create mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro create mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro.user create mode 100644 src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 create mode 100644 src/eda_qt 1-24 2_06/main.cpp create mode 100644 src/eda_qt 1-24 2_06/mainwindow.cpp create mode 100644 src/eda_qt 1-24 2_06/mainwindow.h create mode 100644 src/eda_qt 1-24 2_06/mainwindow.ui create mode 100644 src/eda_qt 1-24 2_06/module.cpp create mode 100644 src/eda_qt 1-24 2_06/module.h create mode 100644 src/eda_qt 1-24 2_06/new_file.cpp create mode 100644 src/eda_qt 1-24 2_06/new_file.h create mode 100644 src/eda_qt 1-24 2_06/new_file.ui create mode 100644 src/eda_qt 1-24 2_06/port.cpp create mode 100644 src/eda_qt 1-24 2_06/port.h create mode 100644 src/eda_qt/eda_qt.pro create mode 100644 src/eda_qt/eda_qt.pro.user create mode 100644 src/eda_qt/main.cpp create mode 100644 src/eda_qt/mainwindow.cpp create mode 100644 src/eda_qt/mainwindow.h create mode 100644 src/eda_qt/mainwindow.ui create mode 100644 src/eda_qt/new_file.cpp create mode 100644 src/eda_qt/new_file.h create mode 100644 src/eda_qt/new_file.ui diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b14041c --- /dev/null +++ b/.gitignore @@ -0,0 +1,34 @@ +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +/eda/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..9292964 --- /dev/null +++ b/README.md @@ -0,0 +1,52 @@ +# eda_qt + +### -介绍 +eda软件开发 + +## - 开发需求 +### ------------001------------ +点击“新建模块”按钮后，弹出一对话框，如： +![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/232300_bb1cd7c7_8607408.png "QQ截图20210123232228.png") + +用户可输入：模块名称、input端口数量、output端口数量、inout端口数量 +点击ok后，将出现一“矩形图”，代表着该模块 +![这是我们软件里用的矩形](https://images.gitee.com/uploads/images/2021/0123/232810_4125e7a6_8607408.png "矩形.png") +上图是我们要开发的软件里用的矩形图 +这是我们仿照的软件里的截图，模块名为123，input、output、inout都为1 +![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/232955_c341839e_8607408.png "QQ截图20210123232905.png") +点击某一端口时，应做到可以修改端口的属性，包括：![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/233219_b40e4d51_8607408.png "QQ截图20210123233154.png") +|端口名：要在矩形图上体现 +|输入输出类型：可以在input、output、inout中选![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/233346_328b5e77_8607408.png "QQ截图20210123233330.png") +|数据类型：可以在wire、reg中选![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/233408_06262ce9_8607408.png "QQ截图20210123233336.png") +|数据长度：可设置正整数值 +|颜色：此功能目前可先不做。。 +### ------------002------------ +双击模块矩形，可进入用户代码编辑界面 +此时用户只需要输入算法代码 如：assign c = a & b; +其他代码由软件自动生成。 +![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234049_deade8af_8607408.png "QQ截图20210123234037.png") +其中第一段的格式为module xxx[*](端口名); 如用户在最开始的对话框中填写模块名为123，且整个模块中所有的端口为a、b、c三个时 +软件将会生成module 123[*](a,b,c); + **第二段** 代码为：input/output/inout 端口名；例如用户设置a为input,b为output,c为inout。则代码为 +input a; output b; inout c; + **第三段** 代码为：端口数据类型 端口名；例如用户定义a端口为wire型，b、c端口为reg型，则： +wire a; reg b; reg c; +第四段代码为之前用户输入的算法代码 +最后是固定句式：endmodule 相当于这个模块结束了 +另外要注意：当端口的数据长度定义为i（正整数）时，相应的在上述 **第二段、第三段** 代码中要有所改变，在端口名前加[i-1:0] +例如：![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234717_374091e7_8607408.png "QQ截图20210123234621.png")用户定义了p0为3位 +![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234922_d18c6d0d_8607408.png "QQ截图20210123234626.png") ![输入图片说明](https://images.gitee.com/uploads/images/2021/0123/234930_6490091b_8607408.png "QQ截图20210123234630.png") +则p0前面加[2:0] +### ------------003------------ +应有“保存模块”和“生成代码”两个按钮。其中： +保存模块：做到将此次用户新建的模块里的所有内容打包保存 下次用户双击时可以直接在软件里打开 +生成代码：将软件生成的代码 让用户选择位置保存。保存为 **verilog目录** 目录下应有 **此模块及其内部子模块** 所有的verilog代码文件 **扩展名为.v** + + + + + + + + + diff --git "a/pics/QQ\346\210\252\345\233\27620210123232228.png" "b/pics/QQ\346\210\252\345\233\27620210123232228.png" new file mode 100644 index 0000000000000000000000000000000000000000..13d9c58fe3ad78c0b7be7c3df3b5c10901109a23 GIT binary patch literal 9500 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 Xi6-i=VC^7IJs~N|s>#$ynFs$rkUl_z literal 0 HcmV?d00001 diff --git "a/pics/QQ\346\210\252\345\233\27620210123232905.png" "b/pics/QQ\346\210\252\345\233\27620210123232905.png" new file mode 100644 index 0000000000000000000000000000000000000000..b9407beedf26f04aae5be812b5dac38990c2892e GIT binary patch literal 9700 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 c9`JEh4Z=l}o! literal 0 HcmV?d00001 diff --git "a/pics/QQ\346\210\252\345\233\27620210123233154.png" "b/pics/QQ\346\210\252\345\233\27620210123233154.png" new file mode 100644 index 0000000000000000000000000000000000000000..ad8a9eb9af3236208eebe33e44489950408e5097 GIT binary patch literal 8294 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 literal 0 HcmV?d00001 diff --git "a/pics/QQ\346\210\252\345\233\27620210123233330.png" "b/pics/QQ\346\210\252\345\233\27620210123233330.png" new file mode 100644 index 0000000000000000000000000000000000000000..5a84cab03c361c652fae0bced315d5b27bb7cda2 GIT binary patch literal 2805 zcmV ze^3$`imcYDWjy+{<0=$B zGYj$2p?uxmTR($JsDdbyu8AqAxY8Q88hS8hldaz9*!9^EXzJlhy-CWnLO&RR;!VlmybgSI1Rna*GUEv zh1DZWaI>LONotY^VmQ%xQ!>~65WlRs%iE9?-Pz0cZ61yw#CR*Z=;&yiyg1I=kaT6k zY-5#}!opS!9H5?&@r)xSXXwgP^1c{DN91WnB}&u#r=)8jvg@C1KMubzpH6Wq>JG;Y%}!Ej|8 zx^t`1?x+Z9`gS9e^>1Xm{P@h>Xy+T^kh?P%-Ga?+jfi75-7z_}O+qfXWtX=_zyr}~ zQCyIUo&(v~QYX~aVG9!pQVUS*gNt#nS+@n*2YQ%E@>+q2vYt-67HM%ncbAhd>AZv< z=B*ZMy#GU-ZMJuHGY6Q4wWPX$L)PfkZQ8rg?UR8XTdObEHBLhW6Mf4bq@C<)Elb00Tf=7UXF%x|!K}^Dz z=rtzN#V3eQE&xtnHeu8xv*_A(W9`!2@}7h6E8dE3aBvXIV_bYA@zOFAj$gQk8LAK# zUy`>Y?074>f1GH*E6FA_W2)&j(u~3s6ApehhS*3Iu8qvV?J*J`;koE;-n@y^r%qzD z_0RZ5vc=O$Mz684vHrVCf)LT$+Y1#ZGJ;SNm2-Y!ahfnnnnU;tFW;vl2>(E$BNWF2 z(Y2sFCkN#%@?DJdY0H&ACm|bSV`H9(ZY2r~1{AE6?}8@7gs!hw@`QxU+`fIArdL8) z`uqERnO=os%QnYaZ0&tUY|q&aV+*&nw{JK0xv(j!JHd_9gY$FsdNy{u5#o`=gNa`} zUA?{r3-=meU{mkjO&WI0gl1DmCo1)oSfsPG8+7UDtSoeIjTV)O9R?lJ*={;Fen%!^ ze7#s=+VOBrCyi#)R%BY$5R;q&4HMdxUUBDQ1nVDj?AL#M3d7z+H#h~qnZ>Xi)P)+y`nyS zy|^szMG@1C?4GW(a-Th#Z7BzLuQz?85Q)ZOp@v)HHCqFVJ{b2^!uf-L2T>9aJhFe7 zlfEehO@%qA6pnS`ry4QH+@Zsj96btiDy{80r0ez8_LW$b4%Al`BByB+_R?*Whk_8P zf2S_I#Oc$kP2A1lLd!imWgndpfr#*GQ&m+J1rmhvkmv}-ak-|;9^QeMjfwb6=6TPz z|4hWWL(AFm2gufVF`l*$)%Jskw{5y|xu&bGu0~bHIXT2m1Q9$zuvdb1zx%3+i6C!CHB!>&4)qTAGvgoCMH`t<_%+1l)1fyiN#@E@-> zE_2`0RXo!=`G;Kc9wOJI+73;hZN$(gZPud=n7u_09Df3LFTk;`sRE%Xd6s)LY|8%H zw<|Do42bw~8pe+|AZ$&Z?f#8VHs3D+X)mzgbad2RPnUOcIm*8Og}q|Q9}vX^ckfst zhIs*Oz?`i$h>Us*H;;S>2nk)8*Rcm6*19{paBJU1*8d$q7$5y6Ym3J$CODf-?i?@F zAbdbLhle(afMfHi74Cbw_rCYJ$kQcZ_Nr7&e7XU5&I`YOE$$p$gXoOSm=#rvy93s0 zsi{s}C+wRnb{uS;-;BYiV|aAc8yGpi3lmb~UD+f84o*i6B2VY?iNw!Oe~bN)W=m0L zVx}6nKk%i!jw?61aG!arP_^Zlla3`Jvb~7w9NNv6^_a8G@qunYosKYXY*Goh!s$qi zOHcRvrqXcugn&5}2vg?f){5&_4r zK6%n{O_!ga@6bVit?PE1vzI&v43uHyI_n1yZ4vFo&2{ zNOXkaP|jgOaVY07p*S?X5{e^V&S6`(a$6ha940vA%{j~oj!lp0Le61>4vV;CIPNUc zDCh7)i;Ovk`(Ui8cg#7=tqXNr8m1Z;$!!HK^5q=vYerM&H5c6pcjc*4`^@a&^qQPC18z3mH9K3^F%5|A!pw&EE8l*5HG3 z4hJLh<{VyG0D}(5(dR&TuE0gJ1|i&~oWns0z1l=50=?QqOe-WhLUCNK=>(TZ5dMTb z9icdqo^IW`b(89bhKA7F+l#KQF7);FfdwEi(I@qUhlGcRyMN0hG&B?u5fM}cQBhHtn3y2Z5gyag(SiQ~4gfX;CpMIM00000NkvXX Hu0mjf=iqW3 literal 0 HcmV?d00001 diff --git "a/pics/QQ\346\210\252\345\233\27620210123233336.png" "b/pics/QQ\346\210\252\345\233\27620210123233336.png" new file mode 100644 index 0000000000000000000000000000000000000000..c4385fa550d9ad0e9542256770f457bd48310ad2 GIT binary patch literal 2763 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 RMOFX+002ovPDHLkV1n;RCuaZv literal 0 HcmV?d00001 diff --git "a/pics/QQ\346\210\252\345\233\27620210123234037.png" "b/pics/QQ\346\210\252\345\233\27620210123234037.png" new file mode 100644 index 0000000000000000000000000000000000000000..a57fe0efb23f3b15496f51ba7ed86d1c255d01a7 GIT binary patch literal 7545 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 literal 0 HcmV?d00001 diff --git "a/pics/QQ\346\210\252\345\233\27620210123234621.png" "b/pics/QQ\346\210\252\345\233\27620210123234621.png" new file mode 100644 index 0000000000000000000000000000000000000000..7e9974b8c1909ceeaaa09497ced4e13b96387758 GIT binary patch literal 1210 zcmV;r1V#IaP)P03efu68Yp13PaM(XzzY9udug zkxGN5k^#%I#LYknHnfTe2KR2|psAU#I}?sjt_H7Nl_%_H7M!>7>yLYI$_MCnPqB?X zY%Z&4Cp|8D^2S^vkf0Q^;@-wl6bZamBbGI&A_MT#1rIG%6RrHFn#dwr@CLRW&`&SY z#502E_xMfi^&zsChI*H^v_{NYo|HE^=-n>5dhYHq`3Jm7ZbURAp8IPAW33ZN3s@3& z7nfde@NJnF$QV{IYuB?bY_lnH0TD3tI{c7B!jr{TBuTn%MYf4WxN2iaWO>0)eDJ zw`!O__Ge=iT95)<;IiLrJVIO7-iIoteyQLe>{Se^2E5jOm~CW>Q2aP>d1(I9F!fF2K2ueKM;7A;_wx7@j^5c=PS?-J6I^z#7sVHyCH2wkSLb?Ji`^i zKtrV>QvOC*PW0<%%XIw_pj3#53Rh$SQE3oHnJ{aaVYv@w@pBKK7zt=X|M~Rc;=FV_ z6PIe$U}koXf@d%Gc=9f(<^Zzp3HonR%>T{YI#wSFCm*1>Af8t?2?RvNcU}1L*5qKSVP*%RTy<(OY6Okc)nzWrwn6t zewbDGY-o8q8czv^u0XGMpvJea&tP_t({Z{D{Jgo0)Ta1bF5}=-2jc)u>e;}=JyWN}~6H1rJwy^kGIviwV;b6?Oy@!wxPEDeZ=i-knQKtM!bARr>) YA5~Q7TBJC~8~^|S07*qoM6N<$g1QSVga7~l literal 0 HcmV?d00001 diff --git "a/pics/QQ\346\210\252\345\233\27620210123234626.png" "b/pics/QQ\346\210\252\345\233\27620210123234626.png" new file mode 100644 index 0000000000000000000000000000000000000000..4ce31a275337ed5451f480e3c3a041cea9102cc8 GIT binary patch literal 1548 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 literal 0 HcmV?d00001 diff --git "a/pics/icon/\347\237\251\345\275\242.png" "b/pics/icon/\347\237\251\345\275\242.png" new file mode 100644 index 0000000000000000000000000000000000000000..828bf6a2fbb3fa44b9d9d51d89d5f9f0f25b7f53 GIT binary patch literal 1940 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 Aj{pDw literal 0 HcmV?d00001 diff --git "a/pics/icon/\351\225\277\346\226\271\345\275\242\357\274\210inout\357\274\211.png" "b/pics/icon/\351\225\277\346\226\271\345\275\242\357\274\210inout\357\274\211.png" new file mode 100644 index 0000000000000000000000000000000000000000..575fc55443c1483c58205e218decb8dea3ebc47b GIT binary patch literal 1935 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJFtFi#i9kczmsS2pI#go&_T zR82O0V8-(NNZ8|PcX%0(nO$k)F4)yjqyfWwUjhL+>)=NcGx zFtQzDV^OfND`8_fz-u62roiy<<3eKvhP;Nx4UCK&{rqzo84H+sT6j4eDr#Qva5PAd zT0w#y%;G1~Bi@b1~a zzyAM^A3qcsu5urk3yhzaKM!69#>QW!56gj6Ro#bDW~PAs41Y42nI_DWuesa6a7CY? z{#FCSlIQI4<_Zj7xev@A)ixR=qp5^y8Rt5~pO000|E=;qeEz_M#{KipKd;~aX%8=> zQ({BoVn#*_uFrEDRhgMKY*7tkbipmC<0Z5j{9flIR@BrK!^8WtPemy9q{VDQdP xN_>#vz|eQ7COzR~1B1@m&el-_s2c|MjJ`L`Y~N|7J_c5_44$rjF6*2UngDyv-E{x} literal 0 HcmV?d00001 diff --git "a/pics/\347\237\251\345\275\242.png" "b/pics/\347\237\251\345\275\242.png" new file mode 100644 index 0000000000000000000000000000000000000000..828bf6a2fbb3fa44b9d9d51d89d5f9f0f25b7f53 GIT binary patch literal 1940 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|GzJFtXipc%kczms*Ejmg1WL4C z{Jw}chK29s%EOb4-E$5FamZS@O<2QS;Jb`TDZ5jSlhNtc0Sl?xbgdcH|5mS_X=%g4 zk;0m0w(|iC2M_ZC7M4RyYzj3s7da&uWEBL&3>Y3h?)E#t@PeUnLjxm+e0&KLn*%#X z3oDPqj~|PK4H&E(6m$|84jmVt+rW5%ktvapS-@`J3l^RRJ^>DHiG~j!UDXp9N*Wv@ z4luOz>sv80FJK-hD;~UIcq7+$|Jj`I4i14E`wmFG{`oZR|L5dMpP4^Y?3tf@FVB7# z3kyfj)_H#Ie_I(Zurj$ep65Fd_4@tk#Q#e()QlU~a=($Q`#Z0==KmM*2F4pztb6Js z4=_wwuU{Q^fZ>TY!vbJXoVq^URzHE^lPE&~F!Y|jK0Qy|fZ-<>g9b1(K7CC+52R{X z8KwXO@aL~h&w_eLN#WDkF2izI|^h8JQ=nXK2{ez^D-)|7}kL z + + + + + EnvironmentId + {d7319875-1e1d-4456-a97d-d87e35d07a5e} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.12.1 MinGW 64-bit + Desktop Qt 5.12.1 MinGW 64-bit + qt.qt5.5121.win64_mingw73_kit + 0 + 0 + 0 + + F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + 部署 + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + eda_qt + + Qt4ProjectManager.Qt4RunConfiguration:F:/eda_dev/eda_qt/src/eda_qt 1-24 2_06/eda_qt.pro + eda_qt.pro + + 3768 + false + true + true + false + false + true + + F:/eda_dev/eda_qt/src/build-eda_qt-Desktop_Qt_5_12_1_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 20 + + + Version + 20 + + diff --git a/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 b/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 new file mode 100644 index 0000000..2e506bf --- /dev/null +++ b/src/eda_qt 1-24 2_06/eda_qt.pro.user.f13ef12.22 @@ -0,0 +1,848 @@ + + + + + + EnvironmentId + {f13ef12e-62a1-4aaf-ac39-302b77838bbe} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + Builtin.Questionable + + true + Builtin.DefaultTidyAndClazy + 2 + + + + true + + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + true + 0 + C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro + C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro + + false + + false + true + true + false + false + true + + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop Qt 5.9.9 MinGW 32bit + Desktop Qt 5.9.9 MinGW 32bit + qt.qt5.599.win32_mingw53_kit + 0 + 0 + 0 + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 2 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 2 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/src/eda_qt 1-24 2_06/main.cpp b/src/eda_qt 1-24 2_06/main.cpp new file mode 100644 index 0000000..fd3e533 --- /dev/null +++ b/src/eda_qt 1-24 2_06/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/src/eda_qt 1-24 2_06/mainwindow.cpp b/src/eda_qt 1-24 2_06/mainwindow.cpp new file mode 100644 index 0000000..cc2f93c --- /dev/null +++ b/src/eda_qt 1-24 2_06/mainwindow.cpp @@ -0,0 +1,24 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +#include "new_file.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::MainWindow) +{ + ui->setupUi(this); + this->showMaximized(); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + + +void MainWindow::on_actionNew_triggered() +{ + new_file *s = new new_file(this); + s->show(); +} diff --git a/src/eda_qt 1-24 2_06/mainwindow.h b/src/eda_qt 1-24 2_06/mainwindow.h new file mode 100644 index 0000000..509979f --- /dev/null +++ b/src/eda_qt 1-24 2_06/mainwindow.h @@ -0,0 +1,28 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +#include +#include +#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_actionNew_triggered(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H diff --git a/src/eda_qt 1-24 2_06/mainwindow.ui b/src/eda_qt 1-24 2_06/mainwindow.ui new file mode 100644 index 0000000..3a30ab5 --- /dev/null +++ b/src/eda_qt 1-24 2_06/mainwindow.ui @@ -0,0 +1,266 @@ + + + MainWindow + + + + 0 + 0 + 1056 + 672 + + + + MainWindow + + + + + 0 + 0 + + + + Qt::DefaultContextMenu + + + Qt::LeftToRight + + + + + + 2 + + + QLayout::SetMaximumSize + + + + + QLayout::SetMinimumSize + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + PushButton + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + 0 + 0 + + + + 1 + + + + + 0 + 0 + 83 + 312 + + + + Page 1 + + + + + + 0 + 0 + 83 + 312 + + + + Page 2 + + + + + + + + 0 + + + + Tab 1 + + + + + Tab 2 + + + + + + + + + 0 + 0 + + + + 1 + + + + + 0 + 0 + 83 + 312 + + + + Page 1 + + + + + + 0 + 0 + 83 + 312 + + + + Page 2 + + + + + + + + + + QLayout::SetDefaultConstraint + + + + + + 0 + 0 + + + + + + + + + + + + + + 0 + 0 + 1056 + 25 + + + + + File + + + + + + Edit + + + + + + + + + New + + + + + + diff --git a/src/eda_qt 1-24 2_06/module.cpp b/src/eda_qt 1-24 2_06/module.cpp new file mode 100644 index 0000000..5ea69e2 --- /dev/null +++ b/src/eda_qt 1-24 2_06/module.cpp @@ -0,0 +1,40 @@ +#include "module.h" +#include + +Module::Module() +{ + +} + +Module::Module(std::string name,int inputPorts,int outputPorts,int inOutPorts) +{ + this->name = name; + int portsNum = 0; + for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),INPUT,0,1)); + } + for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),OUTPUT,0,1)); + } + for(int i = 0;iports.push_back(Port("p"+std::to_string(portsNum),INOUT,0,1)); + } +} + +void Module::setCode(std::string code) +{ + this->code = code; +} + +std::string Module::getCode() +{ + return this->code; +} + +std::string Module::generateCode() +{ + +} diff --git a/src/eda_qt 1-24 2_06/module.h b/src/eda_qt 1-24 2_06/module.h new file mode 100644 index 0000000..804962c --- /dev/null +++ b/src/eda_qt 1-24 2_06/module.h @@ -0,0 +1,23 @@ +#ifndef MODULE_H +#define MODULE_H +#include +#include +#include "port.h" +class Module +{ +private: + std::string name; + int inputPorts; + int ouputPorts; + int inOutPorts; + std::string code; + std::vector ports; +public: + Module(); + Module(std::string,int,int,int); + void setCode(std::string); + std::string getCode(); + std::string generateCode(); +}; + +#endif // MODULE_H diff --git a/src/eda_qt 1-24 2_06/new_file.cpp b/src/eda_qt 1-24 2_06/new_file.cpp new file mode 100644 index 0000000..5b9d09d --- /dev/null +++ b/src/eda_qt 1-24 2_06/new_file.cpp @@ -0,0 +1,20 @@ +#include "new_file.h" +#include "ui_new_file.h" + +new_file::new_file(QWidget *parent) : + QDialog(parent), + ui(new Ui::new_file) +{ + ui->setupUi(this); + this->setModal(true); +} + +new_file::~new_file() +{ + delete ui; +} + +void new_file::on_pushButton_clicked() +{ + this->exec(); +} diff --git a/src/eda_qt 1-24 2_06/new_file.h b/src/eda_qt 1-24 2_06/new_file.h new file mode 100644 index 0000000..d11e8d7 --- /dev/null +++ b/src/eda_qt 1-24 2_06/new_file.h @@ -0,0 +1,25 @@ +#ifndef NEW_FILE_H +#define NEW_FILE_H + +#include + +namespace Ui { +class new_file; +} + +class new_file : public QDialog +{ + Q_OBJECT + +public: + explicit new_file(QWidget *parent = nullptr); + ~new_file(); + +private slots: + void on_pushButton_clicked(); + +private: + Ui::new_file *ui; +}; + +#endif // NEW_FILE_H diff --git a/src/eda_qt 1-24 2_06/new_file.ui b/src/eda_qt 1-24 2_06/new_file.ui new file mode 100644 index 0000000..1a661d9 --- /dev/null +++ b/src/eda_qt 1-24 2_06/new_file.ui @@ -0,0 +1,129 @@ + + + new_file + + + + 0 + 0 + 373 + 406 + + + + Dialog + + + + + 20 + -10 + 341 + 371 + + + + + QLayout::SetDefaultConstraint + + + + + + + Module Name: + + + + + + + + + + + + + + Input Ports: + + + + + + + + + + + + + + Output Ports: + + + + + + + + + + + + + + Input Ports: + + + + + + + + + + + + + + 20 + 350 + 341 + 41 + + + + + + + Ok + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + + + diff --git a/src/eda_qt 1-24 2_06/port.cpp b/src/eda_qt 1-24 2_06/port.cpp new file mode 100644 index 0000000..077830f --- /dev/null +++ b/src/eda_qt 1-24 2_06/port.cpp @@ -0,0 +1,51 @@ +#include "port.h" + +Port::Port() +{ + +} + +Port::Port(std::string name,PortType portType,bool dataType,int dataSize) +{ + this->name = name; + this->portType = portType; + this->dataSize =dataSize; + this->dataType = dataType; +} + +void Port::setName(std::string name) +{ + this->name = name; +} + +std::string Port::getName() +{ + return this->name; +} + +void Port::setPortType(PortType portType) +{ + this->portType = portType; +} +PortType Port::getPortType() +{ + return this->portType; +} + +void Port::setDataType(bool dataType) +{ + this->dataType = dataType; +} +bool Port::getDataType() +{ + return this->dataType; +} + +void Port::setDataSize(int dataSize) +{ + this->dataSize = dataSize; +} +int Port::getDataSize() +{ + return this->dataSize; +} diff --git a/src/eda_qt 1-24 2_06/port.h b/src/eda_qt 1-24 2_06/port.h new file mode 100644 index 0000000..813d0ec --- /dev/null +++ b/src/eda_qt 1-24 2_06/port.h @@ -0,0 +1,28 @@ +#ifndef PORT_H +#define PORT_H +#include + +enum PortType{INPUT,OUTPUT,INOUT}; + +class Port +{ +private: + std::string name; //端口名 + PortType portType; //输入或输出 0为in 1为out + bool dataType; //数据类型 0为wire 1为reg + int dataSize; //数据长度 +public: + Port(); + Port(std::string,PortType,bool,int); + void setName(std::string); + std::string getName(); + void setPortType(PortType); + PortType getPortType(); + void setDataType(bool); + bool getDataType(); + void setDataSize(int); + int getDataSize(); + +}; + +#endif // PORT_H diff --git a/src/eda_qt/eda_qt.pro b/src/eda_qt/eda_qt.pro new file mode 100644 index 0000000..3685820 --- /dev/null +++ b/src/eda_qt/eda_qt.pro @@ -0,0 +1,71 @@ +<<<<<<< HEAD +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp \ + mainwindow.cpp \ + new_file.cpp + +HEADERS += \ + mainwindow.h \ + new_file.h + +FORMS += \ + mainwindow.ui \ + new_file.ui + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target +======= +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +CONFIG += c++11 + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + main.cpp \ + mainwindow.cpp \ + new_file.cpp + +HEADERS += \ + mainwindow.h \ + new_file.h + +FORMS += \ + mainwindow.ui \ + new_file.ui + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/eda_qt.pro.user b/src/eda_qt/eda_qt.pro.user new file mode 100644 index 0000000..6309f1c --- /dev/null +++ b/src/eda_qt/eda_qt.pro.user @@ -0,0 +1,848 @@ + + + + + + EnvironmentId + {f13ef12e-62a1-4aaf-ac39-302b77838bbe} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + Builtin.Questionable + + true + Builtin.DefaultTidyAndClazy + 2 + + + + true + + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit + 0 + 0 + 0 + + true + 0 + C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + C:\Users\dawn\Documents\Project\build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro + C:/Users/dawn/Documents/Project/eda_qt/eda_qt.pro + + false + + false + true + true + false + false + true + + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop Qt 5.9.9 MinGW 32bit + Desktop Qt 5.9.9 MinGW 32bit + qt.qt5.599.win32_mingw53_kit + 0 + 0 + 0 + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Debug + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 2 + 2 + + + true + 2 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Release + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 2 + 2 + + + true + 0 + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile + C:/Users/dawn/Documents/Project/build-eda_qt-Desktop_Qt_5_9_9_MinGW_32bit-Profile + + + true + QtProjectManager.QMakeBuildStep + + false + + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 2 + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 3 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/src/eda_qt/main.cpp b/src/eda_qt/main.cpp new file mode 100644 index 0000000..d63351e --- /dev/null +++ b/src/eda_qt/main.cpp @@ -0,0 +1,25 @@ +<<<<<<< HEAD +#include "mainwindow.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + return a.exec(); +} +======= +#include "mainwindow.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + return a.exec(); +} +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/mainwindow.cpp b/src/eda_qt/mainwindow.cpp new file mode 100644 index 0000000..f0f18e8 --- /dev/null +++ b/src/eda_qt/mainwindow.cpp @@ -0,0 +1,51 @@ +<<<<<<< HEAD +#include "mainwindow.h" +#include "ui_mainwindow.h" + +#include "new_file.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::MainWindow) +{ + ui->setupUi(this); + this->showMaximized(); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + + +void MainWindow::on_actionNew_triggered() +{ + new_file *s = new new_file(this); + s->show(); +} +======= +#include "mainwindow.h" +#include "ui_mainwindow.h" + +#include "new_file.h" + +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent) + , ui(new Ui::MainWindow) +{ + ui->setupUi(this); + this->showMaximized(); +} + +MainWindow::~MainWindow() +{ + delete ui; +} + + +void MainWindow::on_actionNew_triggered() +{ + new_file *s = new new_file(this); + s->show(); +} +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/mainwindow.h b/src/eda_qt/mainwindow.h new file mode 100644 index 0000000..dbb37fd --- /dev/null +++ b/src/eda_qt/mainwindow.h @@ -0,0 +1,59 @@ +<<<<<<< HEAD +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +#include +#include +#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_actionNew_triggered(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H +======= +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +#include +#include +#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_actionNew_triggered(); + +private: + Ui::MainWindow *ui; +}; +#endif // MAINWINDOW_H +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/mainwindow.ui b/src/eda_qt/mainwindow.ui new file mode 100644 index 0000000..d8e3831 --- /dev/null +++ b/src/eda_qt/mainwindow.ui @@ -0,0 +1,68 @@ + + + MainWindow + + + + 0 + 0 + 1056 + 672 + + + + MainWindow + + + + + + 10 + 10 + 1021 + 601 + + + + + + + + + + + + + + + + 0 + 0 + 1056 + 25 + + + + + File + + + + + + Edit + + + + + + + + + New + + + + + + diff --git a/src/eda_qt/new_file.cpp b/src/eda_qt/new_file.cpp new file mode 100644 index 0000000..8d98f58 --- /dev/null +++ b/src/eda_qt/new_file.cpp @@ -0,0 +1,43 @@ +<<<<<<< HEAD +#include "new_file.h" +#include "ui_new_file.h" + +new_file::new_file(QWidget *parent) : + QDialog(parent), + ui(new Ui::new_file) +{ + ui->setupUi(this); + this->setModal(true); +} + +new_file::~new_file() +{ + delete ui; +} + +void new_file::on_pushButton_clicked() +{ + this->exec(); +} +======= +#include "new_file.h" +#include "ui_new_file.h" + +new_file::new_file(QWidget *parent) : + QDialog(parent), + ui(new Ui::new_file) +{ + ui->setupUi(this); + this->setModal(true); +} + +new_file::~new_file() +{ + delete ui; +} + +void new_file::on_pushButton_clicked() +{ + this->exec(); +} +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/new_file.h b/src/eda_qt/new_file.h new file mode 100644 index 0000000..48c5e3f --- /dev/null +++ b/src/eda_qt/new_file.h @@ -0,0 +1,53 @@ +<<<<<<< HEAD +#ifndef NEW_FILE_H +#define NEW_FILE_H + +#include + +namespace Ui { +class new_file; +} + +class new_file : public QDialog +{ + Q_OBJECT + +public: + explicit new_file(QWidget *parent = nullptr); + ~new_file(); + +private slots: + void on_pushButton_clicked(); + +private: + Ui::new_file *ui; +}; + +#endif // NEW_FILE_H +======= +#ifndef NEW_FILE_H +#define NEW_FILE_H + +#include + +namespace Ui { +class new_file; +} + +class new_file : public QDialog +{ + Q_OBJECT + +public: + explicit new_file(QWidget *parent = nullptr); + ~new_file(); + +private slots: + void on_pushButton_clicked(); + +private: + Ui::new_file *ui; +}; + +#endif // NEW_FILE_H +>>>>>>> bd1e03bf8f08e9d7e5b165ba9b21a76e52608e50 diff --git a/src/eda_qt/new_file.ui b/src/eda_qt/new_file.ui new file mode 100644 index 0000000..015f0da --- /dev/null +++ b/src/eda_qt/new_file.ui @@ -0,0 +1,129 @@ + + + new_file + + + + 0 + 0 + 373 + 459 + + + + Dialog + + + + + 20 + 20 + 341 + 371 + + + + + QLayout::SetDefaultConstraint + + + + + + + Module Name: + + + + + + + + + + + + + + Input Ports: + + + + + + + + + + + + + + Output Ports: + + + + + + + + + + + + + + Input Ports: + + + + + + + + + + + + + + 20 + 400 + 341 + 41 + + + + + + + Ok + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + + + -- Gitee