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 1/6] =?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 2/6] =?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 3/6] =?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 4/6] =?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 5/6] 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 6/6] 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