| [qet] [4326] qetdxf : minor changes to solf errors |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4326
Author: rdsivd
Date: 2016-01-17 00:24:04 +0100 (Sun, 17 Jan 2016)
Log Message:
-----------
qetdxf : minor changes to solf errors
Modified Paths:
--------------
branches/Qetdxf/sources/configpages.cpp
branches/Qetdxf/sources/dxftoqet2/csv_create_elmt.cpp
branches/Qetdxf/sources/dxftoqet2/csv_create_elmt.h
branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.cpp
branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.h
branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp
branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.h
branches/Qetdxf/sources/dxftoqet2/src/csv_build_table.cpp
branches/Qetdxf/sources/dxftoqet2/src/csv_build_table.h
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attdef.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attr.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_circle.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_ellipse.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_line.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_lwpolyline.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_point.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_polyline.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_rect.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_text.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_arc.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_circle.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_line.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_terminal.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_layer_control.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_ltype_control.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_ltype_control.h
branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_text_control.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_data.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_load.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_load.h
branches/Qetdxf/sources/dxftoqet2/src/dxf_split.cpp
branches/Qetdxf/sources/dxftoqet2/src/dxf_split.h
branches/Qetdxf/sources/dxftoqet2/src/qet_base_types/baseelmt.cpp
branches/Qetdxf/sources/dxftoqet2/src/split_csv.cpp
branches/Qetdxf/sources/dxftoqet2/src/split_csv.h
branches/Qetdxf/sources/properties/xrefproperties.h
branches/Qetdxf/sources/qetdiagrameditor.cpp
branches/Qetdxf/sources/qetproject.cpp
Modified: branches/Qetdxf/sources/configpages.cpp
===================================================================
--- branches/Qetdxf/sources/configpages.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/configpages.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -25,7 +25,7 @@
#include "ui/reportpropertiewidget.h"
#include "ui/xrefpropertieswidget.h"
#include "qetproject.h"
-#include "reportproperties.h"
+#include "properties/reportproperties.h"
#include "qetapp.h"
/**
Modified: branches/Qetdxf/sources/dxftoqet2/csv_create_elmt.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/csv_create_elmt.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/csv_create_elmt.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "csv_create_elmt.h"
+#include "dxftoqet2/csv_create_elmt.h"
extern struct DXF_base DXF_main_base[1];
Modified: branches/Qetdxf/sources/dxftoqet2/csv_create_elmt.h
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/csv_create_elmt.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/csv_create_elmt.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -2,14 +2,14 @@
#define CSV_CREATE_ELMT_H
//#include <QMainWindow>
-#include "src/dxf_data.h"
-#include "src/qet_base_types/baseelmt.h"
-#include "src/dxf_control/dxf_text_control.h"
+#include "dxftoqet2/src/dxf_data.h"
+#include "dxftoqet2/src/qet_base_types/baseelmt.h"
+#include "dxftoqet2/src/dxf_control/dxf_text_control.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"
+#include "dxftoqet2/src/dxf/dxf_point.h"
+#include "dxftoqet2/src/dxf/dxf_attdef.h"
+#include "dxftoqet2/src/dxf/dxf_rect.h"
+#include "dxftoqet2/src/dxf/dxf_text.h"
class csv_create_elmt : public QMainWindow
Modified: branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_create_elmt.h"
+#include "dxftoqet2/dxf_create_elmt.h"
extern struct DXF_base DXF_main_base[1];
extern struct DXF_header DXF_input_header[500];
Modified: branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.h
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/dxf_create_elmt.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -4,7 +4,7 @@
//#include <QMainWindow>
#include "dxftoqet2/src/dxf_data.h"
#include "dxftoqet2/src/qet_base_types/baseelmt.h"
-#include "dxftoqet_mainwindow.h"
+#include "dxftoqet2/dxftoqet_mainwindow.h"
#include "ui_dxftoqet_mainwindow.h"
#include "dxftoqet2/src/dxf/dxf_line.h"
Modified: branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxftoqet_mainwindow.h"
+#include "dxftoqet2/dxftoqet_mainwindow.h"
#include "ui_dxftoqet_mainwindow.h"
#include "QTextStream"
Modified: branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.h
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/dxftoqet_mainwindow.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -6,13 +6,13 @@
#include <QMessageBox>
#include <QtWidgets>
-#include "dxf_data.h"
-#include "dxf_load.h"
-#include "dxf_split.h"
-#include "split_csv.h"
-#include "csv_build_table.h"
-#include "dxf_create_elmt.h"
-#include "csv_create_elmt.h"
+#include "dxftoqet2/src/dxf_data.h"
+#include "dxftoqet2/src/dxf_load.h"
+#include "dxftoqet2/src/dxf_split.h"
+#include "dxftoqet2/src/split_csv.h"
+#include "dxftoqet2/src/csv_build_table.h"
+#include "dxftoqet2/dxf_create_elmt.h"
+#include "dxftoqet2/csv_create_elmt.h"
#include <QTextStream>
#include <QFileDialog>
Modified: branches/Qetdxf/sources/dxftoqet2/src/csv_build_table.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/csv_build_table.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/csv_build_table.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "csv_build_table.h"
+#include "dxftoqet2/src/csv_build_table.h"
//extern int dxf ();
@@ -114,7 +114,7 @@
extern struct DXF_base DXF_main_base[1];
-CSV_Build_table::CSV_Build_table(QWidget *parent)
+/*CSV_Build_table::CSV_Build_table(QWidget *parent)
{
}
@@ -131,4 +131,4 @@
-}
+}*/
Modified: branches/Qetdxf/sources/dxftoqet2/src/csv_build_table.h
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/csv_build_table.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/csv_build_table.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -5,8 +5,8 @@
#include <QWidget>
#include <QMainWindow>
-#include "dxf_data.h"
-#include "dxftoqet_mainwindow.h"
+#include "dxftoqet2/src/dxf_data.h"
+#include "dxftoqet2/dxftoqet_mainwindow.h"
/*namespace Ui
{
@@ -20,7 +20,7 @@
public:
- CSV_Build_table(QWidget *parent = 0);
+ //CSV_Build_table(QWidget *parent = 0);
//~CSV_Build_table();
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_arc.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_arc.h"
+#include "dxftoqet2/src/dxf/dxf_arc.h"
#include "dxftoqet2/src/dxf_base_types/dxf_base_arc.h"
dxf_arc::dxf_arc(QWidget *parent) :
@@ -21,11 +21,11 @@
DXF_Ltype_control db_line_ltype_control;
- db_line_ltype_control.FindLT=ltype;
- db_line_ltype_control.Layer=layer;
+ db_line_ltype_control.dxf_FindLT=ltype;
+ db_line_ltype_control.dxf_Layer=layer;
- db_line.QET_line_style=db_line_ltype_control.Ltype_control();
+ db_line.QET_line_style=db_line_ltype_control.dxf2_Ltype_control();
db_line.QET_line_weight="thin";
db_line.QET_filling="none";
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attdef.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attdef.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attdef.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_attdef.h"
+#include "dxftoqet2/src/dxf/dxf_attdef.h"
dxf_attdef::dxf_attdef(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attr.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attr.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_attr.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_attr.h"
+#include "dxftoqet2/src/dxf/dxf_attr.h"
dxf_attr::dxf_attr(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_circle.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_circle.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_circle.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_circle.h"
+#include "dxftoqet2/src/dxf/dxf_circle.h"
dxf_circle::dxf_circle(QWidget *parent) :
QMainWindow(parent)
@@ -12,10 +12,10 @@
Result_circle="";
- db_line_ltype_control.FindLT=ltype;
- db_line_ltype_control.Layer=layer;
+ db_line_ltype_control.dxf_FindLT=ltype;
+ db_line_ltype_control.dxf_Layer=layer;
- db_circle.QET_line_style=db_line_ltype_control.Ltype_control();
+ db_circle.QET_line_style=db_line_ltype_control.dxf2_Ltype_control();
db_circle.QET_x=x;
db_circle.QET_y=y;
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_ellipse.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_ellipse.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_ellipse.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_ellipse.h"
+#include "dxftoqet2/src/dxf/dxf_ellipse.h"
dxf_ellipse::dxf_ellipse(QWidget *parent) :
QMainWindow(parent)
@@ -58,11 +58,11 @@
DXF_Ltype_control db_line_ltype_control;
- db_line_ltype_control.FindLT=ltype;
- db_line_ltype_control.Layer=layer;
+ db_line_ltype_control.dxf_FindLT=ltype;
+ db_line_ltype_control.dxf_Layer=layer;
- db_ellipse.QET_line_style=db_line_ltype_control.Ltype_control();
+ db_ellipse.QET_line_style=db_line_ltype_control.dxf2_Ltype_control();
db_ellipse.QET_line_weight=Line_weight;
db_ellipse.QET_filling=Filling;
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_line.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_line.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_line.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_line.h"
+#include "dxftoqet2/src/dxf/dxf_line.h"
DXF_LINE::DXF_LINE(QWidget *parent) :
QMainWindow(parent)
@@ -25,11 +25,11 @@
DXF_Ltype_control db_line_ltype_control;
- db_line_ltype_control.FindLT=ltype;
- db_line_ltype_control.Layer=layer;
+ db_line_ltype_control.dxf_FindLT=ltype;
+ db_line_ltype_control.dxf_Layer=layer;
- db_line.QETline_style=db_line_ltype_control.Ltype_control();
+ db_line.QETline_style=db_line_ltype_control.dxf2_Ltype_control();
db_line.QETline_weight="thin";
db_line.QETfilling="none";
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_lwpolyline.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_lwpolyline.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_lwpolyline.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_lwpolyline.h"
+#include "dxftoqet2/src/dxf/dxf_lwpolyline.h"
dxf_lwpolyline::dxf_lwpolyline(QWidget *parent) : QMainWindow(parent)
{
@@ -12,10 +12,10 @@
Result_lwpolyline="";
- db_line_ltype_control.FindLT=ltype;
- db_line_ltype_control.Layer=layer;
+ db_line_ltype_control.dxf_FindLT=ltype;
+ db_line_ltype_control.dxf_Layer=layer;
- db_lwpolyline.QET_line_style=db_line_ltype_control.Ltype_control();
+ db_lwpolyline.QET_line_style=db_line_ltype_control.dxf2_Ltype_control();
db_lwpolyline.QET_antialias=antialias;
db_lwpolyline.QET_line_weight=line_weight;
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_point.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_point.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_point.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_point.h"
+#include "dxftoqet2/src/dxf/dxf_point.h"
dxf_point::dxf_point(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_polyline.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_polyline.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_polyline.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_polyline.h"
+#include "dxftoqet2/src/dxf/dxf_polyline.h"
dxf_polyline::dxf_polyline(QWidget *parent) :
QMainWindow(parent)
@@ -12,10 +12,10 @@
Result_polyline="";
- db_line_ltype_control.FindLT=ltype;
- db_line_ltype_control.Layer=layer;
+ db_line_ltype_control.dxf_FindLT=ltype;
+ db_line_ltype_control.dxf_Layer=layer;
- db_polyline.QET_line_style=db_line_ltype_control.Ltype_control();
+ db_polyline.QET_line_style=db_line_ltype_control.dxf2_Ltype_control();
db_polyline.QET_antialias=antialias;
db_polyline.QET_line_weight=line_weight;
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_rect.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_rect.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_rect.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_rect.h"
+#include "dxftoqet2/src/dxf/dxf_rect.h"
dxf_rect::dxf_rect(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_text.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_text.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf/dxf_text.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_text.h"
+#include "dxftoqet2/src/dxf/dxf_text.h"
dxf_text::dxf_text(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_arc.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_arc.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_arc.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_arc.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_arc.h"
dxf_base_arc::dxf_base_arc(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_circle.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_circle.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_circle.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_circle.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_circle.h"
dxf_base_circle::dxf_base_circle(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_ellipse.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_ellipse.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_ellipse.h"
dxf_base_ellipse::dxf_base_ellipse(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_input.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_input.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_input.h"
dxf_base_input::dxf_base_input(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_line.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_line.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_line.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_line.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_line.h"
dxf_base_line::dxf_base_line(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_polyline.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_polyline.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_polyline.h"
dxf_base_polyline::dxf_base_polyline(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_rectangel.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_rectangel.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_rectangel.h"
dxf_base_rectangel::dxf_base_rectangel(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_terminal.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_terminal.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_terminal.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_terminal.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_terminal.h"
dxf_base_terminal::dxf_base_terminal(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_base_types/dxf_base_text.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_base_text.h"
+#include "dxftoqet2/src/dxf_base_types/dxf_base_text.h"
dxf_base_text::dxf_base_text(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_layer_control.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_layer_control.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_layer_control.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_layer_control.h"
+#include "dxftoqet2/src/dxf_control/dxf_layer_control.h"
extern struct DXF_base DXF_main_base[1];
extern struct DXF_table_layer DXF_input_table_layer[100];
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_ltype_control.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_ltype_control.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_ltype_control.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_ltype_control.h"
+#include "dxftoqet2/src/dxf_control/dxf_ltype_control.h"
DXF_Ltype_control::DXF_Ltype_control(QWidget *parent) :
QMainWindow(parent)
@@ -7,152 +7,152 @@
}
-QString DXF_Ltype_control::Ltype_control()
+QString DXF_Ltype_control::dxf2_Ltype_control()
{
- LTfound="normal";
+ dxf_LTfound="normal";
- if (FindLT == "" )
+ if (dxf_FindLT == "" )
{
DXF_layer_control db_layer_control;
- db_layer_control.layer_to_find=Layer;
+ db_layer_control.layer_to_find=dxf_Layer;
DXF_Ltype_control db_ltype;
- db_ltype.FindLT=db_layer_control.dxf_layer_ltype();
+ db_ltype.dxf_FindLT=db_layer_control.dxf_layer_ltype();
- LTfound=db_ltype.Ltype_control();
+ dxf_LTfound=db_ltype.dxf2_Ltype_control();
}
- if (FindLT == "ByLayer" )
+ if (dxf_FindLT == "ByLayer" )
{
DXF_layer_control db_layer_control;
- db_layer_control.layer_to_find=Layer;
+ db_layer_control.layer_to_find=dxf_Layer;
DXF_Ltype_control db_ltype;
- db_ltype.FindLT=db_layer_control.dxf_layer_ltype();
+ db_ltype.dxf_FindLT=db_layer_control.dxf_layer_ltype();
- LTfound=db_ltype.Ltype_control();
+ dxf_LTfound=db_ltype.dxf2_Ltype_control();
}
- if (FindLT == "ByBlock" )
+ if (dxf_FindLT == "ByBlock" )
{
- LTfound="normal";
+ dxf_LTfound="normal";
}
- if (FindLT == "Continuous" )
+ if (dxf_FindLT == "Continuous" )
{
- LTfound="normal";
+ dxf_LTfound="normal";
}
- if (FindLT == "CONTINUOUS" )
+ if (dxf_FindLT == "CONTINUOUS" )
{
- LTfound="normal";
+ dxf_LTfound="normal";
}
- if (FindLT == "Center" )
+ if (dxf_FindLT == "Center" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "CENTER" )
+ if (dxf_FindLT == "CENTER" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "CENTER2" )
+ if (dxf_FindLT == "CENTER2" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "CENTERX2" )
+ if (dxf_FindLT == "CENTERX2" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "Dashed" )
+ if (dxf_FindLT == "Dashed" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "DASHED" )
+ if (dxf_FindLT == "DASHED" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "DASHED2" )
+ if (dxf_FindLT == "DASHED2" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "DASHEDX2" )
+ if (dxf_FindLT == "DASHEDX2" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "HIDDEN" )
+ if (dxf_FindLT == "HIDDEN" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "HIDDEN2" )
+ if (dxf_FindLT == "HIDDEN2" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "HIDDENX2" )
+ if (dxf_FindLT == "HIDDENX2" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "EPL_DASH" )
+ if (dxf_FindLT == "EPL_DASH" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "EPL_DASH2" )
+ if (dxf_FindLT == "EPL_DASH2" )
{
- LTfound="dashed";
+ dxf_LTfound="dashed";
}
- if (FindLT == "EPL_DASHDOT" )
+ if (dxf_FindLT == "EPL_DASHDOT" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "EPL_DASHDOTDOT" )
+ if (dxf_FindLT == "EPL_DASHDOTDOT" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "DASHDOT" )
+ if (dxf_FindLT == "DASHDOT" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "DASHDOT2" )
+ if (dxf_FindLT == "DASHDOT2" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "DASHDOTX2" )
+ if (dxf_FindLT == "DASHDOTX2" )
{
- LTfound="dashdotted";
+ dxf_LTfound="dashdotted";
}
- if (FindLT == "normal" )
+ if (dxf_FindLT == "normal" )
{
- LTfound="normal";
+ dxf_LTfound="normal";
}
- return LTfound;
+ return dxf_LTfound;
}
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_ltype_control.h
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_ltype_control.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_ltype_control.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -10,11 +10,11 @@
public:
explicit DXF_Ltype_control(QWidget *parent = 0);
- QString LTfound;
- QString FindLT;
- QString Layer;
+ QString dxf_LTfound;
+ QString dxf_FindLT;
+ QString dxf_Layer;
- QString Ltype_control();
+ QString dxf2_Ltype_control();
signals:
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_text_control.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_text_control.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_control/dxf_text_control.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_text_control.h"
+#include "dxftoqet2/src/dxf_control/dxf_text_control.h"
DXF_Text_control::DXF_Text_control(QWidget *parent) :
QMainWindow(parent)
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_data.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_data.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_data.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_data.h"
+#include "dxftoqet2/src/dxf_data.h"
dxf_data::dxf_data()
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_load.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_load.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_load.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_load.h"
+#include "dxftoqet2/src/dxf_load.h"
//init extern variable
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_load.h
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_load.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_load.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -5,7 +5,7 @@
#include <QMainWindow>
#include <QtWidgets>
#include "dxftoqet2/src/dxf_data.h"
-#include "dxftoqet_mainwindow.h"
+#include "dxftoqet2/dxftoqet_mainwindow.h"
#include "ui_dxftoqet_mainwindow.h"
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_split.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_split.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_split.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "dxf_split.h"
+#include "dxftoqet2/src/dxf_split.h"
//extern int dxf ();
//extern const int Max_Blocks=500;
Modified: branches/Qetdxf/sources/dxftoqet2/src/dxf_split.h
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/dxf_split.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/dxf_split.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -3,8 +3,8 @@
#include <QObject>
#include <QMainWindow>
-#include "dxf_data.h"
-#include "dxftoqet_mainwindow.h"
+#include "dxftoqet2/src/dxf_data.h"
+#include "dxftoqet2/dxftoqet_mainwindow.h"
#include <QtWidgets>
#include "ui_dxftoqet_mainwindow.h"
Modified: branches/Qetdxf/sources/dxftoqet2/src/qet_base_types/baseelmt.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/qet_base_types/baseelmt.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/qet_base_types/baseelmt.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "baseelmt.h"
+#include "dxftoqet2/src/qet_base_types/baseelmt.h"
extern struct DXF_base DXF_main_base[1];
Modified: branches/Qetdxf/sources/dxftoqet2/src/split_csv.cpp
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/split_csv.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/split_csv.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -1,4 +1,4 @@
-#include "split_csv.h"
+#include "dxftoqet2/src/split_csv.h"
//extern int dxf ();
Modified: branches/Qetdxf/sources/dxftoqet2/src/split_csv.h
===================================================================
--- branches/Qetdxf/sources/dxftoqet2/src/split_csv.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/dxftoqet2/src/split_csv.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -2,10 +2,10 @@
#define SPLIT_CSV_H
-#include "dxf_data.h"
+#include "dxftoqet2/src/dxf_data.h"
#include <QObject>
#include <QMainWindow>
-#include "dxftoqet_mainwindow.h"
+#include "dxftoqet2/dxftoqet_mainwindow.h"
#include <QtWidgets>
#include "ui_dxftoqet_mainwindow.h"
Modified: branches/Qetdxf/sources/properties/xrefproperties.h
===================================================================
--- branches/Qetdxf/sources/properties/xrefproperties.h 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/properties/xrefproperties.h 2016-01-16 23:24:04 UTC (rev 4326)
@@ -18,7 +18,7 @@
#ifndef XREFPROPERTIES_H
#define XREFPROPERTIES_H
-#include "propertiesinterface.h"
+#include "properties/propertiesinterface.h"
#include <QStringList>
/**
Modified: branches/Qetdxf/sources/qetdiagrameditor.cpp
===================================================================
--- branches/Qetdxf/sources/qetdiagrameditor.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/qetdiagrameditor.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -35,7 +35,7 @@
#include "nomenclature.h"
#include "diagramfoliolist.h"
#include "qetshapeitem.h"
-#include "reportproperties.h"
+#include "properties/reportproperties.h"
#include "diagrampropertieseditordockwidget.h"
#include "diagrameventaddshape.h"
#include "diagrameventaddimage.h"
@@ -50,6 +50,7 @@
#include "elementscollectionmodel.h"
+
/**
* @brief QETDiagramEditor::QETDiagramEditor
* Constructor
Modified: branches/Qetdxf/sources/qetproject.cpp
===================================================================
--- branches/Qetdxf/sources/qetproject.cpp 2016-01-16 14:25:20 UTC (rev 4325)
+++ branches/Qetdxf/sources/qetproject.cpp 2016-01-16 23:24:04 UTC (rev 4326)
@@ -30,7 +30,7 @@
#include "titleblocktemplate.h"
#include "ui/dialogwaiting.h"
#include "numerotationcontext.h"
-#include "reportproperties.h"
+#include "properties/reportproperties.h"
#include "integrationmovetemplateshandler.h"
#include "xmlelementcollection.h"