kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-23 10:30:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,404 Commits 32 Branches 43 Tags
32a90493bdae18471c68b4f03c15b58cbb743a93
Commit Graph

580 Commits

Author SHA1 Message Date
Simon De Backer
32a90493bd TEST a Merge branch 'XMLProperties' 
it gets built let's test it for bugs

 Conflicts:
	sources/ElementsCollection/fileelementcollectionitem.cpp
	sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
	sources/borderproperties.cpp
	sources/conductorproperties.cpp
	sources/conductorproperties.h
	sources/diagram.cpp
	sources/diagram.h
	sources/diagramprintdialog.cpp
	sources/diagramprintdialog.h
	sources/editor/graphicspart/customelementgraphicpart.cpp
	sources/editor/graphicspart/partarc.cpp
	sources/editor/graphicspart/partdynamictextfield.cpp
	sources/editor/graphicspart/partdynamictextfield.h
	sources/editor/graphicspart/partellipse.cpp
	sources/editor/graphicspart/partline.cpp
	sources/editor/graphicspart/partpolygon.cpp
	sources/editor/graphicspart/partrectangle.cpp
	sources/editor/graphicspart/partterminal.cpp
	sources/editor/graphicspart/partterminal.h
	sources/editor/graphicspart/parttext.cpp
	sources/properties/propertiesinterface.cpp
	sources/properties/propertiesinterface.h
	sources/properties/terminaldata.cpp
	sources/properties/terminaldata.h
	sources/properties/xrefproperties.cpp
	sources/properties/xrefproperties.h
	sources/qetgraphicsitem/conductor.cpp
	sources/qetgraphicsitem/conductor.h
	sources/qetgraphicsitem/conductortextitem.h
	sources/qetgraphicsitem/dynamicelementtextitem.h
	sources/qetgraphicsitem/element.cpp
	sources/qetgraphicsitem/element.h
	sources/qetgraphicsitem/elementtextitemgroup.h
	sources/qetgraphicsitem/slaveelement.cpp
	sources/qetgraphicsitem/slaveelement.h
	sources/qetgraphicsitem/terminal.cpp
	sources/qetgraphicsitem/terminal.h
	sources/qetproject.cpp
	sources/titleblockproperties.cpp
 2020-10-13 22:31:58 +02:00
Martin Marmsoler
f79b1a52bb WIP 2020-10-11 11:05:22 +02:00
Martin Marmsoler
3509a1c7a5 add comments and move some initializations from the source file to the header file 2020-10-10 15:50:04 +02:00
Martin Marmsoler
0dfe0c1613 let conductor textitem export to xml, because the read is also made from it 2020-10-10 12:25:58 +02:00
Martin Marmsoler
f18e6bd50f remove default parameter, because it leads only to confusion and errors 2020-10-10 12:02:38 +02:00
Claveau Joshua
b45c6b453e Minor fix : QetGraphicsTableItem keep his size when model is reseted or when open from xml. 2020-10-10 11:18:21 +02:00
Martin Marmsoler
0cc6558281 Fix issue that conductors where connected wrong. This was, because instead of reusing the id's stored in the Terminal, new id's where created 2020-10-08 19:05:30 +02:00
Martin Marmsoler
52f886e34b add comment 2020-10-08 18:39:11 +02:00
Martin Marmsoler
a1cf3711a1 Fix issues 2020-10-07 08:05:01 +02:00
Martin Marmsoler
b958848194 Update conductorproperties.cpp and conductor.cpp 2020-10-06 21:40:48 +02:00
Martin Marmsoler
8ef8a71680 add comment 2020-10-05 21:54:26 +02:00
Martin Marmsoler
8829974852 add comment 2020-10-04 09:34:34 +02:00
Martin Marmsoler
871a2642f4 use m_pos as value to store 2020-10-04 09:34:25 +02:00
Martin Marmsoler
f3368f159d Fix problem that not all childs were added to the xml document 2020-10-03 20:50:08 +02:00
Simon De Backer
8a5ba90d01 QT6: std::min needs further tweaking 2020-10-03 16:00:24 +02:00
Simon De Backer
0ab1b322d6 QT6: QStyleOptionGraphicsItem 2020-10-03 15:56:11 +02:00
Simon De Backer
937a6d740b QT6: QStyleOptionGraphicsItem 2020-10-03 15:54:02 +02:00
Simon De Backer
c1e93fc442 QT6: QStyleOptionGraphicsItem 2020-10-03 15:48:40 +02:00
Claveau Joshua
e0201a8027 Remove old Backward compatibility: prior to version 0.3 2020-10-02 17:39:07 +02:00
Martin Marmsoler
9521a8aa0b WIP 2020-10-02 15:49:35 +02:00
Martin Marmsoler
c8691b243b if no uuid for the terminal is available, use write the id of the terminal to the xml file, otherwise no connection can be done after saving 2020-10-02 14:58:33 +02:00
Martin Marmsoler
a92683f3fa add comment 2020-10-01 16:51:17 +02:00
Martin Marmsoler
9e54137224 add explanation 2020-10-01 16:39:12 +02:00
Martin Marmsoler
91a56799a7 Solves problem that terminals are not placed at the correct place 2020-10-01 16:31:15 +02:00
Martin Marmsoler
10e767c3e0 add comments 2020-10-01 16:28:48 +02:00
Martin Marmsoler
27a63bbf2b WIP 2020-10-01 14:38:08 +02:00
Martin Marmsoler
adc28d32b9 revert saving title block properties in it's own child, because it makes more sense directly in the diagram 2020-09-28 16:29:09 +02:00
Martin Marmsoler
48cce42cfe fix wrong position of segments when loading file. This was, because not the segment property is asked, but the parent and this will not work 
additionally support legacy orientation
 2020-09-28 15:42:57 +02:00
