[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4952
Author: rdsivd
Date: 2017-04-30 14:17:29 +0200 (Sun, 30 Apr 2017)
Log Message:
-----------
Modified Paths:
--------------
branches/DXFtoQET3_DB/DXFtoQET.pro
Removed Paths:
-------------
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_attrinute.cpp
branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_attrinute.h
Modified: branches/DXFtoQET3_DB/DXFtoQET.pro
===================================================================
--- branches/DXFtoQET3_DB/DXFtoQET.pro 2017-04-29 17:51:55 UTC (rev 4951)
+++ branches/DXFtoQET3_DB/DXFtoQET.pro 2017-04-30 12:17:29 UTC (rev 4952)
@@ -13,56 +13,21 @@
TEMPLATE = app
-SOURCES += main.cpp\
- dxftoqet3db.cpp \
- data.cpp \
- src/dxf_load.cpp \
- db/dbmanager.cpp \
- data2.cpp \
- src/ELMT_base_types/dxf_base_arc.cpp \
- src/ELMT_base_types/dxf_base_circle.cpp \
- src/ELMT_base_types/dxf_base_ellipse.cpp \
- src/ELMT_base_types/dxf_base_input.cpp \
- src/ELMT_base_types/dxf_base_line.cpp \
- src/ELMT_base_types/dxf_base_polyline.cpp \
- src/ELMT_base_types/dxf_base_rectangel.cpp \
- src/ELMT_base_types/dxf_base_terminal.cpp \
- src/ELMT_base_types/dxf_base_text.cpp \
- src/ELMT_base/baseelmt.cpp \
- src/DXF_control/dxf_layer_control.cpp \
- src/DXF_control/dxf_ltype_control.cpp \
- src/DXF_control/dxf_text_control.cpp \
- src/ELMT_steps/elmt_header_steps.cpp \
- src/ELMT_steps/elmt_tables.cpp \
- src/ELMT_steps/elmt_entities.cpp \
- src/DXF_control/dxf_corner_to_elmt.cpp \
- src/ELMT_steps/elmt_blocks.cpp \
- src/ELMT_steps/elmt_block_level2.cpp
+SOURCES += $$files(*.cpp)\
+ $$files(src/*.cpp) \
+ $$files(db/*.cpp) \
+ $$files(src/ELMT_base_types/*.cpp) \
+ $$files(src/ELMT_base/*.cpp) \
+ $$files(src/DXF_control/*.cpp) \
+ $$files(src/ELMT_steps/*.cpp)
-HEADERS += dxftoqet3db.h \
- data.h \
- src/dxf_load.h \
- db/dbmanager.h \
- data2.h \
- src/ELMT_base_types/dxf_base_arc.h \
- src/ELMT_base_types/dxf_base_circle.h \
- src/ELMT_base_types/dxf_base_ellipse.h \
- src/ELMT_base_types/dxf_base_input.h \
- src/ELMT_base_types/dxf_base_line.h \
- src/ELMT_base_types/dxf_base_polyline.h \
- src/ELMT_base_types/dxf_base_rectangel.h \
- src/ELMT_base_types/dxf_base_terminal.h \
- src/ELMT_base_types/dxf_base_text.h \
- src/ELMT_base/baseelmt.h \
- src/DXF_control/dxf_layer_control.h \
- src/DXF_control/dxf_ltype_control.h \
- src/DXF_control/dxf_text_control.h \
- src/ELMT_steps/elmt_header_steps.h \
- src/ELMT_steps/elmt_tables.h \
- src/ELMT_steps/elmt_entities.h \
- src/DXF_control/dxf_corner_to_elmt.h \
- src/ELMT_steps/elmt_blocks.h \
- src/ELMT_steps/elmt_block_level2.h
+HEADERS += $$files(*.h )\
+ $$files(src/*.h) \
+ $$files(db/*.h) \
+ $$files(src/ELMT_base_types/*.h) \
+ $$files(src/ELMT_base/*.h) \
+ $$files(src/DXF_control/*.h) \
+ $$files(src/ELMT_steps/*.h) \
FORMS += dxftoqet3db.ui
Deleted: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_attrinute.cpp
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_attrinute.cpp 2017-04-29 17:51:55 UTC (rev 4951)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_attrinute.cpp 2017-04-30 12:17:29 UTC (rev 4952)
@@ -1,47 +0,0 @@
-#include "dxf_entitie_attrinute.h"
-
-extern struct ALG Max_alg;
-extern struct BLOCK Max_block;
-extern struct ENTITIE Max_entitie;
-extern struct DXF_base DXF_main_base[1];
-extern struct DXF_entities_attrib DXF_input_entities_attrib[DXF_LE_ATTRIB];
-
-dxf_entitie_attrinute::dxf_entitie_attrinute(QWidget *parent) : QWidget(parent)//: QMainWindow(parent)
-{
-
-}
-
-QString dxf_entitie_attrinute::dxf_entitie_make_attribute()
-{
-
- dxf_attr dxb_attr;
- DXF_Text_control db_txt_check2;
-
- Result_attr ="";
-
- Count_lines=0;
-
- while (Count_lines<=Count_entitie_attr)
- {
-
- dxb_attr.x=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_10; // x start
- dxb_attr.y=-DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_20; // y start
- dxb_attr.rotation=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_50; //text rotation
- dxb_attr.size=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_40; //text height
- dxb_attr.tag=Entitie_tag; //DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_2; // tag
- dxb_attr.rotate=Entitie_rotate;
- dxb_attr.color_attrib=Entitie_color;
-
- db_txt_check2.TextToCheck=DXF_input_entities_attrib[Count_lines].DXF_entities_attrib_code_1; // value
-
- dxb_attr.text=db_txt_check2.Text_control();
-
- Result_attr.append(dxb_attr.Create_ATTR());
-
- Count_lines=Count_lines+1;
-
-
- }
-
- return Result_attr;
-}
Deleted: branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_attrinute.h
===================================================================
--- branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_attrinute.h 2017-04-29 17:51:55 UTC (rev 4951)
+++ branches/DXFtoQET3_DB/src/ELMT_base_types/dxf_base_attrinute.h 2017-04-30 12:17:29 UTC (rev 4952)
@@ -1,35 +0,0 @@
-#ifndef DXF_ENTITIE_ATTRINUTE_H
-#define DXF_ENTITIE_ATTRINUTE_H
-
-//#include <QMainWindow>
-#include <QWidget>
-#include "src/dxf/dxf_attr.h"
-#include "src/dxf_data.h"
-#include "src/dxf_table_size.h"
-#include "src/qet_base_types/baseelmt.h"
-#include "src/dxf_control/dxf_text_control.h"
-
-class dxf_entitie_attrinute : public QWidget //QMainWindow
-{
- Q_OBJECT
- public:
- explicit dxf_entitie_attrinute(QWidget *parent = 0);
-
- QString Result_attr;
- QString Entitie_color; // black
- QString Entitie_line_weight;
- QString Entitie_filling;
- QString Entitie_antialias;
- QString Entitie_rotate; // true
- QString Entitie_tag; // label
-
- int Count_lines;
- int Count_entitie_attr;
-
- QString dxf_entitie_make_attribute();
- signals:
-
- public slots:
-};
-
-#endif // DXF_ENTITIE_ATTRINUTE_H