diff --git a/ofdEditor/ofd/DataTypes/basic_datatype.h b/ofdEditor/ofd/DataTypes/basic_datatype.h new file mode 100644 index 0000000000000000000000000000000000000000..5265b95296e769ee209fe25ccc80b0b0c061ce1b --- /dev/null +++ b/ofdEditor/ofd/DataTypes/basic_datatype.h @@ -0,0 +1,42 @@ +#ifndef COMMONDT_H +#define COMMONDT_H + +//6种基本数据类型 +struct ST_Loc { + +}; + +struct ST_Array { + +}; + +struct ST_ID { + unsigned long id; +}; + +struct ST_RefID { + unsigned long ref_id; +}; + +struct ST_Pos { + double x, y; +}; + +struct ST_Box { + double start_x, start_y, delta_x, delta_y; +}; + + +class CT_PageArea { +public: + ST_Box physical_box; +}; + + +class CT_Color { + //属性 + ST_Array value; + int index; + ST_RefID colorspace; +}; +#endif // COMMONDT_H diff --git a/ofdEditor/ofd/ofd.pro b/ofdEditor/ofd/ofd.pro index df0596f27219cb569278eb6c4559def8e9c71375..dc3e7ce48b0274cf3312e576d96985d12828d117 100644 --- a/ofdEditor/ofd/ofd.pro +++ b/ofdEditor/ofd/ofd.pro @@ -27,7 +27,8 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += ofd.cpp HEADERS += ofd.h\ - ofd_global.h + ofd_global.h \ + DataTypes/basic_datatype.h DESTDIR = ../bin # 生成文件在这 MOC_DIR = ./moc # Q_OBJECT 类转换后的文件 diff --git a/ofdEditor/test_pan/main.cpp b/ofdEditor/test_pan/main.cpp deleted file mode 100644 index b48f94ec827033ef073fb3c7f060837e90b935ec..0000000000000000000000000000000000000000 --- a/ofdEditor/test_pan/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/ofdEditor/test_pan/mainwindow.cpp b/ofdEditor/test_pan/mainwindow.cpp deleted file mode 100644 index 9716148bc2026cf172deca6d9160ea90d62a7eda..0000000000000000000000000000000000000000 --- a/ofdEditor/test_pan/mainwindow.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include "mainwindow.h" - -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent) -{ -} - -MainWindow::~MainWindow() -{ - -} diff --git a/ofdEditor/test_pan/mainwindow.h b/ofdEditor/test_pan/mainwindow.h deleted file mode 100644 index ca7ddb5aa96c7e0c3c9b684d67697573dcd1d547..0000000000000000000000000000000000000000 --- a/ofdEditor/test_pan/mainwindow.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - MainWindow(QWidget *parent = 0); - ~MainWindow(); -}; - -#endif // MAINWINDOW_H diff --git a/ofdEditor/test_pan/test_pan.pro b/ofdEditor/test_pan/test_pan.pro index 1f3190d7135fbe9d0e291a01159bac240518364d..85ba8075d45c0ac935db26ee89687dea1563b0b2 100644 --- a/ofdEditor/test_pan/test_pan.pro +++ b/ofdEditor/test_pan/test_pan.pro @@ -23,10 +23,9 @@ DEFINES += QT_DEPRECATED_WARNINGS #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -SOURCES += main.cpp\ - mainwindow.cpp +SOURCES += -HEADERS += mainwindow.h +HEADERS += DESTDIR = ../bin # 生成文件在这 MOC_DIR = ./moc # Q_OBJECT 类转换后的文件