| [qet] [4338] dxftoqet : update qmainwindow to qwidget for all functions and classes |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4338
Author: rdsivd
Date: 2016-01-31 20:06:36 +0100 (Sun, 31 Jan 2016)
Log Message:
-----------
dxftoqet : update qmainwindow to qwidget for all functions and classes
Modified Paths:
--------------
branches/dxftoqet2/csv_create_elmt.cpp
branches/dxftoqet2/csv_create_elmt.h
branches/dxftoqet2/dxf_create_elmt.cpp
branches/dxftoqet2/dxf_create_elmt.h
branches/dxftoqet2/dxftoqet_mainwindow.cpp
branches/dxftoqet2/dxftoqet_mainwindow.h
branches/dxftoqet2/dxftoqet_mainwindow.ui
branches/dxftoqet2/main.cpp
branches/dxftoqet2/src/csv_build_table.cpp
branches/dxftoqet2/src/csv_build_table.h
branches/dxftoqet2/src/dxf/dxf_arc.cpp
branches/dxftoqet2/src/dxf/dxf_arc.h
branches/dxftoqet2/src/dxf/dxf_attdef.cpp
branches/dxftoqet2/src/dxf/dxf_attdef.h
branches/dxftoqet2/src/dxf/dxf_attr.cpp
branches/dxftoqet2/src/dxf/dxf_attr.h
branches/dxftoqet2/src/dxf/dxf_circle.cpp
branches/dxftoqet2/src/dxf/dxf_circle.h
branches/dxftoqet2/src/dxf/dxf_ellipse.cpp
branches/dxftoqet2/src/dxf/dxf_ellipse.h
branches/dxftoqet2/src/dxf/dxf_line.cpp
branches/dxftoqet2/src/dxf/dxf_line.h
branches/dxftoqet2/src/dxf/dxf_lwpolyline.cpp
branches/dxftoqet2/src/dxf/dxf_lwpolyline.h
branches/dxftoqet2/src/dxf/dxf_point.cpp
branches/dxftoqet2/src/dxf/dxf_point.h
branches/dxftoqet2/src/dxf/dxf_polyline.cpp
branches/dxftoqet2/src/dxf/dxf_polyline.h
branches/dxftoqet2/src/dxf/dxf_rect.cpp
branches/dxftoqet2/src/dxf/dxf_rect.h
branches/dxftoqet2/src/dxf/dxf_text.cpp
branches/dxftoqet2/src/dxf/dxf_text.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_arc.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_arc.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_circle.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_circle.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_input.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_line.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_line.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_terminal.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_terminal.h
branches/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp
branches/dxftoqet2/src/dxf_base_types/dxf_base_text.h
branches/dxftoqet2/src/dxf_block/dxf_block_arc.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_arc.h
branches/dxftoqet2/src/dxf_block/dxf_block_attdef.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h
branches/dxftoqet2/src/dxf_block/dxf_block_attribute.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_attribute.h
branches/dxftoqet2/src/dxf_block/dxf_block_circle.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_circle.h
branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.h
branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_insert.h
branches/dxftoqet2/src/dxf_block/dxf_block_lines.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_lines.h
branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.h
branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_polyline.h
branches/dxftoqet2/src/dxf_block/dxf_block_text.cpp
branches/dxftoqet2/src/dxf_block/dxf_block_text.h
branches/dxftoqet2/src/dxf_control/dxf_layer_control.cpp
branches/dxftoqet2/src/dxf_control/dxf_layer_control.h
branches/dxftoqet2/src/dxf_control/dxf_ltype_control.cpp
branches/dxftoqet2/src/dxf_control/dxf_ltype_control.h
branches/dxftoqet2/src/dxf_control/dxf_text_control.cpp
branches/dxftoqet2/src/dxf_control/dxf_text_control.h
branches/dxftoqet2/src/dxf_data.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_arc.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_arc.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attdef.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attdef.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_line.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_line.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.h
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.cpp
branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.h
branches/dxftoqet2/src/dxf_load.cpp
branches/dxftoqet2/src/dxf_load.h
branches/dxftoqet2/src/dxf_ltype_control.h
branches/dxftoqet2/src/dxf_split.cpp
branches/dxftoqet2/src/dxf_split.h
branches/dxftoqet2/src/qet_base_types/baseelmt.cpp
branches/dxftoqet2/src/qet_base_types/baseelmt.h
branches/dxftoqet2/src/split_csv.cpp
branches/dxftoqet2/src/split_csv.h
Modified: branches/dxftoqet2/csv_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/csv_create_elmt.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/csv_create_elmt.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -2,8 +2,7 @@
extern struct DXF_base DXF_main_base[1];
-csv_create_elmt::csv_create_elmt(QWidget *parent) :
- QMainWindow(parent)
+csv_create_elmt::csv_create_elmt(QWidget *parent): QWidget(parent)
{
}
Modified: branches/dxftoqet2/csv_create_elmt.h
===================================================================
--- branches/dxftoqet2/csv_create_elmt.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/csv_create_elmt.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,18 +1,19 @@
#ifndef CSV_CREATE_ELMT_H
#define CSV_CREATE_ELMT_H
-#include <QMainWindow>
-#include "dxf_data.h"
-#include "qet_base_types/baseelmt.h"
-#include "dxf_control/dxf_text_control.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
-#include "dxf/dxf_point.h"
-#include "dxf/dxf_attdef.h"
-#include "dxf/dxf_rect.h"
-#include "dxf/dxf_text.h"
+#include "src/dxf/dxf_point.h"
+#include "src/dxf/dxf_attdef.h"
+#include "src/dxf/dxf_rect.h"
+#include "src/dxf/dxf_text.h"
-class csv_create_elmt : public QMainWindow
+class csv_create_elmt : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/dxf_create_elmt.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -33,8 +33,8 @@
extern struct DXF_block_text DXF_input_block_text[100][50];
extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
-DXF_create_elmt::DXF_create_elmt(QWidget *parent) :
- QMainWindow(parent)
+DXF_create_elmt::DXF_create_elmt(QWidget *parent) : QWidget(parent)//:
+ //QMainWindow(parent)
{
}
@@ -237,6 +237,8 @@
dxf_entitie_line Make_entitie_line;
dxf_entitie_arc Make_entitie_arc;
+ dxf_entitie_attdef Make_entitie_attdef;
+ dxf_entitie_attrinute Make_entitie_attribute;
/* LINE */
@@ -259,15 +261,21 @@
/* ATTDEF */
- Count_entitie_attdef=DXF_main_base[0].DXF_entities_attdef_count;
+ Make_entitie_attdef.Count_entitie_attdef=DXF_main_base[0].DXF_entities_attdef_count;
+ Make_entitie_attdef.Entitie_color="red";
+ Make_entitie_attdef.Entitie_tag="label";
+ Make_entitie_attdef.Entitie_rotate="true";
- Result.append(Make_ATTDEF());
+ Result.append(Make_entitie_attdef.dxf_entitie_make_attdef());
/* ATTR */
- Count_entitie_attr=DXF_main_base[0].DXF_entities_attrib_count;
+ Make_entitie_attribute.Count_entitie_attr=DXF_main_base[0].DXF_entities_attrib_count;
+ Make_entitie_attribute.Entitie_color="red";
+ Make_entitie_attribute.Entitie_tag="label";
+ Make_entitie_attribute.Entitie_rotate="true";
- Result.append(Make_ATTR());
+ Result.append(Make_entitie_attribute.dxf_entitie_make_attribute());
/* CIRCLE */
@@ -424,7 +432,7 @@
}*/
- QString DXF_create_elmt::Make_ATTDEF()
+/* QString DXF_create_elmt::Make_ATTDEF()
{
dxf_attdef dxb_attdef2;
@@ -441,9 +449,9 @@
dxb_attdef2.y=-DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_20;
dxb_attdef2.rotation=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_50;
dxb_attdef2.size=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_40;
- dxb_attdef2.tag="label"; //DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_2;
- dxb_attdef2.rotate="true";
- dxb_attdef2.color_attdef="black";
+ dxb_attdef2.tag="label"; // label //DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_2;
+ dxb_attdef2.rotate="true"; // true
+ dxb_attdef2.color_attdef="black"; // black
db_txt_check.TextToCheck=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_1;
@@ -457,9 +465,9 @@
}
return Result_attdef;
- }
+ }*/
- QString DXF_create_elmt::Make_ATTR()
+ /*QString DXF_create_elmt::Make_ATTR()
{
dxf_attdef dxb_attr;
@@ -493,7 +501,7 @@
return Result_attr;
- }
+ }*/
QString DXF_create_elmt::Make_CIRCLE()
{
Modified: branches/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/dxftoqet2/dxf_create_elmt.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/dxf_create_elmt.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,9 @@
#ifndef DXF_CREATE_ELMT_H
#define DXF_CREATE_ELMT_H
-#include <QMainWindow>
+// #include <QMainWindow>
+#include <QWidget>
+
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
#include "dxftoqet_mainwindow.h"
@@ -30,8 +32,10 @@
#include "src/dxf_entitie/dxf_entitie_line.h"
#include "src/dxf_entitie/dxf_entitie_arc.h"
+#include "src/dxf_entitie/dxf_entitie_attdef.h"
+#include "src/dxf_entitie/dxf_entitie_attrinute.h"
-class DXF_create_elmt : public QMainWindow
+class DXF_create_elmt : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/dxftoqet_mainwindow.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,6 @@
#include "dxftoqet_mainwindow.h"
#include "ui_dxftoqet_mainwindow.h"
-#include "QTextStream"
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QtWidgets>
/* init extern variable */
@@ -124,7 +120,7 @@
DXFtoQET_MainWindow::DXFtoQET_MainWindow(QWidget *parent) :
- QMainWindow(parent),
+ QWidget(parent),
ui(new Ui::DXFtoQET_MainWindow)
{
ui->setupUi(this);
@@ -185,7 +181,7 @@
void DXFtoQET_MainWindow::changeEvent(QEvent *e)
{
- QMainWindow::changeEvent(e);
+ QWidget::changeEvent(e);
switch (e->type())
{
case QEvent::LanguageChange:
Modified: branches/dxftoqet2/dxftoqet_mainwindow.h
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/dxftoqet_mainwindow.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,16 +1,18 @@
#ifndef DXFTOQET_MAINWINDOW_H
#define DXFTOQET_MAINWINDOW_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include <QObject>
#include <QMessageBox>
-#include <QtWidgets>
+//#include <QtWidgets>
+#include <QTableView>
-#include "dxf_data.h"
-#include "dxf_load.h"
-#include "dxf_split.h"
-#include "split_csv.h"
-#include "csv_build_table.h"
+#include "src/dxf_data.h"
+#include "src/dxf_load.h"
+#include "src/dxf_split.h"
+#include "src/split_csv.h"
+#include "src/csv_build_table.h"
#include "dxf_create_elmt.h"
#include "csv_create_elmt.h"
@@ -28,15 +30,13 @@
}
-class DXFtoQET_MainWindow : public QMainWindow, public dxf_data
+class DXFtoQET_MainWindow : public QWidget , public dxf_data //QMainWindow
{
Q_OBJECT
public:
explicit DXFtoQET_MainWindow(QWidget *parent = 0);
-
-
~DXFtoQET_MainWindow();
@@ -69,9 +69,9 @@
QString Result;
QString Result4;
- QStandardItemModel *model;
- QStandardItemModel *model2;
- QStandardItemModel *model3;
+ QAbstractItemModel *model;
+ QAbstractItemModel *model2;
+ QAbstractItemModel *model3;
QAbstractItemModel *model4;
QStringList List2;
@@ -82,7 +82,6 @@
void DXF_Block_table();
protected:
-
void changeEvent(QEvent *e);
private slots:
Modified: branches/dxftoqet2/dxftoqet_mainwindow.ui
===================================================================
--- branches/dxftoqet2/dxftoqet_mainwindow.ui 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/dxftoqet_mainwindow.ui 2016-01-31 19:06:36 UTC (rev 4338)
@@ -762,8 +762,8 @@
<rect>
<x>10</x>
<y>10</y>
- <width>301</width>
- <height>301</height>
+ <width>341</width>
+ <height>331</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
Modified: branches/dxftoqet2/main.cpp
===================================================================
--- branches/dxftoqet2/main.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/main.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxftoqet_mainwindow.h"
#include <QApplication>
-#include "dxf_data.h"
+#include "src/dxf_data.h"
//extern int dxf();
//extern struct DXF_base DXF_main_base[1];
Modified: branches/dxftoqet2/src/csv_build_table.cpp
===================================================================
--- branches/dxftoqet2/src/csv_build_table.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/csv_build_table.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -114,8 +114,7 @@
extern struct DXF_base DXF_main_base[1];
-CSV_Build_table::CSV_Build_table(QWidget *parent):
- QMainWindow(parent)
+CSV_Build_table::CSV_Build_table(QWidget *parent): QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/csv_build_table.h
===================================================================
--- branches/dxftoqet2/src/csv_build_table.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/csv_build_table.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,9 +3,9 @@
#include <QObject>
#include <QWidget>
-#include <QMainWindow>
+//#include <QMainWindow>
-#include "dxf_data.h"
+#include "src/dxf_data.h"
#include "dxftoqet_mainwindow.h"
/*namespace Ui
@@ -14,7 +14,7 @@
}*/
-class CSV_Build_table : public QMainWindow, public dxf_data
+class CSV_Build_table : public QWidget, public dxf_data //QMainWindow
{
Q_OBJECT
Modified: branches/dxftoqet2/src/dxf/dxf_arc.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_arc.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_arc.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -2,7 +2,7 @@
#include "dxf_base_types/dxf_base_arc.h"
dxf_arc::dxf_arc(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_arc.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_arc.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_arc.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,12 +1,13 @@
#ifndef DXF_ARC_H
#define DXF_ARC_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_arc.h"
-#include "dxf_control/dxf_ltype_control.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_arc.h"
+#include "src/dxf_control/dxf_ltype_control.h"
-class dxf_arc : public QMainWindow
+class dxf_arc : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_attdef.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_attdef.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_attdef.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_attdef.h"
dxf_attdef::dxf_attdef(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_attdef.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_attdef.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_attdef.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,11 @@
#ifndef DXF_ATTDEF_H
#define DXF_ATTDEF_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_input.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_input.h"
-class dxf_attdef : public QMainWindow
+class dxf_attdef : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_attr.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_attr.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_attr.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_attr.h"
dxf_attr::dxf_attr(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_attr.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_attr.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_attr.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,11 @@
#ifndef DXF_ATTR_H
#define DXF_ATTR_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_input.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_input.h"
-class dxf_attr : public QMainWindow
+class dxf_attr : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_circle.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_circle.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_circle.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_circle.h"
dxf_circle::dxf_circle(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_circle.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_circle.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_circle.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,11 +1,12 @@
#ifndef DXF_CIRCLE_H
#define DXF_CIRCLE_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_circle.h"
-#include "dxf_control/dxf_ltype_control.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_circle.h"
+#include "src/dxf_control/dxf_ltype_control.h"
-class dxf_circle : public QMainWindow
+class dxf_circle : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_ellipse.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_ellipse.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_ellipse.h"
dxf_ellipse::dxf_ellipse(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_ellipse.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_ellipse.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,12 +1,13 @@
#ifndef DXF_ELLIPSE_H
#define DXF_ELLIPSE_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_ellipse.h"
-#include "dxf_control/dxf_ltype_control.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_ellipse.h"
+#include "src/dxf_control/dxf_ltype_control.h"
#include <QtMath>
-class dxf_ellipse : public QMainWindow
+class dxf_ellipse : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_line.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_line.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_line.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_line.h"
DXF_LINE::DXF_LINE(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_line.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_line.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_line.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,11 +1,12 @@
#ifndef DXF_LINE_H
#define DXF_LINE_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_line.h"
-#include "dxf_control/dxf_ltype_control.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_line.h"
+#include "src/dxf_control/dxf_ltype_control.h"
-class DXF_LINE : public QMainWindow
+class DXF_LINE : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_lwpolyline.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_lwpolyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,7 @@
#include "dxf_lwpolyline.h"
-dxf_lwpolyline::dxf_lwpolyline(QWidget *parent) : QMainWindow(parent)
+dxf_lwpolyline::dxf_lwpolyline(QWidget *parent) :
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_lwpolyline.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_lwpolyline.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_lwpolyline.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,11 +1,12 @@
#ifndef DXF_LWPOLYLINE_H
#define DXF_LWPOLYLINE_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_polyline.h"
-#include "dxf_control/dxf_ltype_control.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_polyline.h"
+#include "src/dxf_control/dxf_ltype_control.h"
-class dxf_lwpolyline : public QMainWindow
+class dxf_lwpolyline : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_point.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_point.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_point.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_point.h"
dxf_point::dxf_point(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_point.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_point.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_point.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,11 @@
#ifndef DXF_POINT_H
#define DXF_POINT_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_terminal.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_terminal.h"
-class dxf_point : public QMainWindow
+class dxf_point : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_polyline.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_polyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_polyline.h"
dxf_polyline::dxf_polyline(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_polyline.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_polyline.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,11 +1,12 @@
#ifndef DXF_POLYLINE_H
#define DXF_POLYLINE_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_polyline.h"
-#include "dxf_control/dxf_ltype_control.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_polyline.h"
+#include "src/dxf_control/dxf_ltype_control.h"
-class dxf_polyline : public QMainWindow
+class dxf_polyline : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_rect.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_rect.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_rect.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_rect.h"
dxf_rect::dxf_rect(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf/dxf_rect.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_rect.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_rect.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,11 @@
#ifndef DXF_RECT_H
#define DXF_RECT_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_rectangel.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_rectangel.h"
-class dxf_rect : public QMainWindow
+class dxf_rect : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf/dxf_text.cpp
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_text.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_text.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_text.h"
dxf_text::dxf_text(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
Modified: branches/dxftoqet2/src/dxf/dxf_text.h
===================================================================
--- branches/dxftoqet2/src/dxf/dxf_text.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf/dxf_text.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,11 @@
#ifndef DXF_TEXT_H
#define DXF_TEXT_H
-#include <QMainWindow>
-#include "dxf_base_types/dxf_base_text.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_base_types/dxf_base_text.h"
-class dxf_text : public QMainWindow
+class dxf_text : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_arc.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_arc.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_arc.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_arc.h"
dxf_base_arc::dxf_base_arc(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_arc.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_arc.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_arc.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_ARC_H
#define DXF_BASE_ARC_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_arc : public QMainWindow
+class dxf_base_arc : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_circle.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_circle.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_circle.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_circle.h"
dxf_base_circle::dxf_base_circle(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_circle.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_circle.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_circle.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_CIRCLE_H
#define DXF_BASE_CIRCLE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_circle : public QMainWindow
+class dxf_base_circle : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_ellipse.h"
dxf_base_ellipse::dxf_base_ellipse(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_ELLIPSE_H
#define DXF_BASE_ELLIPSE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_ellipse : public QMainWindow
+class dxf_base_ellipse : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_input.h"
dxf_base_input::dxf_base_input(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_input.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_input.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_input.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_INPUT_H
#define DXF_BASE_INPUT_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_input : public QMainWindow
+class dxf_base_input : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_line.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_line.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_line.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_line.h"
dxf_base_line::dxf_base_line(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_line.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_line.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_line.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_LINE_H
#define DXF_BASE_LINE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_line : public QMainWindow
+class dxf_base_line : public QWidget //QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_polyline.h"
dxf_base_polyline::dxf_base_polyline(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_polyline.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_POLYLINE_H
#define DXF_BASE_POLYLINE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_polyline : public QMainWindow
+class dxf_base_polyline : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_rectangel.h"
dxf_base_rectangel::dxf_base_rectangel(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_RECTANGEL_H
#define DXF_BASE_RECTANGEL_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_rectangel : public QMainWindow
+class dxf_base_rectangel : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_terminal.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_terminal.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_terminal.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_terminal.h"
dxf_base_terminal::dxf_base_terminal(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_terminal.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_terminal.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_terminal.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_TERMINAL_H
#define DXF_BASE_TERMINAL_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_terminal : public QMainWindow
+class dxf_base_terminal : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,7 @@
#include "dxf_base_text.h"
dxf_base_text::dxf_base_text(QWidget *parent) :
- QMainWindow(parent)
+ QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_base_types/dxf_base_text.h
===================================================================
--- branches/dxftoqet2/src/dxf_base_types/dxf_base_text.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_base_types/dxf_base_text.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BASE_TEXT_H
#define DXF_BASE_TEXT_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_base_text : public QMainWindow
+class dxf_base_text : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_arc.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_arc.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_arc.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_block_arc DXF_input_block_arc[100][50];
-dxf_block_arc::dxf_block_arc(QWidget *parent) : QMainWindow(parent)
+dxf_block_arc::dxf_block_arc(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_arc.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_arc.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_arc.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,12 +1,13 @@
#ifndef DXF_BLOCK_ARC_H
#define DXF_BLOCK_ARC_H
-#include <QMainWindow>
-#include "dxf/dxf_arc.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf/dxf_arc.h"
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
-class dxf_block_arc : public QMainWindow
+class dxf_block_arc : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_attdef.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attdef.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attdef.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_block_attdef DXF_input_block_attdef[100][50];
-dxf_block_attdef::dxf_block_attdef(QWidget *parent) : QMainWindow(parent)
+dxf_block_attdef::dxf_block_attdef(QWidget *parent) : QWidget(parent)
{
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attdef.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,8 @@
#ifndef DXF_BLOCK_ATTDEF_H
#define DXF_BLOCK_ATTDEF_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include "dxf/dxf_attdef.h"
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_attribute.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attribute.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attribute.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_block_attrib DXF_input_block_attrib[100][50];
-dxf_block_attribute::dxf_block_attribute(QWidget *parent) : QMainWindow(parent)
+dxf_block_attribute::dxf_block_attribute(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_attribute.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_attribute.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_attribute.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,13 +1,14 @@
#ifndef DXF_BLOCK_ATTRIBUTE_H
#define DXF_BLOCK_ATTRIBUTE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include "src/dxf/dxf_attr.h"
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
#include "src/dxf_control/dxf_text_control.h"
-class dxf_block_attribute : public QMainWindow
+class dxf_block_attribute : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_circle.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_circle.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_circle.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_block_circle DXF_input_block_circle[100][50];
-dxf_block_circle::dxf_block_circle(QWidget *parent) : QMainWindow(parent)
+dxf_block_circle::dxf_block_circle(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_circle.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_circle.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_circle.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,12 +1,13 @@
#ifndef DXF_BLOCK_CIRCLE_H
#define DXF_BLOCK_CIRCLE_H
-#include <QMainWindow>
-#include "dxf/dxf_circle.h"
-#include "dxf_data.h"
-#include "qet_base_types/baseelmt.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf/dxf_circle.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
-class dxf_block_circle : public QMainWindow
+class dxf_block_circle : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_block_ellipse DXF_input_block_ellipse[100][50];
-dxf_block_ellipse::dxf_block_ellipse(QWidget *parent) : QMainWindow(parent)
+dxf_block_ellipse::dxf_block_ellipse(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_ellipse.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,12 +1,13 @@
#ifndef DXF_BLOCK_ELLIPSE_H
#define DXF_BLOCK_ELLIPSE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include "src/dxf/dxf_ellipse.h"
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
-class dxf_block_ellipse : public QMainWindow
+class dxf_block_ellipse : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_insert.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxf_block_insert.h"
-dxf_block_insert::dxf_block_insert(QWidget *parent) : QMainWindow(parent)
+dxf_block_insert::dxf_block_insert(QWidget *parent): QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_insert.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_insert.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_insert.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_BLOCK_INSERT_H
#define DXF_BLOCK_INSERT_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_block_insert : public QMainWindow
+class dxf_block_insert : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_lines.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lines.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lines.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_block_line DXF_input_block_line[100][50];
-dxf_block_lines::dxf_block_lines(QWidget *parent) : QMainWindow(parent)
+dxf_block_lines::dxf_block_lines(QWidget *parent) : QWidget(parent)
{
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_lines.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lines.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lines.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,12 +1,13 @@
#ifndef DXF_BLOCK_LINES_H
#define DXF_BLOCK_LINES_H
-#include <QMainWindow>
-#include "dxf/dxf_line.h"
-#include "dxf_data.h"
-#include "qet_base_types/baseelmt.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf/dxf_line.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
-class dxf_block_lines : public QMainWindow
+class dxf_block_lines : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -4,7 +4,7 @@
extern struct DXF_block_lwpolyline DXF_input_block_lwpolyline[100][50];
-dxf_block_lwpolyline::dxf_block_lwpolyline(QWidget *parent) : QMainWindow(parent)
+dxf_block_lwpolyline::dxf_block_lwpolyline(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_lwpolyline.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,12 +1,12 @@
#ifndef DXF_BLOCK_LWPOLYLINE_H
#define DXF_BLOCK_LWPOLYLINE_H
-#include <QMainWindow>
+//#include <QMainWindow>
#include "src/dxf/dxf_lwpolyline.h"
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
-class dxf_block_lwpolyline : public QMainWindow
+class dxf_block_lwpolyline : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_polyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -4,7 +4,7 @@
extern struct DXF_block_polyline DXF_input_block_polyline[100][50];
extern struct DXF_block_vertex DXF_input_block_vertex[100][500];
-dxf_block_polyline::dxf_block_polyline(QWidget *parent) : QMainWindow(parent)
+dxf_block_polyline::dxf_block_polyline(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_polyline.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_polyline.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,12 +1,13 @@
#ifndef DXF_BLOCK_POLYLINE_H
#define DXF_BLOCK_POLYLINE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include "src/dxf/dxf_polyline.h"
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
-class dxf_block_polyline : public QMainWindow
+class dxf_block_polyline : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_text.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_text.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_text.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_block_text DXF_input_block_text[100][50];
-dxf_block_text::dxf_block_text(QWidget *parent) : QMainWindow(parent)
+dxf_block_text::dxf_block_text(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_block/dxf_block_text.h
===================================================================
--- branches/dxftoqet2/src/dxf_block/dxf_block_text.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_block/dxf_block_text.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,13 +1,14 @@
#ifndef DXF_BLOCK_TEXT_H
#define DXF_BLOCK_TEXT_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include "src/dxf/dxf_text.h"
#include "src/dxf_data.h"
#include "src/qet_base_types/baseelmt.h"
#include "src/dxf_control/dxf_text_control.h"
-class dxf_block_text : public QMainWindow
+class dxf_block_text : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_control/dxf_layer_control.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_control/dxf_layer_control.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_control/dxf_layer_control.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,8 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_table_layer DXF_input_table_layer[100];
-DXF_layer_control::DXF_layer_control(QWidget *parent) :
- QMainWindow(parent)
+DXF_layer_control::DXF_layer_control(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_control/dxf_layer_control.h
===================================================================
--- branches/dxftoqet2/src/dxf_control/dxf_layer_control.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_control/dxf_layer_control.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,11 @@
#ifndef DXF_LAYER_CONTROL_H
#define DXF_LAYER_CONTROL_H
-#include <QMainWindow>
-#include "dxf_data.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_data.h"
-class DXF_layer_control : public QMainWindow
+class DXF_layer_control : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_control/dxf_ltype_control.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_control/dxf_ltype_control.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_control/dxf_ltype_control.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,6 @@
#include "dxf_ltype_control.h"
-DXF_Ltype_control::DXF_Ltype_control(QWidget *parent) :
- QMainWindow(parent)
+DXF_Ltype_control::DXF_Ltype_control(QWidget *parent) : QWidget(parent)
{
Modified: branches/dxftoqet2/src/dxf_control/dxf_ltype_control.h
===================================================================
--- branches/dxftoqet2/src/dxf_control/dxf_ltype_control.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_control/dxf_ltype_control.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,11 @@
#ifndef DXF_LTYPE_CONTROL_H
#define DXF_LTYPE_CONTROL_H
-#include <QMainWindow>
-#include "dxf_control/dxf_layer_control.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_control/dxf_layer_control.h"
-class DXF_Ltype_control : public QMainWindow
+class DXF_Ltype_control : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_control/dxf_text_control.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_control/dxf_text_control.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_control/dxf_text_control.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,6 @@
#include "dxf_text_control.h"
-DXF_Text_control::DXF_Text_control(QWidget *parent) :
- QMainWindow(parent)
+DXF_Text_control::DXF_Text_control(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_control/dxf_text_control.h
===================================================================
--- branches/dxftoqet2/src/dxf_control/dxf_text_control.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_control/dxf_text_control.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_TEXT_CONTROL_H
#define DXF_TEXT_CONTROL_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class DXF_Text_control : public QMainWindow
+class DXF_Text_control : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_data.h
===================================================================
--- branches/dxftoqet2/src/dxf_data.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_data.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,8 @@
//#include <QObject>
#include <QtCore>
-#include <QtWidgets>
+#include <QWidget>
+//#include <QtWidgets>
struct DXF_file_input
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_arc.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_arc.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_arc.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_entities_arc DXF_input_entities_arc[1000];
-dxf_entitie_arc::dxf_entitie_arc(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_arc::dxf_entitie_arc(QWidget *parent): QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_arc.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_arc.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_arc.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,14 @@
#ifndef DXF_ENTITIE_ARC_H
#define DXF_ENTITIE_ARC_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include "src/dxf/dxf_arc.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
-class dxf_entitie_arc : public QMainWindow
+class dxf_entitie_arc : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attdef.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attdef.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attdef.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,45 @@
#include "dxf_entitie_attdef.h"
-dxf_entitie_attdef::dxf_entitie_attdef(QWidget *parent) : QMainWindow(parent)
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_entities_attdef DXF_input_entities_attdef[1000];
+
+dxf_entitie_attdef::dxf_entitie_attdef(QWidget *parent) : QWidget(parent)//: QMainWindow(parent)
{
}
+QString dxf_entitie_attdef::dxf_entitie_make_attdef()
+{
+
+ dxf_attdef dxb_attdef2;
+ DXF_Text_control db_txt_check;
+
+ Result_attdef ="";
+
+ Count_lines=0;
+
+ while (Count_lines<=Count_entitie_attdef)
+ {
+
+ dxb_attdef2.x=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_10;
+ dxb_attdef2.y=-DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_20;
+ dxb_attdef2.rotation=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_50;
+ dxb_attdef2.size=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_40;
+ dxb_attdef2.tag=Entitie_tag; // label //DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_2;
+ dxb_attdef2.rotate=Entitie_rotate; // true
+ dxb_attdef2.color_attdef=Entitie_color; // black
+
+ db_txt_check.TextToCheck=DXF_input_entities_attdef[Count_lines].DXF_entities_attdef_code_1;
+
+ dxb_attdef2.text=db_txt_check.Text_control();
+
+ Result_attdef.append(dxb_attdef2.Create_ATTDEF());
+
+ Count_lines=Count_lines+1;
+
+
+ }
+
+ return Result_attdef;
+
+}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attdef.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attdef.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attdef.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,14 +1,32 @@
#ifndef DXF_ENTITIE_ATTDEF_H
#define DXF_ENTITIE_ATTDEF_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf/dxf_attdef.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
-class dxf_entitie_attdef : public QMainWindow
+class dxf_entitie_attdef : public QWidget //QMainWindow
{
Q_OBJECT
public:
explicit dxf_entitie_attdef(QWidget *parent = 0);
+ QString Result_attdef;
+ QString Entitie_color;
+ QString Entitie_line_weight;
+ QString Entitie_filling;
+ QString Entitie_antialias;
+ QString Entitie_rotate;
+ QString Entitie_tag;
+
+ int Count_lines;
+ int Count_entitie_attdef;
+
+ QString dxf_entitie_make_attdef();
+
signals:
public slots:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,7 +1,44 @@
#include "dxf_entitie_attrinute.h"
-dxf_entitie_attrinute::dxf_entitie_attrinute(QWidget *parent) : QMainWindow(parent)
+extern struct DXF_base DXF_main_base[1];
+extern struct DXF_entities_attrib DXF_input_entities_attrib[1000];
+
+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;
+}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_attrinute.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,14 +1,31 @@
#ifndef DXF_ENTITIE_ATTRINUTE_H
#define DXF_ENTITIE_ATTRINUTE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <qwidget.h>
+#include "src/dxf/dxf_attr.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
-class dxf_entitie_attrinute : public QMainWindow
+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:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxf_entitie_circle.h"
-dxf_entitie_circle::dxf_entitie_circle(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_circle::dxf_entitie_circle(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_circle.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_ENTITIE_CIRCLE_H
#define DXF_ENTITIE_CIRCLE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_entitie_circle : public QMainWindow
+class dxf_entitie_circle : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxf_entitie_ellipse.h"
-dxf_entitie_ellipse::dxf_entitie_ellipse(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_ellipse::dxf_entitie_ellipse(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_ellipse.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_ENTITIE_ELLIPSE_H
#define DXF_ENTITIE_ELLIPSE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_entitie_ellipse : public QMainWindow
+class dxf_entitie_ellipse : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxf_entitie_insert.h"
-dxf_entitie_insert::dxf_entitie_insert(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_insert::dxf_entitie_insert(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_insert.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_ENTITIE_INSERT_H
#define DXF_ENTITIE_INSERT_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_entitie_insert : public QMainWindow
+class dxf_entitie_insert : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_line.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_line.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_line.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -3,7 +3,7 @@
extern struct DXF_base DXF_main_base[1];
extern struct DXF_entities_line DXF_input_entities_line[100000];
-dxf_entitie_line::dxf_entitie_line(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_line::dxf_entitie_line(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_line.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_line.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_line.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,10 +1,14 @@
#ifndef DXF_ENTITIE_LINE_H
#define DXF_ENTITIE_LINE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include "src/dxf/dxf_line.h"
+#include "src/dxf_data.h"
+#include "src/qet_base_types/baseelmt.h"
+#include "src/dxf_control/dxf_text_control.h"
-class dxf_entitie_line : public QMainWindow
+class dxf_entitie_line : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxf_entitie_lwpolyline.h"
-dxf_entitie_lwpolyline::dxf_entitie_lwpolyline(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_lwpolyline::dxf_entitie_lwpolyline(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_lwpolyline.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_ENTITIE_LWPOLYLINE_H
#define DXF_ENTITIE_LWPOLYLINE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_entitie_lwpolyline : public QMainWindow
+class dxf_entitie_lwpolyline : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxf_entitie_pint.h"
-dxf_entitie_pint::dxf_entitie_pint(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_pint::dxf_entitie_pint(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_pint.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_ENTITIE_PINT_H
#define DXF_ENTITIE_PINT_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_entitie_pint : public QMainWindow
+class dxf_entitie_pint : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxf_entitie_polyline.h"
-dxf_entitie_polyline::dxf_entitie_polyline(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_polyline::dxf_entitie_polyline(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_polyline.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_ENTITIE_POLYLINE_H
#define DXF_ENTITIE_POLYLINE_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_entitie_polyline : public QMainWindow
+class dxf_entitie_polyline : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,6 +1,6 @@
#include "dxf_entitie_text.h"
-dxf_entitie_text::dxf_entitie_text(QWidget *parent) : QMainWindow(parent)
+dxf_entitie_text::dxf_entitie_text(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.h
===================================================================
--- branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_entitie/dxf_entitie_text.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_ENTITIE_TEXT_H
#define DXF_ENTITIE_TEXT_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class dxf_entitie_text : public QMainWindow
+class dxf_entitie_text : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_load.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_load.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_load.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -25,8 +25,7 @@
-dxf_load::dxf_load(QWidget *parent) :
- QMainWindow(parent)
+dxf_load::dxf_load(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_load.h
===================================================================
--- branches/dxftoqet2/src/dxf_load.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_load.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -2,14 +2,15 @@
#define DXF_LOAD_H
#include <QObject>
-#include <QMainWindow>
-#include <QtWidgets>
-#include "dxf_data.h"
+//#include <QMainWindow>
+#include <QWidget>
+//#include <QtWidgets>
+#include "src/dxf_data.h"
#include "dxftoqet_mainwindow.h"
#include "ui_dxftoqet_mainwindow.h"
-class dxf_load :public QMainWindow, public dxf_data
+class dxf_load :public QWidget, public dxf_data //QMainWindow
{
Q_OBJECT
Modified: branches/dxftoqet2/src/dxf_ltype_control.h
===================================================================
--- branches/dxftoqet2/src/dxf_ltype_control.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_ltype_control.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,9 +1,10 @@
#ifndef DXF_LTYPE_CONTROL_H
#define DXF_LTYPE_CONTROL_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
-class DXF_Ltype_control : public QMainWindow
+class DXF_Ltype_control : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/dxftoqet2/src/dxf_split.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_split.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -117,8 +117,7 @@
-dxf_split::dxf_split(QWidget *parent) :
- QMainWindow(parent)
+dxf_split::dxf_split(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/dxf_split.h
===================================================================
--- branches/dxftoqet2/src/dxf_split.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/dxf_split.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -2,14 +2,15 @@
#define DXF_SPLIT_H
#include <QObject>
-#include <QMainWindow>
-#include "dxf_data.h"
+//#include <QMainWindow>
+#include <QWidget>
+#include "src/dxf_data.h"
#include "dxftoqet_mainwindow.h"
-#include <QtWidgets>
+//#include <QtWidgets>
#include "ui_dxftoqet_mainwindow.h"
-class dxf_split : public QMainWindow,public dxf_data
+class dxf_split : public QWidget ,public dxf_data //QMainWindow
{
Q_OBJECT
Modified: branches/dxftoqet2/src/qet_base_types/baseelmt.cpp
===================================================================
--- branches/dxftoqet2/src/qet_base_types/baseelmt.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/qet_base_types/baseelmt.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -2,8 +2,7 @@
extern struct DXF_base DXF_main_base[1];
-BaseELMT::BaseELMT(QWidget *parent) :
- QMainWindow(parent)
+BaseELMT::BaseELMT(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/qet_base_types/baseelmt.h
===================================================================
--- branches/dxftoqet2/src/qet_base_types/baseelmt.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/qet_base_types/baseelmt.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -1,13 +1,14 @@
#ifndef BASEELMT_H
#define BASEELMT_H
-#include <QMainWindow>
+//#include <QMainWindow>
+#include <QWidget>
#include <QtCore>
#include <qobject.h>
-class BaseELMT : public QMainWindow
+class BaseELMT : public QWidget // QMainWindow
{
Q_OBJECT
public:
Modified: branches/dxftoqet2/src/split_csv.cpp
===================================================================
--- branches/dxftoqet2/src/split_csv.cpp 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/split_csv.cpp 2016-01-31 19:06:36 UTC (rev 4338)
@@ -6,8 +6,7 @@
extern struct DXF_base DXF_main_base[1];
-split_csv::split_csv(QWidget *parent) :
- QMainWindow(parent)
+split_csv::split_csv(QWidget *parent) : QWidget(parent)
{
}
Modified: branches/dxftoqet2/src/split_csv.h
===================================================================
--- branches/dxftoqet2/src/split_csv.h 2016-01-29 15:27:34 UTC (rev 4337)
+++ branches/dxftoqet2/src/split_csv.h 2016-01-31 19:06:36 UTC (rev 4338)
@@ -2,14 +2,14 @@
#define SPLIT_CSV_H
-#include "dxf_data.h"
+#include "src/dxf_data.h"
#include <QObject>
-#include <QMainWindow>
+//#include <QMainWindow>
#include "dxftoqet_mainwindow.h"
-#include <QtWidgets>
+//#include <QtWidgets>
#include "ui_dxftoqet_mainwindow.h"
-class split_csv : public QMainWindow,public dxf_data
+class split_csv : public QWidget ,public dxf_data //QMainwindow
{
Q_OBJECT