66 Commits

Author SHA1 Message Date
blacksun
a7917bb5bb Remove the class element text item.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5276 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-25 14:33:49 +00:00
blacksun
cbfd8fbc59 Fix compil fail, forget an include
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5261 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-11 13:10:49 +00:00
blacksun
275f20fa61 Element editor : dynamic text field can be set with element info as source of text.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5260 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-11 12:59:53 +00:00
scorpio810
9af3b48f70 Add Gabberworld patch for fix bug N°153, thanks
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5257 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-08 23:45:08 +00:00
blacksun
eb8294cdbd Fix bug N°153
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5250 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-03-01 18:45:40 +00:00
blacksun
d85e395b46 Element text item with are now converted to dynamic element text item.
From now, the class ElementTextItem is not anymore use in qet. Every texts in a diagram are DynamicElementTextItem.
the Xref item was adapted to dynamic text.
Previously, the comment and location, displayed as a "static text" below the "old text" tagged "label" are now automaticaly converted to DynamicElementTextItem, so visually, these texts stay unchanged 


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5216 bfdf4180-ca20-0410-9c96-a3a8aa849046
2018-01-19 12:17:20 +00:00
blacksun
7e2134e0db When parse the defintion of an element in the diagram editor, befor parse anything, we get every DomElement with tagg "input".
If no one of these "input" have the attribute "tagg" set to "label", we set it to the first "input"  


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5084 bfdf4180-ca20-0410-9c96-a3a8aa849046
2017-10-21 12:05:57 +00:00
blacksun
02fb84caec Diagram editor :
1° When user drag and drop an element with text item (tagg input in the xml), the text item are converted to a dynamic text item.
2° When open an existing project, every texts item of elements in the project are converted to dynamic text field.