Simon De Backer
36dbe65457 Add TODO compile var + Fix doxygen issue 
You can make your code warn on compile time for the TODO's
In order to do so, uncomment the following line. in pro file
DEFINES += TODO_LIST
 2020-09-24 17:01:33 +02:00
David Varley
6a47fcddc9 Merge branch 'dxf' 2020-09-23 07:50:42 +10:00
David Varley
2d6bef71ae DXF - Add some color 2020-09-22 19:41:47 +10:00
Simon De Backer
2a69e540d6 Fix Qt 6 definition of macro ‘Q_DECLARE_MOVABLE_CONTAINER’ 
adding #include <QHash>

+ code fail to compile if it uses deprecated APIs.
=> see .pro file
 2020-09-21 21:19:50 +02:00
Martin Marmsoler
6080a7b9c9 WIP 2020-09-14 21:21:32 +02:00
David Varley
6b1d51bab8 DXF - Add Polylines, use for conductors and rectangles 2020-09-11 11:22:08 +10:00
David Varley
046d7c6b59 DXF - Add terminals to plot (optional) 2020-09-10 18:35:22 +10:00
David Varley
713d467fe4 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-09-08 22:10:31 +10:00
David Varley
cc8d0da0ac DXF - Fix conductor number positioning, add junction dots 2020-09-08 21:44:58 +10:00
Simon De Backer
5d92393ee7 Wrap code for better readability 2020-09-07 22:03:40 +02:00
Simon De Backer
8ee38fab9e Fix Coding convention 
Please download and use
https://qelectrotech.org/wiki_new/_media/doc/qtcreator-qet-style.xml
when you write code in Qt
 2020-09-07 21:41:45 +02:00
David Varley
babf3d2cf2 Merge branch 'master' of ssh://git.tuxfamily.org/gitroot/qet/qet 2020-09-07 22:14:07 +10:00
David Varley
68b4705630 Tidy up som comments 2020-09-07 16:27:59 +10:00
David Varley
d062175da7 Add tables to dxf export 2020-09-07 16:16:33 +10:00
Simon De Backer
610a44c7cd Removed some Q_UNUSED 2020-09-04 23:19:59 +02:00
Martin Marmsoler
c5f1705745 go on with the work 2020-08-25 20:14:38 +02:00
Simon De Backer
331918d143 Wrap code for better readability 2020-08-20 21:58:23 +02:00
Simon De Backer
0c00d83b27 Fix some doxygen issues 2020-08-20 21:57:35 +02:00
Simon De Backer
88686b3cbf Wrap code for better readability 2020-08-20 17:45:24 +02:00
Simon De Backer
d1c91a7fc2 Fix some doxygen issues 2020-08-20 17:44:59 +02:00
Simon De Backer
cdb2e7b523 Wrap code for better readability 2020-08-19 21:27:14 +02:00
Simon De Backer
666f20856e Fix some doxygen issues 2020-08-19 21:26:36 +02:00