Note that the changes described upper don't work for the texts which have a tagg (for the moment)


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5083 bfdf4180-ca20-0410-9c96-a3a8aa849046
2017-10-19 09:10:23 +00:00
blacksun
bb39413992 Element editor : element informations (manufacturer, reference etc...) can be created directly from the element editor. For that go to the widget "Element Property"
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5057 bfdf4180-ca20-0410-9c96-a3a8aa849046
2017-10-01 15:25:34 +00:00
blacksun
aa5241896c Element editor : dynamic text item can be added directly from the element editor (WIP)
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5046 bfdf4180-ca20-0410-9c96-a3a8aa849046
2017-09-25 17:44:02 +00:00
scorpio810
9f9b127c04 Modernize-use-nullptr refactors code
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5008 bfdf4180-ca20-0410-9c96-a3a8aa849046
2017-08-05 02:06:59 +00:00
scorpio810
41659fa6fd Revert r4900
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4902 bfdf4180-ca20-0410-9c96-a3a8aa849046
2017-02-05 16:18:50 +00:00
scorpio810
6422dd096f Replace foreach function by for, please try and report problem
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4900 bfdf4180-ca20-0410-9c96-a3a8aa849046
2017-02-04 21:43:23 +00:00
scorpio810
54c85db29c Minor update Copyright year
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4860 bfdf4180-ca20-0410-9c96-a3a8aa849046
2017-01-20 10:55:49 +00:00
blacksun
ae2afe8424 Element : edit an element text item (with tagg) directly on the folio, also update the information of the element.
For exemple, edit the element text item tagged "label", update the value with key "label" of element information. 


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4804 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-12-08 16:54:41 +00:00
blacksun
c811b02516 Element now use the pattern and variable of formula to create the label, both stored in diagram context (instead of the label with a pattern and formula, to create the final label)
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4795 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-12-01 09:09:50 +00:00
blacksun
489f2c2035 Move code use to find prefix of element from element class, to autonum namespace
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4793 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-11-26 19:30:59 +00:00
dfochi
8e620365e3 Fix user created element crash when parsing label
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4701 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-09-12 17:11:06 +00:00
scorpio810
9ecc97a2e4 Minor : added for Autonum formula, terminal element located alsoin user
collection


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4696 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-09-08 01:55:44 +00:00
scorpio810
964ba94109 Add Autonum for terminals element
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4683 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-09-03 18:22:14 +00:00
dfochi
47b0fd7f10 Updated qet_labels xml. Element formula now works with all elements types (logic, hydraulic, pneumatic and energy)
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4679 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-08-31 19:58:58 +00:00
dfochi
230700f845 Conductor Autonum now works with variables. Folio Autonumberings added to conductor autonum
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4674 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-08-29 15:37:42 +00:00
dfochi
6355611947 Copy/Paste now works with Element Label Variables
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4599 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-31 01:30:42 +00:00
blacksun
bb992f3868 Don't clear the texts of pasted elements.
For report element, clear the function and tension-protocol texts


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4598 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-30 13:36:24 +00:00
dfochi
52e33787a8 Fix Element Label when opening older QET versions. Fix old user created element label's handling on newer QET versions
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4591 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-25 19:18:26 +00:00
dfochi
138505a14e Fix Terminal Crash and corrected Terminal prefix behavior.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4590 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-25 14:17:54 +00:00
dfochi
cd3723920e Allow blank selection in Auto Numbering Dock
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4580 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-18 15:23:30 +00:00
dfochi
ec67d8c408 Minor: %prefix is not hardcoded anymore. Zoom in and out with Ctrl + and Ctrl -
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4574 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-13 21:25:29 +00:00
dfochi
f8a829d328 Element Autonumbering now has sequential variables and selectautonum widget. Renamed autonumbering variables.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4569 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-10 01:33:49 +00:00
dfochi
ac02375976 Element Auto Numbering now works for all languages.
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4565 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-06 15:19:44 +00:00
dfochi
d17ef77cc2 Hard code fix for preventing element autonumbering crashing QElectro until correction. Minor: assign project variables to element label
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4564 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-06 14:46:53 +00:00
dfochi
522759e8b3 Element autonumbering. New tab inside autonumbering menu to assign formulas to element label. XML containing elements labels according ISO/IEC 81346 (./elements/10_electric/qet_labels.xml
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4563 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-07-05 20:14:14 +00:00
blacksun
af682ba76d Remove unused classes
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4533 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-05-28 12:59:01 +00:00
dfochi
86244e35f0 Nomenclature export(all fields exported to csv) and Comment field(displayed on editor) handle position and folio variables
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4521 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-05-25 14:49:33 +00:00
dfochi
b94e3740ba Added position and folios variables handling to Elements (Master, Slave and Simple) Label
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4514 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-05-24 18:21:52 +00:00
scorpio810
1e221bd59d Memory Leak Fix, thanks Mehdi
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4486 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-05-16 08:17:22 +00:00
scorpio810
025fa64f67 Minor : update Copyright date
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4481 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-05-13 17:40:36 +00:00
blacksun
95e309ff18 Minor improvement and remove some use of ElementsCollectionItem and ElementsDefinition
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4407 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-03-29 17:23:58 +00:00
blacksun
1170522d9c Remove elementLocation and use elementsLocation instead
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4377 bfdf4180-ca20-0410-9c96-a3a8aa849046
2016-03-15 15:23:11 +00:00
blacksun
313e4b9793 New element panel can display the thumbnail of elements used in a project
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4293 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-12-30 09:39:22 +00:00
blacksun
5019919de0 Remove all #if QT_VERSION who compare Qt version smaller than 5
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4100 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-08-11 08:46:49 +00:00
scorpio810
633abaa7bf Add ability to have an empty outline for hatching
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3970 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-05-13 12:48:31 +00:00
scorpio810
933cb94a3c Add texture pattern to element part
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3969 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-05-13 06:31:16 +00:00
scorpio810
01be436e51 Add others colors for element part
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3963 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-05-12 14:49:41 +00:00
scorpio810
c164d105f5 Add brun and yellow colors for element part
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3952 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-05-11 12:45:08 +00:00
scorpio810
741248ce9f Add grey color for element part
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3951 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-05-11 11:06:58 +00:00
scorpio810
81c684ca49 Merge Qt5 branch sources folder to trunk
-Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    sources/aboutqet.cpp
M    sources/bordertitleblock.cpp
M    sources/conductorproperties.h
M    sources/configdialog.cpp
M    sources/configpages.cpp
M    sources/configpages.h
M    sources/createdxf.h
M    sources/diagram.cpp
M    sources/diagram.h
M    sources/diagramcommands.cpp
M    sources/diagramcommands.h
M    sources/diagramprintdialog.cpp
M    sources/diagramprintdialog.h
M    sources/diagramschooser.cpp
M    sources/diagramschooser.h
M    sources/diagramview.cpp
M    sources/diagramview.h
M    sources/dvevent/dveventaddimage.cpp
M    sources/dvevent/dveventaddshape.cpp
M    sources/editor/arceditor.cpp
M    sources/editor/arceditor.h
M    sources/editor/editorcommands.cpp
M    sources/editor/editorcommands.h
M    sources/editor/elementitemeditor.h
M    sources/editor/elementprimitivedecorator.cpp
M    sources/editor/elementscene.cpp
M    sources/editor/elementscene.h
M    sources/editor/elementview.cpp
M    sources/editor/ellipseeditor.cpp
M    sources/editor/ellipseeditor.h
M    sources/editor/esevent/eseventaddtext.cpp
M    sources/editor/esevent/eseventaddtextfield.cpp
M    sources/editor/esevent/eseventinterface.cpp
M    sources/editor/graphicspart/customelementpart.h
M    sources/editor/graphicspart/parttext.cpp
M    sources/editor/graphicspart/parttext.h
M    sources/editor/graphicspart/parttextfield.cpp
M    sources/editor/graphicspart/parttextfield.h
M    sources/editor/lineeditor.cpp
M    sources/editor/lineeditor.h
M    sources/editor/polygoneditor.cpp
M    sources/editor/qetelementeditor.cpp
M    sources/editor/qetelementeditor.h
M    sources/editor/rectangleeditor.cpp
M    sources/editor/rectangleeditor.h
M    sources/editor/styleeditor.cpp
M    sources/editor/styleeditor.h
M    sources/editor/terminaleditor.cpp
M    sources/editor/terminaleditor.h
M    sources/editor/texteditor.cpp
M    sources/editor/texteditor.h
M    sources/editor/textfieldeditor.cpp
M    sources/editor/textfieldeditor.h
M    sources/editor/ui/elementpropertieseditorwidget.cpp
M    sources/elementdefinition.cpp
M    sources/elementdeleter.cpp
M    sources/elementdeleter.h
M    sources/elementdialog.cpp
M    sources/elementscategorieslist.h
M    sources/elementscategorieswidget.cpp
M    sources/elementscategorieswidget.h
M    sources/elementscategory.cpp
M    sources/elementscategorydeleter.cpp
M    sources/elementscategorydeleter.h
M    sources/elementscategoryeditor.cpp
M    sources/elementscategoryeditor.h
M    sources/elementscollection.cpp
M    sources/elementscollectioncache.cpp
M    sources/elementspanel.cpp
M    sources/elementspanel.h
M    sources/elementspanelwidget.cpp
M    sources/elementspanelwidget.h
M    sources/elementtextsmover.h
M    sources/exportdialog.cpp
M    sources/exportdialog.h
M    sources/exportproperties.cpp
M    sources/exportpropertieswidget.cpp
M    sources/exportpropertieswidget.h
M    sources/genericpanel.cpp
M    sources/integrationmoveelementshandler.cpp
M    sources/integrationmoveelementshandler.h
M    sources/interactivemoveelementshandler.cpp
M    sources/nameslistwidget.cpp
M    sources/nameslistwidget.h
M    sources/newelementwizard.cpp
M    sources/newelementwizard.h
M    sources/nomenclature.cpp
M    sources/nomenclature.h
M    sources/projectconfigpages.cpp
M    sources/projectview.cpp
M    sources/projectview.h
M    sources/qet.cpp
M    sources/qetapp.cpp
M    sources/qetapp.h
M    sources/qetdiagrameditor.cpp
M    sources/qetdiagrameditor.h
M    sources/qetgraphicsitem/conductor.cpp
M    sources/qetgraphicsitem/conductortextitem.cpp
M    sources/qetgraphicsitem/customelement.cpp
M    sources/qetgraphicsitem/diagramimageitem.cpp
M    sources/qetgraphicsitem/diagramtextitem.cpp
M    sources/qetgraphicsitem/diagramtextitem.h
M    sources/qetgraphicsitem/element.cpp
M    sources/qetgraphicsitem/ghostelement.cpp
M    sources/qetgraphicsitem/qetshapeitem.cpp
M    sources/qetgraphicsitem/terminal.cpp
M    sources/qetgraphicsitem/terminal.h
M    sources/qeticons.cpp
M    sources/qeticons.h
M    sources/qetmainwindow.cpp
M    sources/qetmessagebox.cpp
M    sources/qetmessagebox.h
M    sources/qetprintpreviewdialog.cpp
M    sources/qetprintpreviewdialog.h
M    sources/qetproject.cpp
M    sources/qetsingleapplication.cpp
M    sources/qettabbar.h
M    sources/qfilenameedit.cpp
M    sources/qtextorientationspinboxwidget.cpp
M    sources/qtextorientationspinboxwidget.h
M    sources/qtextorientationwidget.cpp
M    sources/qtextorientationwidget.h
M    sources/richtext/richtexteditor.cpp
M    sources/richtext/richtexteditor_p.h
M    sources/richtext/ui_addlinkdialog.h
M    sources/titleblock/dimensionwidget.h
M    sources/titleblock/gridlayoutanimation.h
M    sources/titleblock/helpercell.h
M    sources/titleblock/integrationmovetemplateshandler.cpp
M    sources/titleblock/integrationmovetemplateshandler.h
M    sources/titleblock/qettemplateeditor.cpp
M    sources/titleblock/qettemplateeditor.h
M    sources/titleblock/templatecellsset.h
M    sources/titleblock/templatecellwidget.cpp
M    sources/titleblock/templatecellwidget.h
M    sources/titleblock/templatecommands.cpp
M    sources/titleblock/templatedeleter.cpp
M    sources/titleblock/templatedeleter.h
M    sources/titleblock/templatelocationchooser.cpp
M    sources/titleblock/templatelocationchooser.h
M    sources/titleblock/templatelocationsaver.cpp
M    sources/titleblock/templatelocationsaver.h
M    sources/titleblock/templatelogomanager.cpp
M    sources/titleblock/templatelogomanager.h
M    sources/titleblock/templateview.cpp
M    sources/titleblock/templatevisualcell.h
M    sources/titleblockcell.cpp
M    sources/titleblocktemplate.cpp
M    sources/treecoloranimation.h
M    sources/ui/conductorpropertieswidget.cpp
M    sources/ui/diagrampropertiesdialog.cpp
M    sources/ui/diagramselection.cpp
M    sources/ui/dialogautonum.cpp
M    sources/ui/dialogwaiting.cpp
M    sources/ui/elementpropertieswidget.cpp
M    sources/ui/elementselectorwidget.cpp
M    sources/ui/linksingleelementwidget.cpp
M    sources/ui/masterpropertieswidget.cpp
M    sources/ui/potentialtextsdialog.cpp
M    sources/ui/projectpropertiesdialog.cpp
M    sources/ui/selectautonumw.cpp
M    sources/ui/titleblockpropertieswidget.cpp
M    sources/ui/xrefpropertieswidget.cpp
M    sources/undocommand/changeelementinformationcommand.cpp


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3783 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-03-02 20:14:56 +00:00
scorpio810
eaff56b669 Update copyright date
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3734 bfdf4180-ca20-0410-9c96-a3a8aa849046
2015-02-20 14:56:22 +00:00
blacksun
2c4af2b128 Remove all information about internal connection in element (obselete since internal connection is always allowed)
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3568 bfdf4180-ca20-0410-9c96-a3a8aa849046
2014-12-23 19:00:37 +00:00
blacksun
5e935a976e Minor change according to the evolution of Qt class (remove QGraphicsScene from constructor of QGraphicsItem).
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3547 bfdf4180-ca20-0410-9c96-a3a8aa849046
2014-12-14 13:06:21 +00:00