diff --git a/SingleApplication/singleapplication.cpp b/SingleApplication/singleapplication.cpp
index ebf6f38b2..66327b952 100644
--- a/SingleApplication/singleapplication.cpp
+++ b/SingleApplication/singleapplication.cpp
@@ -34,12 +34,12 @@
#include "singleapplication_p.h"
/**
- * @brief Constructor. Checks and fires up LocalServer or closes the program
- * if another instance already exists
- * @param argc
- * @param argv
- * @param {bool} allowSecondaryInstances
- */
+ @brief Constructor. Checks and fires up LocalServer or closes the program
+ if another instance already exists
+ @param argc
+ @param argv
+ @param {bool} allowSecondaryInstances
+*/
SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout )
: app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
{
@@ -142,8 +142,8 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
}
/**
- * @brief Destructor
- */
+ @brief Destructor
+*/
SingleApplication::~SingleApplication()
{
Q_D(SingleApplication);
diff --git a/SingleApplication/singleapplication.h b/SingleApplication/singleapplication.h
index 2528daed5..5a9ab8318 100644
--- a/SingleApplication/singleapplication.h
+++ b/SingleApplication/singleapplication.h
@@ -36,10 +36,10 @@
class SingleApplicationPrivate;
/**
- * @brief The SingleApplication class handles multiple instances of the same
- * Application
- * @see QCoreApplication
- */
+ @brief The SingleApplication class handles multiple instances of the same
+ Application
+ @see QCoreApplication
+*/
class SingleApplication : public QAPPLICATION_CLASS
{
Q_OBJECT
@@ -48,15 +48,15 @@ class SingleApplication : public QAPPLICATION_CLASS
public:
/**
- * @brief Mode of operation of SingleApplication.
- * Whether the block should be user-wide or system-wide and whether the
- * primary instance should be notified when a secondary instance had been
- * started.
- * @note Operating system can restrict the shared memory blocks to the same
- * user, in which case the User/System modes will have no effect and the
- * block will be user wide.
- * @enum
- */
+ @brief Mode of operation of SingleApplication.
+ Whether the block should be user-wide or system-wide and whether the
+ primary instance should be notified when a secondary instance had been
+ started.
+ @note Operating system can restrict the shared memory blocks to the same
+ user, in which case the User/System modes will have no effect and the
+ block will be user wide.
+ @enum
+ */
enum Mode {
User = 1 << 0,
System = 1 << 1,
@@ -67,59 +67,59 @@ class SingleApplication : public QAPPLICATION_CLASS
Q_DECLARE_FLAGS(Options, Mode)
/**
- * @brief Intitializes a SingleApplication instance with argc command line
- * arguments in argv
- * @arg {int &} argc - Number of arguments in argv
- * @arg {const char *[]} argv - Supplied command line arguments
- * @arg {bool} allowSecondary - Whether to start the instance as secondary
- * if there is already a primary instance.
- * @arg {Mode} mode - Whether for the SingleApplication block to be applied
- * User wide or System wide.
- * @arg {int} timeout - Timeout to wait in milliseconds.
- * @note argc and argv may be changed as Qt removes arguments that it
- * recognizes
- * @note Mode::SecondaryNotification only works if set on both the primary
- * instance and the secondary instance.
- * @note The timeout is just a hint for the maximum time of blocking
- * operations. It does not guarantee that the SingleApplication
- * initialisation will be completed in given time, though is a good hint.
- * Usually 4*timeout would be the worst case (fail) scenario.
- * @see See the corresponding QAPPLICATION_CLASS constructor for reference
- */
+ @brief Intitializes a SingleApplication instance with argc command line
+ arguments in argv
+ @arg {int &} argc - Number of arguments in argv
+ @arg {const char *[]} argv - Supplied command line arguments
+ @arg {bool} allowSecondary - Whether to start the instance as secondary
+ if there is already a primary instance.
+ @arg {Mode} mode - Whether for the SingleApplication block to be applied
+ User wide or System wide.
+ @arg {int} timeout - Timeout to wait in milliseconds.
+ @note argc and argv may be changed as Qt removes arguments that it
+ recognizes
+ @note Mode::SecondaryNotification only works if set on both the primary
+ instance and the secondary instance.
+ @note The timeout is just a hint for the maximum time of blocking
+ operations. It does not guarantee that the SingleApplication
+ initialisation will be completed in given time, though is a good hint.
+ Usually 4*timeout would be the worst case (fail) scenario.
+ @see See the corresponding QAPPLICATION_CLASS constructor for reference
+ */
explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000 );
~SingleApplication();
/**
- * @brief Returns if the instance is the primary instance
- * @returns {bool}
- */
+ @brief Returns if the instance is the primary instance
+ @returns {bool}
+ */
bool isPrimary();
/**
- * @brief Returns if the instance is a secondary instance
- * @returns {bool}
- */
+ @brief Returns if the instance is a secondary instance
+ @returns {bool}
+ */
bool isSecondary();
/**
- * @brief Returns a unique identifier for the current instance
- * @returns {qint32}
- */
+ @brief Returns a unique identifier for the current instance
+ @returns {qint32}
+ */
quint32 instanceId();
/**
- * @brief Returns the process ID (PID) of the primary instance
- * @returns {qint64}
- */
+ @brief Returns the process ID (PID) of the primary instance
+ @returns {qint64}
+ */
qint64 primaryPid();
/**
- * @brief Sends a message to the primary instance. Returns true on success.
- * @param {int} timeout - Timeout for connecting
- * @returns {bool}
- * @note sendMessage() will return false if invoked from the primary
- * instance.
- */
+ @brief Sends a message to the primary instance. Returns true on success.
+ @param {int} timeout - Timeout for connecting
+ @returns {bool}
+ @note sendMessage() will return false if invoked from the primary
+ instance.
+ */
bool sendMessage( QByteArray message, int timeout = 100 );
Q_SIGNALS:
diff --git a/SingleApplication/singleapplication_p.cpp b/SingleApplication/singleapplication_p.cpp
index 539ffeddf..93112bbcf 100644
--- a/SingleApplication/singleapplication_p.cpp
+++ b/SingleApplication/singleapplication_p.cpp
@@ -258,8 +258,8 @@ qint64 SingleApplicationPrivate::primaryPid()
}
/**
- * @brief Executed when a connection has been made to the LocalServer
- */
+ @brief Executed when a connection has been made to the LocalServer
+*/
void SingleApplicationPrivate::slotConnectionEstablished()
{
QLocalSocket *nextConnSocket = server->nextPendingConnection();
diff --git a/elements/10_electric/10_allpole/100_folio_referencing/qet_directory b/elements/10_electric/10_allpole/100_folio_referencing/qet_directory
index 3ed0f3395..e1b451666 100644
--- a/elements/10_electric/10_allpole/100_folio_referencing/qet_directory
+++ b/elements/10_electric/10_allpole/100_folio_referencing/qet_directory
@@ -12,5 +12,6 @@
Referencias
Referenties
Ark henvisninger
+ フォリオ参照
diff --git a/elements/10_electric/10_allpole/110_network_supplies/qet_directory b/elements/10_electric/10_allpole/110_network_supplies/qet_directory
index dd41b1901..acbd2e7b2 100644
--- a/elements/10_electric/10_allpole/110_network_supplies/qet_directory
+++ b/elements/10_electric/10_allpole/110_network_supplies/qet_directory
@@ -11,5 +11,6 @@
Síťové zdroje
Fuentes de red
Netværkskilder
+ 電源網
diff --git a/elements/10_electric/10_allpole/114_connections/qet_directory b/elements/10_electric/10_allpole/114_connections/qet_directory
index 2b93ba959..3a4852ecf 100644
--- a/elements/10_electric/10_allpole/114_connections/qet_directory
+++ b/elements/10_electric/10_allpole/114_connections/qet_directory
@@ -11,5 +11,6 @@
Verbindingen
Conexiones
Forbindelser
+ 接続
diff --git a/elements/10_electric/10_allpole/120_cables&wiring/qet_directory b/elements/10_electric/10_allpole/120_cables&wiring/qet_directory
index 33799af5f..0d85feaea 100644
--- a/elements/10_electric/10_allpole/120_cables&wiring/qet_directory
+++ b/elements/10_electric/10_allpole/120_cables&wiring/qet_directory
@@ -11,5 +11,6 @@
Kabels en draden
Kabely a drátové propojení
Kabler og ledninger
+ ケーブルと配線
diff --git a/elements/10_electric/10_allpole/130_terminals&terminal_strips/qet_directory b/elements/10_electric/10_allpole/130_terminals&terminal_strips/qet_directory
index e172a3467..9e56fa9c2 100644
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/qet_directory
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/qet_directory
@@ -13,5 +13,6 @@
Ακροδέκτες και σειρές ακροδεκτών
Klemmenlijst
Klemmer og klemmerækker
+ 端子と端子台
diff --git a/elements/10_electric/10_allpole/140_connectors&plugs/qet_directory b/elements/10_electric/10_allpole/140_connectors&plugs/qet_directory
index 181e00cf1..22a32a287 100644
--- a/elements/10_electric/10_allpole/140_connectors&plugs/qet_directory
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/qet_directory
@@ -10,5 +10,6 @@
Σύνδεσμοι και πρίζες
Connectoren en stekkers
Stik
+ コネクタとプラグ
diff --git a/elements/10_electric/10_allpole/200_fuses&protective_gears/qet_directory b/elements/10_electric/10_allpole/200_fuses&protective_gears/qet_directory
index 2edeb819f..9e05d2e94 100644
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/qet_directory
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/qet_directory
@@ -11,5 +11,6 @@
Zekeringen en beveiligingen
Tavné pojistky a ochrany
Sikringer og beskyttelsesudstyr
+ ヒューズと保護装置
diff --git a/elements/10_electric/10_allpole/310_relays_contactors&contacts/qet_directory b/elements/10_electric/10_allpole/310_relays_contactors&contacts/qet_directory
index fac4ddc3b..639f007b7 100644
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/qet_directory
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/qet_directory
@@ -11,5 +11,6 @@
Ηλεκτρονόμοι και επαφές
Relé, stykače a kontakty
Relæer, kontaktorer og kontakter
+ 継電器、接触器、接点
diff --git a/elements/10_electric/10_allpole/330_transformers&power_supplies/qet_directory b/elements/10_electric/10_allpole/330_transformers&power_supplies/qet_directory
index 44b83a28d..8fc5f529a 100644
--- a/elements/10_electric/10_allpole/330_transformers&power_supplies/qet_directory
+++ b/elements/10_electric/10_allpole/330_transformers&power_supplies/qet_directory
@@ -11,5 +11,6 @@
Transformatoren en Voedingen
Trasformátory a proudové zdroje
Transformer og strømforsyninger
+ 変圧器と電源
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/qet_directory b/elements/10_electric/10_allpole/340_converters&inverters/qet_directory
index 0dd474601..95b58985e 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/qet_directory
+++ b/elements/10_electric/10_allpole/340_converters&inverters/qet_directory
@@ -10,5 +10,6 @@
Omzetters en Omkeerders
Μετατροπείς και αντιστροφείς
Měniče a plynulé převaděče
+ 変換器とインバータ
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/qet_directory b/elements/10_electric/10_allpole/380_signaling&operating/qet_directory
index 21a009af8..e2ddf38cf 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/qet_directory
+++ b/elements/10_electric/10_allpole/380_signaling&operating/qet_directory
@@ -10,5 +10,6 @@
Signalering en bediening
Σήμανση και χειρισμός
Značení a příkazy
+ 信号と操作
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/qet_directory b/elements/10_electric/10_allpole/390_sensors&instruments/qet_directory
index 3a9763591..bc453fd16 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/qet_directory
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/qet_directory
@@ -10,5 +10,6 @@
Sensoren en instrumenten
Αισθητήρες και όργανα
Čidla a měřiče
+ センサと計器
diff --git a/elements/10_electric/10_allpole/391_consumers&actuators/qet_directory b/elements/10_electric/10_allpole/391_consumers&actuators/qet_directory
index 47f367b73..3110f79a6 100644
--- a/elements/10_electric/10_allpole/391_consumers&actuators/qet_directory
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/qet_directory
@@ -10,5 +10,6 @@
Verbruikers en bewegingen
Καταναλώσεις και ενεργοποιητές
Spotřebitelé a spouštěče
+ 消費装置と作動装置
diff --git a/elements/10_electric/10_allpole/392_generators&sources/qet_directory b/elements/10_electric/10_allpole/392_generators&sources/qet_directory
index d94fee3b9..dea83f5de 100644
--- a/elements/10_electric/10_allpole/392_generators&sources/qet_directory
+++ b/elements/10_electric/10_allpole/392_generators&sources/qet_directory
@@ -10,5 +10,6 @@
Generators and sources
Generadores y fuentes
Générateurs et sources
+ 発電機と電源
diff --git a/elements/10_electric/10_allpole/395_electronics&semiconductors/qet_directory b/elements/10_electric/10_allpole/395_electronics&semiconductors/qet_directory
index 8fdf6b2fa..1ce585bac 100644
--- a/elements/10_electric/10_allpole/395_electronics&semiconductors/qet_directory
+++ b/elements/10_electric/10_allpole/395_electronics&semiconductors/qet_directory
@@ -10,5 +10,6 @@
Electronica en halfgeleiders
Ηλεκτρονικά και ημιαγωγοί
Elektronika a polovodiče
+ 電子と半導体
diff --git a/elements/10_electric/10_allpole/450_high_voltage/qet_directory b/elements/10_electric/10_allpole/450_high_voltage/qet_directory
index e1595a1b3..5571b04f9 100644
--- a/elements/10_electric/10_allpole/450_high_voltage/qet_directory
+++ b/elements/10_electric/10_allpole/450_high_voltage/qet_directory
@@ -12,5 +12,6 @@
جهد عالي
Υψηλή τάση
Hoogspanning
+ 高圧
diff --git a/elements/10_electric/10_allpole/500_home_installation/qet_directory b/elements/10_electric/10_allpole/500_home_installation/qet_directory
index d3d07c226..45c6c9604 100644
--- a/elements/10_electric/10_allpole/500_home_installation/qet_directory
+++ b/elements/10_electric/10_allpole/500_home_installation/qet_directory
@@ -12,5 +12,6 @@
Impianti civili
Οικιακά
Huisinstallatie
+ 住宅設備
diff --git a/elements/10_electric/10_allpole/qet_directory b/elements/10_electric/10_allpole/qet_directory
index 77ec475c4..19ed3d024 100644
--- a/elements/10_electric/10_allpole/qet_directory
+++ b/elements/10_electric/10_allpole/qet_directory
@@ -11,5 +11,6 @@
Многополюсные
Flere ledere
Multifilar
+ 複線
diff --git a/elements/10_electric/11_singlepole/140_connectors&plugs/qet_directory b/elements/10_electric/11_singlepole/140_connectors&plugs/qet_directory
index 6ad2301b9..86f5bb262 100644
--- a/elements/10_electric/11_singlepole/140_connectors&plugs/qet_directory
+++ b/elements/10_electric/11_singlepole/140_connectors&plugs/qet_directory
@@ -10,5 +10,6 @@
Connectors and plugs
Conectores y Enchufes
Connecteurs et prises
+ コネクタとプラグ
diff --git a/elements/10_electric/11_singlepole/200_fuses&protective_gears/qet_directory b/elements/10_electric/11_singlepole/200_fuses&protective_gears/qet_directory
index ebaafd907..0ae22e4e0 100644
--- a/elements/10_electric/11_singlepole/200_fuses&protective_gears/qet_directory
+++ b/elements/10_electric/11_singlepole/200_fuses&protective_gears/qet_directory
@@ -9,5 +9,6 @@
Fusibili e protezioni
Fuses and protective gears
Fusibles et protections
+ ヒューズと保護装置
diff --git a/elements/10_electric/11_singlepole/330_transformers&power_supplies/qet_directory b/elements/10_electric/11_singlepole/330_transformers&power_supplies/qet_directory
index 1c15a57ac..24b58c971 100644
--- a/elements/10_electric/11_singlepole/330_transformers&power_supplies/qet_directory
+++ b/elements/10_electric/11_singlepole/330_transformers&power_supplies/qet_directory
@@ -10,5 +10,6 @@
Transformators and power supplies
Transformadores y fuentes de poder
Transformateurs et alimentations
+ 変圧器と電源
diff --git a/elements/10_electric/11_singlepole/340_converters&inverters/qet_directory b/elements/10_electric/11_singlepole/340_converters&inverters/qet_directory
index f62782a27..a5465b854 100644
--- a/elements/10_electric/11_singlepole/340_converters&inverters/qet_directory
+++ b/elements/10_electric/11_singlepole/340_converters&inverters/qet_directory
@@ -10,5 +10,6 @@
Converters and inverters
Convertidores e inversores
Convertisseurs et variateurs
+ 変換器とインバータ
diff --git a/elements/10_electric/11_singlepole/392_generators&sources/qet_directory b/elements/10_electric/11_singlepole/392_generators&sources/qet_directory
index d94fee3b9..dea83f5de 100644
--- a/elements/10_electric/11_singlepole/392_generators&sources/qet_directory
+++ b/elements/10_electric/11_singlepole/392_generators&sources/qet_directory
@@ -10,5 +10,6 @@
Generators and sources
Generadores y fuentes
Générateurs et sources
+ 発電機と電源
diff --git a/elements/10_electric/11_singlepole/395_electronics&semiconductors/qet_directory b/elements/10_electric/11_singlepole/395_electronics&semiconductors/qet_directory
index 6eddc7e2d..d12cf1b27 100644
--- a/elements/10_electric/11_singlepole/395_electronics&semiconductors/qet_directory
+++ b/elements/10_electric/11_singlepole/395_electronics&semiconductors/qet_directory
@@ -10,5 +10,6 @@
Electronics and semiconductors
Electrónica y semiconductores
Electronique et semi-conducteurs
+ 電子と半導体
diff --git a/elements/10_electric/11_singlepole/500_home_installation/qet_directory b/elements/10_electric/11_singlepole/500_home_installation/qet_directory
index d3d07c226..dcfc7de79 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/qet_directory
+++ b/elements/10_electric/11_singlepole/500_home_installation/qet_directory
@@ -12,5 +12,6 @@
Impianti civili
Οικιακά
Huisinstallatie
+ 住宅機器
diff --git a/elements/10_electric/11_singlepole/qet_directory b/elements/10_electric/11_singlepole/qet_directory
index 490878780..3a08386b4 100644
--- a/elements/10_electric/11_singlepole/qet_directory
+++ b/elements/10_electric/11_singlepole/qet_directory
@@ -11,5 +11,6 @@
Enkel pool
Однополюсные
Enkel leder
+ 単線
diff --git a/elements/10_electric/20_manufacturers_articles/qet_directory b/elements/10_electric/20_manufacturers_articles/qet_directory
index bdf51771e..6b0c54419 100644
--- a/elements/10_electric/20_manufacturers_articles/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/qet_directory
@@ -9,5 +9,6 @@
Articulos de fabricantes
Articles constructeurs
Producent produkter
+ 製品
diff --git a/elements/10_electric/90_american_standards/15_allpole/qet_directory b/elements/10_electric/90_american_standards/15_allpole/qet_directory
index 5d8c82c81..2349e0ac7 100644
--- a/elements/10_electric/90_american_standards/15_allpole/qet_directory
+++ b/elements/10_electric/90_american_standards/15_allpole/qet_directory
@@ -10,5 +10,6 @@
All-pole
Multifilaire
Flere ledere
+ 複線
diff --git a/elements/10_electric/90_american_standards/16_singlepole/qet_directory b/elements/10_electric/90_american_standards/16_singlepole/qet_directory
index 723d1fee1..4f2bbda30 100644
--- a/elements/10_electric/90_american_standards/16_singlepole/qet_directory
+++ b/elements/10_electric/90_american_standards/16_singlepole/qet_directory
@@ -10,5 +10,6 @@
Single pole
Unifilaire
Enkel leder
+ 単線
diff --git a/elements/10_electric/90_american_standards/qet_directory b/elements/10_electric/90_american_standards/qet_directory
index a43d54c7d..acb9d9c6c 100644
--- a/elements/10_electric/90_american_standards/qet_directory
+++ b/elements/10_electric/90_american_standards/qet_directory
@@ -10,5 +10,6 @@
Estandares americanos
Américain
Amerikansk standard
+ 米国規格
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_01/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_01/qet_directory
index d18d7c47d..fd1b091a4 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_01/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_01/qet_directory
@@ -4,5 +4,6 @@
01- Konturen und Umhüllungen
01- Marcos y sobres
01- konturer og indpakning
+ 01- 輪郭及び囲い
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_02/qet_directory
index d7ceb5111..c13036389 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_02/qet_directory
@@ -3,5 +3,6 @@
02- Nature du courant et de la tension
02- Arten von Strömen und Spannungen
02- Naturaleza de la corriente y el voltaje
+ 02- 電圧及び電流の種類
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_03/qet_directory
index f7048e776..b5373f9c8 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_03/qet_directory
@@ -3,5 +3,6 @@
03- Ajustabilité, variabilité et régulation automatique
03- Ajustabilidad, variabilidad y regulación automática
03- Einstellbarkeit, Veränderbarkeit und Automatische Steuerung
+ 03- 調整,変換及び自動制御
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_04/qet_directory
index 93db8a263..ab1aa239c 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_04/qet_directory
@@ -3,5 +3,6 @@
04- Sens de l'effort ou du mouvement
04- Sentido de esfuerzo o movimiento
04- Richtung von Kraft und Bewegung
+ 04- 力及び運動方向
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_05/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_05/qet_directory
index 3a3eca955..ca5f036e5 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_05/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_05/qet_directory
@@ -3,5 +3,6 @@
05- Sens de propagation
05- Dirección de propagación
05- Wirkungsrichtung
+ 05- 流れの方向
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_06/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_06/qet_directory
index 4000e43db..63ab3455e 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_06/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_06/qet_directory
@@ -3,5 +3,6 @@
06- Abhängigkeit von einer Charakteristischen Grösse
06- Fonctionnement dépendant d'une grandeur caractéristique
06- Operación dependiente de una cantidad característica
+ 06- 特性量への作動依存性
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_07/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_07/qet_directory
index 36392898b..41da856d7 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_07/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_07/qet_directory
@@ -3,5 +3,6 @@
07- Arten von Materie
07- Types de matière
07- Tipos de material
+ 07- 材料の種類
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_08/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_08/qet_directory
index 3da472bba..03c171f03 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_08/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_08/qet_directory
@@ -3,5 +3,6 @@
08- Effet ou dépendance
08- Efecto o dependencia
08- Arten von Wirkungen oder Abhängikeiten
+ 08- 効果又は依存性
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_09/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_09/qet_directory
index 231c9d1e3..e94c104ae 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_09/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_09/qet_directory
@@ -3,5 +3,6 @@
09- Rayonnement
09- Radiación
09- Strahlung
+ 09- 放射
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_10/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_10/qet_directory
index 1183c3bff..b92239f88 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_10/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_10/qet_directory
@@ -3,5 +3,6 @@
10- Forme des signaux
10- Forma de señal
10- Impulsformen
+ 10- 信号波形
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_11/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_11/qet_directory
index 3d0cd9ad8..5c608dbe7 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_11/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_11/qet_directory
@@ -3,5 +3,6 @@
11- Impression, perforation, télécopie
11- Impresión, perforación, envío de faxes
11- Drucken, Lochen und Fernkopieren
+ 11- 印刷,さん孔及びファクシミリ
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_12/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_12/qet_directory
index 2c5b0bfae..d7a2644b5 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_12/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_12/qet_directory
@@ -3,5 +3,6 @@
12- Commandes Mécaniques et autres
12- Controles mecánicos y otros
12- Mechanische und andere Stellteile
+ 12- その他の一般用途図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_13/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_13/qet_directory
index 76ff66ff0..9b239cbda 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_13/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_13/qet_directory
@@ -3,5 +3,6 @@
13- Actionneurs, Ensemble 1
Actuadores, grupo 1
13- Antriebsarten
+ 13- 操作機器・操作機構 1
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_14/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_14/qet_directory
index db82a1a21..5a7b7898d 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_14/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_14/qet_directory
@@ -3,5 +3,6 @@
14- Actionneurs, Ensemble 2
Actuadores, grupo 2
14- Betätigung durch andere Grössen
+ 14- 操作機器・操作機構 2
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_15/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_15/qet_directory
index b37a1c99a..4c7cf73a1 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_15/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_15/qet_directory
@@ -4,5 +4,6 @@
15- Conexiones a Tierra y chasis
15- Mise à la terre et à la masse, équipotentialité
15- Erde, Masse, Äquipotential
+ 15- 接地及びフレーム接続又は等電位
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_16/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_16/qet_directory
index 00af39967..368356428 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_16/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_16/qet_directory
@@ -3,5 +3,6 @@
16- Eléments idéaux de circuit
16- Elementos ideales de circuitos electricos
16- Elemente für ideale Stromkreise
+ 16- 理想回路素子
diff --git a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_17/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_17/qet_directory
index 9a6313cf6..acae8fab2 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_17/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/en_60617_02_17/qet_directory
@@ -3,5 +3,6 @@
17- Divers
17- Verschiedenes
17- Diverso
+ 17- その他
diff --git a/elements/10_electric/91_en_60617/en_60617_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_02/qet_directory
index 272a7af18..d3c628ad5 100644
--- a/elements/10_electric/91_en_60617/en_60617_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_02/qet_directory
@@ -4,5 +4,6 @@
02- Symbolelemente und Kennzeichen
02- Elementos e identificadores de símbolos
02- Symbolelementer, tillægssymboler og andre symboler, som har almindelig anvendelse
+ 02- 図記号要素,限定図記号及びその他の一般用途図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_01/qet_directory b/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_01/qet_directory
index 8ce825009..28e58c2b9 100644
--- a/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_01/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_01/qet_directory
@@ -2,5 +2,6 @@
01- Liaisons
01- Leiter
+ 01- 接続
diff --git a/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_02/qet_directory
index aefe16ebe..f4ce271f2 100644
--- a/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_02/qet_directory
@@ -2,5 +2,6 @@
02- Dérivations, bomes et branchements
02- Anschlüsse und Leiterverbindungen
+ 02- 接続点,端子及び分岐
diff --git a/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_03/qet_directory
index c3d9edad8..5734188ca 100644
--- a/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_03/qet_directory
@@ -2,5 +2,6 @@
03- Dispositifs de liaison
03- Verbinder
+ 03- 接続部品
diff --git a/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_04/qet_directory
index df075697a..d9c958cab 100644
--- a/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_03/en_60617_03_04/qet_directory
@@ -2,5 +2,6 @@
04- Accessoires pour câbles
04- Kabelverbinder
+ 04- ケーブル取付部品
diff --git a/elements/10_electric/91_en_60617/en_60617_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_03/qet_directory
index 236d365d0..ba5dbd3cb 100644
--- a/elements/10_electric/91_en_60617/en_60617_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_03/qet_directory
@@ -3,5 +3,6 @@
03- Conducteurs et dispositifs de liaison
03- Conductores y dispositivos de enlace
03- Ledere og forbindelsesanordninger
+ 03- 導体及び接続部品
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_01/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_01/qet_directory
index f2118d361..d5cb18551 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_01/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_01/qet_directory
@@ -2,5 +2,6 @@
01- Résistances
01- Widerstände
+ 01- 抵抗器
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_02/qet_directory
index 27ae0a046..4845d5577 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_02/qet_directory
@@ -2,5 +2,6 @@
02- Condensateurs
02- Kondensatoren
+ 02- コンデンサ(キャパシタ)
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_03/qet_directory
index b9b258452..c593b7eef 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_03/qet_directory
@@ -2,5 +2,6 @@
03- Inductances
03- Induktivitäten
+ 03- インダクタ
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_04/qet_directory
index 74c82c129..c4b954880 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_04/qet_directory
@@ -2,5 +2,6 @@
04- Élements de symbole
04- Symbolelemente
+ 04- 図記号要素
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_05/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_05/qet_directory
index ca55407d8..c822b452b 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_05/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_05/qet_directory
@@ -2,5 +2,6 @@
05- Tores de ferrite
05- Magnetkerne
+ 05- フェライト磁心
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_06/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_06/qet_directory
index 30d3a36ef..f4f469e09 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_06/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_06/qet_directory
@@ -2,5 +2,6 @@
06- Matrices à mémoire magnetique (représentation topographique)
06- Magnetspeicher-Matrixen (lagerichtige Darstellung)
+ 06- 磁気記憶マトリックス(実体配置的な表現)
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_07/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_07/qet_directory
index a51297221..d9a27621a 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_07/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_07/qet_directory
@@ -2,5 +2,6 @@
07- Cristaux piézoélectriques, electret
07- Piezoelektrische Kristalle, Elektret
+ 07- 圧電結晶,エレクトレット
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_08/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_08/qet_directory
index 885dd9455..4d259ee4b 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_08/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_08/qet_directory
@@ -2,5 +2,6 @@
08- Lignes à retard
08- Verzögerungsleitungen
+ 08- 遅延線
diff --git a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_09/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_09/qet_directory
index c11c8e247..54ecd18f9 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_09/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/en_60617_04_09/qet_directory
@@ -2,5 +2,6 @@
09- Symboles fonctionnels pour lignes et éléments à retard
09- Blocksymbole für Verzögerungsleitungen und -elemente
+ 09- 遅延線及び遅延素子のブロック図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_04/qet_directory
index 429a5b164..255ab85aa 100644
--- a/elements/10_electric/91_en_60617/en_60617_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_04/qet_directory
@@ -3,5 +3,6 @@
04- Composants passifs de base
04- Componentes pasivos básicos
04- Grundlæggende passive komponenter
+ 04- 基礎受動部品
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_01/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_01/qet_directory
index df6d9a652..691753ce8 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_01/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_01/qet_directory
@@ -2,5 +2,6 @@
01- Éléments de symboles
01- Symbolelemente
+ 01- 図記号要素
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_02/qet_directory
index 420ff1b9f..acf6ea49e 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_02/qet_directory
@@ -2,5 +2,6 @@
02- Symboles distinctifs particuliers aux dispositifs à semiconducteurs
02- Besondere Kennzeichen für Halbleiterelemente
+ 02- 半導体素子に特有な限定図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_03/qet_directory
index 5f3aeb453..c9c29036b 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_03/qet_directory
@@ -2,5 +2,6 @@
03- Exemples de diodes à semiconducteur
03- Beispiele für Halbleiterdioden
+ 03- 半導体ダイオードの例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_04/qet_directory
index ca54a9507..61a7ecaab 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_04/qet_directory
@@ -2,5 +2,6 @@
04- Exemples de thyristors
04- Beispiele für Thyristoren
+ 04- サイリスタの例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_05/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_05/qet_directory
index d086907b7..7425f64db 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_05/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_05/qet_directory
@@ -2,5 +2,6 @@
05- Exemples de transistors
05- Beispiele für Transistoren
+ 05- トランジスタの例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_06/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_06/qet_directory
index 03df9fb01..a43accd40 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_06/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_06/qet_directory
@@ -2,5 +2,6 @@
06- Exemples de dispositifs photosensibles et magnétosensibles
06- Beispiele für licht- und magnetfeldempfindliche Elemente
+ 06- 光電素子及び磁界感応素子の例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_07/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_07/qet_directory
index 9dcb97cf9..b6be0c5cd 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_07/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_07/qet_directory
@@ -2,5 +2,6 @@
07- Eléments de symboles généraux
07- Symbolelemente, allgemein
+ 07- 一般的な図記号要素
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_08/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_08/qet_directory
index cae034efd..907c02327 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_08/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_08/qet_directory
@@ -3,5 +3,6 @@
08- Eléments de symboles principalement utilisables pour les tubes à rayons
cathodiques et les tubes de caméras de télévison
08- Symbolelemente für Kathodenstrahl- und Bildaufnahmeröhren
+ 08- 主としてブラウン管及びテレビジョン撮像管に適用する図記号要素
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_09/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_09/qet_directory
index f7c8b6f1b..3ad5478de 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_09/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_09/qet_directory
@@ -2,5 +2,6 @@
09- Eléments de symboles principalement utilisables pour les tubes hyperfréquences
09- Symbolelemente für Mikrowellenröhren
+ 09- 主としてマイクロ波管に適用する図記号要素
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_10/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_10/qet_directory
index 37daa2143..c906d63de 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_10/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_10/qet_directory
@@ -3,5 +3,6 @@
10- Eléments de symboles utilisables pour divers types de tubes, y compris les
redresseurs à vapeur de mercure
10- Symbolelemente für weiter Röhrenarten, einschliesslich Quecksilberdampfröhren
+ 10- 水銀整流器を含むその他の電子管に適用する図記号要素
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_11/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_11/qet_directory
index 4f7401110..e98c2184a 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_11/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_11/qet_directory
@@ -2,5 +2,6 @@
11- Exemples de tubes électroniques
11- Beispiele für Elektronenröhren
+ 11- 電子管の例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_12/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_12/qet_directory
index 2318579dc..1203f9aa5 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_12/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_12/qet_directory
@@ -2,5 +2,6 @@
12- Exemples de tubes à rayons cathodiques
12- Beispiele für Kathodenstrahlröhren
+ 12- ブラウン管の例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_13/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_13/qet_directory
index b068fb3d8..f2985a7c4 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_13/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_13/qet_directory
@@ -2,5 +2,6 @@
13- Exemples de tubes pour hyperfréquences
13- Beispiele für Mikrowellenröhren
+ 13- マイクロ波管の例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_14/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_14/qet_directory
index ab0736987..a6becf4da 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_14/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_14/qet_directory
@@ -2,5 +2,6 @@
14- Exemples de divers types de tubes, y compris les redresseurs à vapeur de mercure
14- Beispiele für weitere Rörenarten, einschliesslich Quecksilberdampfröhren
+ 14- 水銀整流器を含むその他の電子管の例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_15/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_15/qet_directory
index b97f6ee1e..ebcb6a169 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_15/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_15/qet_directory
@@ -2,5 +2,6 @@
15- Exemples de détecteurs de rayonnements ionisants
15- Beispiele für Detektoren für ionisierende Strahlung
+ 15- 電離放射線検出器の例
diff --git a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_16/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_16/qet_directory
index 55b6c035b..5676dc3ff 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_16/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/en_60617_05_16/qet_directory
@@ -2,5 +2,6 @@
16- Dispositifs électrochimiques
16- Elektrochemische Geräte
+ 16- 電気化学デバイス
diff --git a/elements/10_electric/91_en_60617/en_60617_05/qet_directory b/elements/10_electric/91_en_60617/en_60617_05/qet_directory
index 6d59bef71..1826a6019 100644
--- a/elements/10_electric/91_en_60617/en_60617_05/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_05/qet_directory
@@ -3,5 +3,6 @@
05- Semiconducteurs et tubes électroniques
05- Semiconductores y tubos electrónicos
05- Halvledere og elektronrør
+ 05- 半導体及び電子管
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_01/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_01/qet_directory
index 2b2a4822f..f710be2fd 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_01/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_01/qet_directory
@@ -2,5 +2,6 @@
01- Enroulements séparés
01- Getrennte Wicklungen
+ 01- 分離した巻線
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_02/qet_directory
index 9908611d8..25655bfc4 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_02/qet_directory
@@ -2,5 +2,6 @@
02- Enroulements connectés intérieurement
02- Intern verbundene Wicklungen
+ 02- 内部で接続した巻線
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_03/qet_directory
index 096ada73b..3c193cf37 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_03/qet_directory
@@ -2,5 +2,6 @@
03- Eléments de machines
03- Symbolelemente von Maschinen
+ 03- 回転機の要素
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_04/qet_directory
index 248227583..d41afa865 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_04/qet_directory
@@ -2,5 +2,6 @@
04- Types de machines
04- Maschinenarten
+ 04- 回転機の種類
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_05/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_05/qet_directory
index a487de01a..5124e3cfb 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_05/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_05/qet_directory
@@ -2,5 +2,6 @@
05- Exemples de machines à courant continu
05- Beispiele für Gleichstrommaschinen
+ 05- 直流機の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_06/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_06/qet_directory
index eab06ca4c..ff8b7f1d1 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_06/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_06/qet_directory
@@ -2,5 +2,6 @@
06- Exemples de machines à courant alternatif à collecteur
06- Beispiele für Wechselstrom-Kommutatormaschinen
+ 06- 交流整流子機の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_07/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_07/qet_directory
index 5a742d7df..ff00f33d8 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_07/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_07/qet_directory
@@ -2,5 +2,6 @@
07- Exemples de machines synchrones
07- Beispiele für Synchronmaschinen
+ 07- 同期機の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_08/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_08/qet_directory
index 0d194eca7..d6902a971 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_08/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_08/qet_directory
@@ -2,5 +2,6 @@
08- Exemples de machines à induction (asynchrones)
08- Beispiele für Asynchronmaschinen
+ 08- 誘導機(非同期機)の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_09/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_09/qet_directory
index 0a1667bfc..9323bbf02 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_09/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_09/qet_directory
@@ -2,5 +2,6 @@
09- Symboles généraux pour transformateurs et reactances
09- Allgemeine Symbole für Transformatoren und Drosseln
+ 09- 変圧器及びリアクトル(一般図記号)
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_10/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_10/qet_directory
index d0b7793d8..82c070d0c 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_10/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_10/qet_directory
@@ -2,5 +2,6 @@
10- Exemples de transformateurs à enroulements séprés
10- Beispiele für Transformatren mit getrennten Wicklungen
+ 10- 別個の巻線を用いる変圧器の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_11/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_11/qet_directory
index e85059849..277bc0dd4 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_11/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_11/qet_directory
@@ -2,5 +2,6 @@
11- Exemples d'autotransformateurs
11- Beispiele für Spartransformatoren
+ 11- 単巻変圧器の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_12/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_12/qet_directory
index 991d804b5..6ea826820 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_12/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_12/qet_directory
@@ -2,5 +2,6 @@
12- Exemples de régulateurs à induction
12- Beispiele für Induktionsteller
+ 12- 誘導電圧調整器の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_13/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_13/qet_directory
index ef4091bf2..b9b7dcca1 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_13/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_13/qet_directory
@@ -2,5 +2,6 @@
13- Exemples de transformateurs de mesure et de transformateurs d'impulsion
13- Beispiele für Messwandler und Impulstransformatoren
+ 13- 計器用変成器及びパルス変成器の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_14/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_14/qet_directory
index f5495aaea..9b6925808 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_14/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_14/qet_directory
@@ -2,5 +2,6 @@
14- Symboles fonctionnels pour convertiseurs de puissance
14- Blocksymbole für Leistungsumrichter
+ 14- 電力変換装置に用いるブロック図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_15/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_15/qet_directory
index f477edb90..1a5e34ac5 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_15/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_15/qet_directory
@@ -2,5 +2,6 @@
15- Piles et accumulateurs
15- Primärzellen und Akkumulatoren
+ 15- 一次電池及び二次電池
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_16/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_16/qet_directory
index 4927f5ce0..1a38fd054 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_16/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_16/qet_directory
@@ -2,5 +2,6 @@
16- Symbol général de générateurs non-rotatif de puissance
16- Grundsymbol für nicht rotierende Generatoren, Heizquellen
+ 16- 非回転式発電装置(一般図記号)
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_17/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_17/qet_directory
index 368ac915c..ca8ab2446 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_17/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_17/qet_directory
@@ -2,5 +2,6 @@
17- Sources de chaleur
17- Heizquellen
+ 17- 熱源
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_18/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_18/qet_directory
index aba3b3be3..23bb395e8 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_18/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_18/qet_directory
@@ -2,5 +2,6 @@
18- Exemples de générateurs de puissance
18- Beispiele für besondere, rotierende Generatoren
+ 18- 発電装置の例
diff --git a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_19/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_19/qet_directory
index 582d29533..3413a713b 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_19/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/en_60617_06_19/qet_directory
@@ -2,5 +2,6 @@
19- Régulateurs en boucle fremée
19- Regler
+ 19- 閉ループ制御装置
diff --git a/elements/10_electric/91_en_60617/en_60617_06/qet_directory b/elements/10_electric/91_en_60617/en_60617_06/qet_directory
index 5c17b569b..249b6f6e2 100644
--- a/elements/10_electric/91_en_60617/en_60617_06/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_06/qet_directory
@@ -3,5 +3,6 @@
06- Production, transformation et conversion de l'électricité
06- Producción, transformación y conversión de electricidad
06- Produktion og omformning af elektrisk energi
+ 06- 電気エネルギーの発生及び変換
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_01/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_01/qet_directory
index 2515bd261..8f015b6c9 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_01/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_01/qet_directory
@@ -2,5 +2,6 @@
01- Symboles distinctifs
01- Kennzeichen
+ 01- 限定図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_02/qet_directory
index c0b1a71ae..6d0fc086d 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_02/qet_directory
@@ -2,5 +2,6 @@
02-Contacts à deux ou trois positions
02- Kontakte mit zwei oder drei Schaltstellungen
+ 02- 2位置又は3位置接点
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_03/qet_directory
index ba2b3ccab..3bf60aa77 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_03/qet_directory
@@ -2,5 +2,6 @@
03- Contacts de passage à deux positions
03- Wischkontakte mit zwei Schaltstellungen
+ 03- 2位置の瞬時接点
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_04/qet_directory
index 22823fbd1..768182477 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_04/qet_directory
@@ -2,5 +2,6 @@
04- Contacts à fonctionnement décalé
04- Voreilende und nacheilende Kontakte
+ 04- 早期作動及び遅延動作接点
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_05/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_05/qet_directory
index 219f6b77c..db9283fc2 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_05/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_05/qet_directory
@@ -2,5 +2,6 @@
05- Contacts avec opération retardée
05- Verzögerte Kontakte
+ 05- 限時動作接点
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_06/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_06/qet_directory
index ba799a3a0..fd499da2a 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_06/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_06/qet_directory
@@ -2,5 +2,6 @@
06- Contacts à retour automatique et à position maintenue
06- Kontaktemit selbsttätigen Rückgang und mit nicht selbsttätigen Rückgang
+ 06- 自動復帰接点及び非自動復帰接点
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_07/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_07/qet_directory
index ca58f7f61..5e5982da9 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_07/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_07/qet_directory
@@ -2,5 +2,6 @@
07-Commutateurs unipolaires
07- Handbetätigte Schalter
+ 07- 単極スイッチ
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_08/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_08/qet_directory
index 9b58d7457..faae4536c 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_08/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_08/qet_directory
@@ -2,5 +2,6 @@
08- Interrupteurs de position
08- Grenzschalter, Endschalter
+ 08- リミットスイッチ
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_09/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_09/qet_directory
index 1381fad3d..4983f25a4 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_09/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_09/qet_directory
@@ -2,5 +2,6 @@
09- Interrupteurs fonctionnement sous l'effet de la température
09- Temperaturabhängige Schalter
+ 09- 温度感知スイッチ
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_11/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_11/qet_directory
index 48581a1ab..f156d10da 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_11/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_11/qet_directory
@@ -2,5 +2,6 @@
11- Exemples de commutateurs à plusiers directions incluant les auxiliaires de commande
11- Beispiele Mehrstellungsschalter
+ 11- 制御スイッチを含む多段スイッチの例
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_12/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_12/qet_directory
index 7fcae7568..3d4a369f7 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_12/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_12/qet_directory
@@ -2,5 +2,6 @@
12- Symboles fonctionnels pour commutateurs complexes
12- Blocksymbole für komplexe Schalter
+ 12- 複合スイッチに用いるブロック図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_13/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_13/qet_directory
index 876412ed8..33c671d7f 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_13/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_13/qet_directory
@@ -2,5 +2,6 @@
13- Dispositifs de commutation de puisance
13- Schaltgeräte und Steuergeräte
+ 13- 電力用開閉装置
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_14/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_14/qet_directory
index 65a13bd48..12654046b 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_14/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_14/qet_directory
@@ -2,5 +2,6 @@
14- Démarreurs de moteurs
14- Blocksymbole für Anlasser
+ 14- 電動機始動器に用いるブロック図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_15/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_15/qet_directory
index 540f5f17e..c8a9399b9 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_15/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_15/qet_directory
@@ -2,5 +2,6 @@
15- Organes de commande
15- Elektromechanische Antriebe
+ 15- 作動装置
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_16/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_16/qet_directory
index 33d76fbc2..936a58f62 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_16/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_16/qet_directory
@@ -3,5 +3,6 @@
16- Symbole fonctionnel et symboles distinctifs pour relais de mesure
et dispositifs apparentés
16- Blocksymbole und Kennzeichen für Messrelais und verwandte Einrichtungen
+ 16- ブロック図記号及び限定図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_17/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_17/qet_directory
index 17ed5e142..c60477feb 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_17/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_17/qet_directory
@@ -2,5 +2,6 @@
17- Exemples de relais de mesure
17- Beispiele für Messrelais
+ 17- 保護継電器の例
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_18/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_18/qet_directory
index 0b909374b..94d56721c 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_18/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_18/qet_directory
@@ -2,5 +2,6 @@
18- Autres dispositifs
18- Andere Einrichtungen
+ 18- その他の装置
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_19/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_19/qet_directory
index 9070afa7b..4598bf8b4 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_19/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_19/qet_directory
@@ -2,5 +2,6 @@
19- Capteurs et détecteurs
19- Sensoren und Detektoren
+ 19- センサ及び検出器
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_20/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_20/qet_directory
index 206dcc6dd..bdcf30845 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_20/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_20/qet_directory
@@ -2,5 +2,6 @@
20- Dispositifs à contacts
20- Schalter
+ 20- スイッチ
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_21/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_21/qet_directory
index 46e5aa907..2edd5556a 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_21/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_21/qet_directory
@@ -2,5 +2,6 @@
21- Fusibles et interrupteurs à fusibles
21- Sicherungen und Sicherungsschalter
+ 21- ヒューズ及びヒューズスイッチ
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_22/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_22/qet_directory
index 6e1e2e7f2..8d0c88845 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_22/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_22/qet_directory
@@ -2,5 +2,6 @@
22- Éclateurs et parafoudres
22- Funkenstrecken und Überspannungsableiter
+ 22- 放電ギャップ及び避雷器
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_25/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_25/qet_directory
index 06592a256..4d09cd7fc 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_25/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_25/qet_directory
@@ -2,5 +2,6 @@
25- Interrupteurs statiques
25- Elektronische Schalter
+ 25- 静止形スイッチ
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_26/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_26/qet_directory
index df529d388..d687bb373 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_26/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_26/qet_directory
@@ -2,5 +2,6 @@
26- Dispositifs statiques de connexion
26- Elektronische Schalteinrichtungen
+ 26- 静止形開閉装置
diff --git a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_27/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_27/qet_directory
index 4be932b52..7a7a66b96 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_27/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/en_60617_07_27/qet_directory
@@ -2,5 +2,6 @@
27- Coupleurs et relais statiques, symboles fonctionnels
27- Koppler und Elektronische Relais, Blocksymbole
+ 27- 結合装置及び静止形継電器のブロック図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_07/qet_directory b/elements/10_electric/91_en_60617/en_60617_07/qet_directory
index c56e13b91..423d5fb52 100644
--- a/elements/10_electric/91_en_60617/en_60617_07/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_07/qet_directory
@@ -3,5 +3,6 @@
07- Appareillage et dispositifs de commande et de protection
07- Aparatos y dispositivos para control y protección
07- Afbrydere, kontakter og beskyttende udstyr
+ 07- 開閉装置,制御装置及び保護装置
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_01/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_01/qet_directory
index b035be2d6..032d6fb60 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_01/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_01/qet_directory
@@ -2,5 +2,6 @@
01- Appareils indicateurs, appareils enregistreurs et compteurs, symboles généraux
01- Anzeigende, aufzeichnende und integrierende Messgeräte, allgemeine Schaltzeichen
+ 01- 指示計器,記録計及び積算計(一般図記号)
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_02/qet_directory
index 2850c5726..f66b552f0 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_02/qet_directory
@@ -2,5 +2,6 @@
02- Exemples d'appareils indicateurs
02- Beispiele für anzeigende Messgeräte
+ 02- 指示計器の例
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_03/qet_directory
index 5b9e28b84..0d3eeb9b2 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_03/qet_directory
@@ -2,5 +2,6 @@
03- Exemples d'appareils enregistreurs
03- Beispiele für aufzeichnende Messgeräte
+ 03- 記録計の例
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_04/qet_directory
index 9b12462b8..32748eaea 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_04/qet_directory
@@ -2,5 +2,6 @@
04- Exemples de compteurs
04- Beispiele für integrierende Messgeräte
+ 04- 積算計の例
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_05/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_05/qet_directory
index f30cc6300..1e6cbb7d3 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_05/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_05/qet_directory
@@ -2,5 +2,6 @@
05- Dispositifs de comptage
05- Zähleinrichtungen
+ 05- 計数装置
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_06/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_06/qet_directory
index 91470542e..a64341e33 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_06/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_06/qet_directory
@@ -2,5 +2,6 @@
06- Thermocouples
06- Thermoelemente
+ 06- 熱電対
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_07/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_07/qet_directory
index 0f4d65ca1..e285e9ad1 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_07/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_07/qet_directory
@@ -2,5 +2,6 @@
07- Dispositifs de télémesure
07- Fernmesseinrichtungen
+ 07- 遠隔測定装置
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_08/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_08/qet_directory
index e3a20a9f0..8c1b963f7 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_08/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_08/qet_directory
@@ -2,5 +2,6 @@
08- Horologes électriques
08- Elektrische Uhren
+ 08- 電気時計
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_09/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_09/qet_directory
index 4d6e74a69..8fe889d36 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_09/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_09/qet_directory
@@ -2,5 +2,6 @@
09- Appareils de mesure et instruments divers
09- Sonstige Messgeber und Messgeräte
+ 09- その他の測定素子及び計器
diff --git a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_10/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_10/qet_directory
index 53d3e3f53..5815f64f3 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_10/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/en_60617_08_10/qet_directory
@@ -2,5 +2,6 @@
10- Lampes et dispositifs de signalisation
10- Leuchtmelder und Signaleinrichtungen
+ 10- ランプ及び信号報知装置
diff --git a/elements/10_electric/91_en_60617/en_60617_08/qet_directory b/elements/10_electric/91_en_60617/en_60617_08/qet_directory
index 0ea3fec93..30e02ec03 100644
--- a/elements/10_electric/91_en_60617/en_60617_08/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_08/qet_directory
@@ -3,5 +3,6 @@
08- Appareils de mesure, lampes et dispositifs de siglalisation
08- Dispositivos de medición, lámparas y dispositivos de señalización
08- Måleinstrumenter, lamper og signaludstyr
+ 08- 計器,ランプ及び信号装置
diff --git a/elements/10_electric/91_en_60617/en_60617_09/qet_directory b/elements/10_electric/91_en_60617/en_60617_09/qet_directory
index 125d3b59f..0434dfa52 100644
--- a/elements/10_electric/91_en_60617/en_60617_09/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_09/qet_directory
@@ -3,5 +3,6 @@
09- Télécommunications: Commutation et équipements périphériques
09- Telecomunicaciones: Equipo de conmutación y periféricos
09- Telekommunikation: Koblings- og perifert materiel
+ 09- 電気通信-交換機器及び周辺機器
diff --git a/elements/10_electric/91_en_60617/en_60617_10/qet_directory b/elements/10_electric/91_en_60617/en_60617_10/qet_directory
index aaf583be8..e6ffd3e7a 100644
--- a/elements/10_electric/91_en_60617/en_60617_10/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_10/qet_directory
@@ -3,5 +3,6 @@
10- Télécommunications, Transmission
10- Telecomunicaciones, transmision
10- Telekommunikation: Transmission
+ 10- 電気通信-伝送
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_01/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_01/qet_directory
index 7b242fabf..127e8e097 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_01/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_01/qet_directory
@@ -2,5 +2,6 @@
01- Allgemeine Symbole für Kraftwerke und Stationen
01- Symboles généraux pour Centrales et postes électriques
+ 01- 一般図記号
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_02/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_02/qet_directory
index e570db7d3..1f44b13be 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_02/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_02/qet_directory
@@ -2,5 +2,6 @@
02- Spezielle Kraftwerke und Stationen
02- Types particuliers de centrales et postes électriques
+ 02- 特定の発電所及び変電所
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_03/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_03/qet_directory
index 077beb453..7faa053ec 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_03/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_03/qet_directory
@@ -3,5 +3,6 @@
03- C. Leidingen
03- Lignes
03- Leiter, Leitungen
+ 03- 線路
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_04/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_04/qet_directory
index 9391579ab..e7faeba3d 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_04/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_04/qet_directory
@@ -2,5 +2,6 @@
04- Verschiedenes
04- Éléments divers
+ 04- その他の要素
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_05/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_05/qet_directory
index 507b6c6b3..070609131 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_05/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_05/qet_directory
@@ -2,5 +2,6 @@
05- Kabelköpfe
05- Tétes de réseau
+ 05- ヘッドエンド
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_06/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_06/qet_directory
index 596f9c895..766bec025 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_06/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_06/qet_directory
@@ -2,5 +2,6 @@
06- Verstärker
06- Amplificateurs
+ 06- 増幅器又はアンプ
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_07/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_07/qet_directory
index 50387f18e..00327ba71 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_07/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_07/qet_directory
@@ -2,5 +2,6 @@
07- Verteiler und Richtungskoppler
07- Répartiteurs et coupleurs directifs
+ 07- 分配器及び分岐器
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_08/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_08/qet_directory
index aba7f2d75..56463c425 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_08/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_08/qet_directory
@@ -2,5 +2,6 @@
08- Dosen
08- Dérivations d'usager et prises du réseau
+ 08- タップオフ及び出力端子
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_09/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_09/qet_directory
index f8768aa5e..b2c23cb68 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_09/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_09/qet_directory
@@ -2,5 +2,6 @@
09- Entzerrer und Dämpfungsglied
09- Égaliseurs et affaiblisseurs
+ 09- 等化器及び減衰器
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_10/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_10/qet_directory
index b2dffa147..c58f7fa65 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_10/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_10/qet_directory
@@ -2,5 +2,6 @@
10- Fern-Stromversorgungen
10- Dispositifs d'alimentation
+ 10- 電源供給装置
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_11/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_11/qet_directory
index 80b0a226e..2ff2ff231 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_11/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_11/qet_directory
@@ -2,5 +2,6 @@
11- Kennzeichnung für besondere Leiter
11- Identification de conducteurs particuliers
+ 11- 特定の導体の表示
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_12/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_12/qet_directory
index 0b1fbe6c9..675aa16d1 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_12/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_12/qet_directory
@@ -2,5 +2,6 @@
12- Einspeisungen
12- Canalisations
+ 12- 配線
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_13/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_13/qet_directory
index 2577477af..733a666e5 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_13/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_13/qet_directory
@@ -2,5 +2,6 @@
13- Steckdosen
13- Socles de prises de courant
+ 13- コンセント
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_14/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_14/qet_directory
index cebeab80c..de560e87d 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_14/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_14/qet_directory
@@ -2,5 +2,6 @@
14- Schalter
14- Interrupteurs
+ 14- スイッチ
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_15/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_15/qet_directory
index 039a6d792..10b3bfe1e 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_15/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_15/qet_directory
@@ -3,5 +3,6 @@
15- Auslässe und Installationen für Leuchten
15- Lighting
15- Installations d'éclairage
+ 15- 照明用コンセント及び器具
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_16/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_16/qet_directory
index 7df439329..fd8ad9867 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_16/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_16/qet_directory
@@ -2,5 +2,6 @@
16- Verschiedene Geräte
16- Appareils divers
+ 16- その他
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_17/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_17/qet_directory
index add19ed42..1f4a9d675 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_17/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_17/qet_directory
@@ -2,5 +2,6 @@
17- Fertigteile für Kabel-Verteilsysteme
17- Canalisations préfabriquées
+ 17- 屋外設備
diff --git a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_18/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_18/qet_directory
index f4d03497b..598e2245b 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_18/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/en_60617_11_18/qet_directory
@@ -2,5 +2,6 @@
18- Flugplatzbefeuerung und Anzeiger
18- Feux et indicateurs de navigation pour aéroports
+ 18- 航空灯火及び標識
diff --git a/elements/10_electric/91_en_60617/en_60617_11/qet_directory b/elements/10_electric/91_en_60617/en_60617_11/qet_directory
index bbeead7ca..9b4c662e1 100644
--- a/elements/10_electric/91_en_60617/en_60617_11/qet_directory
+++ b/elements/10_electric/91_en_60617/en_60617_11/qet_directory
@@ -3,5 +3,6 @@
11- Schémas et plans d'installation, architecturaux et topographiques
11- Dibujos y planos arquitectónicos y topográficos
11- Bygningsmæssige og topografiske installationstegninger og -skemaer
+ 11- 建築設備及び地図上の設備を示す設置平面図及び線図
diff --git a/elements/10_electric/91_en_60617/qet_directory b/elements/10_electric/91_en_60617/qet_directory
index 0e5f4d220..5e1416b5c 100644
--- a/elements/10_electric/91_en_60617/qet_directory
+++ b/elements/10_electric/91_en_60617/qet_directory
@@ -3,5 +3,6 @@
EN 60617
IEC 60617
DS/IEC 60617
+ 電気用図記号 (JIS C 0617 / IEC 60617)
diff --git a/elements/10_electric/98_graphics/01_auxiliary_symbols/qet_directory b/elements/10_electric/98_graphics/01_auxiliary_symbols/qet_directory
index 3a930e958..3a72445ab 100644
--- a/elements/10_electric/98_graphics/01_auxiliary_symbols/qet_directory
+++ b/elements/10_electric/98_graphics/01_auxiliary_symbols/qet_directory
@@ -8,5 +8,6 @@
Symbolen voor tekeningen
Βοηθητικά σύμβολα διαγραμμάτων
Pomocné symboly pro výkresy
+ 補助シンボル
diff --git a/elements/10_electric/98_graphics/11_tags&comments/qet_directory b/elements/10_electric/98_graphics/11_tags&comments/qet_directory
index ecbc91f6e..739969cc0 100644
--- a/elements/10_electric/98_graphics/11_tags&comments/qet_directory
+++ b/elements/10_electric/98_graphics/11_tags&comments/qet_directory
@@ -7,5 +7,6 @@
Etiketten und Kommentare
Labels en commentaren
Štítky a poznámky
+ タグとコメント
diff --git a/elements/10_electric/98_graphics/21_forms&tabs/qet_directory b/elements/10_electric/98_graphics/21_forms&tabs/qet_directory
index 2005c47f1..f4918c0b9 100644
--- a/elements/10_electric/98_graphics/21_forms&tabs/qet_directory
+++ b/elements/10_electric/98_graphics/21_forms&tabs/qet_directory
@@ -7,5 +7,6 @@
Formulare und Tabellen
Formulieren en tabellen
Formuláře a tabulky
+ フォームと表
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/qet_directory b/elements/10_electric/98_graphics/99_assembly_plan/qet_directory
index 2db2d1e49..e45e3bab3 100644
--- a/elements/10_electric/98_graphics/99_assembly_plan/qet_directory
+++ b/elements/10_electric/98_graphics/99_assembly_plan/qet_directory
@@ -7,5 +7,6 @@
Thumbnails for assembly plan
Opbouwtekeningen
Náhledy montážního plánu
+ 組立図用サムネイル
diff --git a/elements/10_electric/98_graphics/qet_directory b/elements/10_electric/98_graphics/qet_directory
index 37e71e40d..3afa9d384 100644
--- a/elements/10_electric/98_graphics/qet_directory
+++ b/elements/10_electric/98_graphics/qet_directory
@@ -11,5 +11,6 @@
Graphisme
Označení
Grafik
+ グラフィック
diff --git a/elements/10_electric/99_miscellaneous&unsorted/qet_directory b/elements/10_electric/99_miscellaneous&unsorted/qet_directory
index 61323ff7e..e0a5ffad4 100644
--- a/elements/10_electric/99_miscellaneous&unsorted/qet_directory
+++ b/elements/10_electric/99_miscellaneous&unsorted/qet_directory
@@ -11,5 +11,6 @@
Miscelánea y desordenados
Divers et non classés
Diverse og ikke kategoriseret
+ その他と未分類
diff --git a/elements/10_electric/qet_directory b/elements/10_electric/qet_directory
index e75e0bf65..9bb603519 100644
--- a/elements/10_electric/qet_directory
+++ b/elements/10_electric/qet_directory
@@ -11,5 +11,6 @@
Electrique
Elektrisk
Eléctrica
+ 電気
diff --git a/elements/20_logic/10_functions/qet_directory b/elements/20_logic/10_functions/qet_directory
index 41d5c8924..820a2d233 100644
--- a/elements/20_logic/10_functions/qet_directory
+++ b/elements/20_logic/10_functions/qet_directory
@@ -14,5 +14,6 @@
Functie Plan (FUP)
Logische poorten
Logik funktioner
+ 論理ゲート
diff --git a/elements/20_logic/20_grafcet/qet_directory b/elements/20_logic/20_grafcet/qet_directory
index 3ec959680..1602b0f82 100644
--- a/elements/20_logic/20_grafcet/qet_directory
+++ b/elements/20_logic/20_grafcet/qet_directory
@@ -12,5 +12,6 @@
Grafcet afloopdiagram
Functie diagram (Grafcet)
Sekvens
+ Grafcet
diff --git a/elements/20_logic/30_ladder/qet_directory b/elements/20_logic/30_ladder/qet_directory
index 64cd3d072..965b8e265 100644
--- a/elements/20_logic/30_ladder/qet_directory
+++ b/elements/20_logic/30_ladder/qet_directory
@@ -14,5 +14,6 @@
Ladder Diagram (KOP)
Ladder (KOP)
Ladder
+ ラダー
diff --git a/elements/20_logic/40_flowchart/qet_directory b/elements/20_logic/40_flowchart/qet_directory
index 4971b725f..2e06f443d 100644
--- a/elements/20_logic/40_flowchart/qet_directory
+++ b/elements/20_logic/40_flowchart/qet_directory
@@ -11,5 +11,6 @@
Stroomschema
Organisatieschema
Rutediagram
+ フローチャート
diff --git a/elements/20_logic/qet_directory b/elements/20_logic/qet_directory
index 2eea90765..ecfc42c2e 100644
--- a/elements/20_logic/qet_directory
+++ b/elements/20_logic/qet_directory
@@ -11,5 +11,6 @@
Logica
Логика
Logik
+ 論理
diff --git a/elements/30_hydraulic/20_manufacturers_articles/qet_directory b/elements/30_hydraulic/20_manufacturers_articles/qet_directory
index 2126d1361..5baaac24e 100644
--- a/elements/30_hydraulic/20_manufacturers_articles/qet_directory
+++ b/elements/30_hydraulic/20_manufacturers_articles/qet_directory
@@ -1,5 +1,6 @@
Manufacturers Articles
+ 製品
diff --git a/elements/30_hydraulic/21_tanks/qet_directory b/elements/30_hydraulic/21_tanks/qet_directory
index f3ec8b657..250e2b6a1 100644
--- a/elements/30_hydraulic/21_tanks/qet_directory
+++ b/elements/30_hydraulic/21_tanks/qet_directory
@@ -10,6 +10,7 @@
Tanks hydrauliek
Δεξαμενές
Tanke
+ タンク
diff --git a/elements/30_hydraulic/31_control_valves/qet_directory b/elements/30_hydraulic/31_control_valves/qet_directory
index 7e3a170c0..f2d4e17df 100644
--- a/elements/30_hydraulic/31_control_valves/qet_directory
+++ b/elements/30_hydraulic/31_control_valves/qet_directory
@@ -11,5 +11,6 @@
Stuurkleppen 2 standen
Βαλβίδες ελέγχου
Styre ventiler
+ 制御弁
diff --git a/elements/30_hydraulic/45_valves/qet_directory b/elements/30_hydraulic/45_valves/qet_directory
index 2380e9760..d644451f4 100644
--- a/elements/30_hydraulic/45_valves/qet_directory
+++ b/elements/30_hydraulic/45_valves/qet_directory
@@ -10,5 +10,6 @@
Βαλβίδες
Kleppen
Ventiler
+ 弁
diff --git a/elements/30_hydraulic/51_cylinders/qet_directory b/elements/30_hydraulic/51_cylinders/qet_directory
index e2fc2767a..65ea46d39 100644
--- a/elements/30_hydraulic/51_cylinders/qet_directory
+++ b/elements/30_hydraulic/51_cylinders/qet_directory
@@ -10,5 +10,6 @@
Έμβολα
Cilinders
Cylindre
+ シリンダ
diff --git a/elements/30_hydraulic/61_pumps/qet_directory b/elements/30_hydraulic/61_pumps/qet_directory
index 279ab6cbf..147db2262 100644
--- a/elements/30_hydraulic/61_pumps/qet_directory
+++ b/elements/30_hydraulic/61_pumps/qet_directory
@@ -10,5 +10,6 @@
Pompe
Pompen, motoren
Pumper
+ ポンプ
diff --git a/elements/30_hydraulic/71_exchangers/qet_directory b/elements/30_hydraulic/71_exchangers/qet_directory
index 3d50749d1..e719ed1e6 100644
--- a/elements/30_hydraulic/71_exchangers/qet_directory
+++ b/elements/30_hydraulic/71_exchangers/qet_directory
@@ -10,5 +10,6 @@
Εναλλάκτες θερμότητας
Warmtewisselaar
Varme veksler
+ 熱交換器
diff --git a/elements/30_hydraulic/81_filters/qet_directory b/elements/30_hydraulic/81_filters/qet_directory
index c4dc6ee2e..2bc36de19 100644
--- a/elements/30_hydraulic/81_filters/qet_directory
+++ b/elements/30_hydraulic/81_filters/qet_directory
@@ -10,5 +10,6 @@
Filtri
Filters
Filtre
+ フィルタ
diff --git a/elements/30_hydraulic/qet_directory b/elements/30_hydraulic/qet_directory
index 2155b7350..4aac5e4a3 100644
--- a/elements/30_hydraulic/qet_directory
+++ b/elements/30_hydraulic/qet_directory
@@ -11,5 +11,6 @@
Hydrauliek
Гидравлика
Hydraulik
+ 油圧・水圧
diff --git a/elements/50_pneumatic/21_tanks/qet_directory b/elements/50_pneumatic/21_tanks/qet_directory
index f9a99fd12..603ffde32 100644
--- a/elements/50_pneumatic/21_tanks/qet_directory
+++ b/elements/50_pneumatic/21_tanks/qet_directory
@@ -11,5 +11,6 @@
Tanks
Δοχεία
Tanke
+ タンク
diff --git a/elements/50_pneumatic/31_control_valves/qet_directory b/elements/50_pneumatic/31_control_valves/qet_directory
index 7e3a170c0..f2d4e17df 100644
--- a/elements/50_pneumatic/31_control_valves/qet_directory
+++ b/elements/50_pneumatic/31_control_valves/qet_directory
@@ -11,5 +11,6 @@
Stuurkleppen 2 standen
Βαλβίδες ελέγχου
Styre ventiler
+ 制御弁
diff --git a/elements/50_pneumatic/45_valves/qet_directory b/elements/50_pneumatic/45_valves/qet_directory
index 2380e9760..d644451f4 100644
--- a/elements/50_pneumatic/45_valves/qet_directory
+++ b/elements/50_pneumatic/45_valves/qet_directory
@@ -10,5 +10,6 @@
Βαλβίδες
Kleppen
Ventiler
+ 弁
diff --git a/elements/50_pneumatic/51_cylinders/qet_directory b/elements/50_pneumatic/51_cylinders/qet_directory
index af0519985..1200df40c 100644
--- a/elements/50_pneumatic/51_cylinders/qet_directory
+++ b/elements/50_pneumatic/51_cylinders/qet_directory
@@ -11,5 +11,6 @@
Cilinders
Έμβολα
Cylindre
+ シリンダ
diff --git a/elements/50_pneumatic/61_drives/qet_directory b/elements/50_pneumatic/61_drives/qet_directory
index 7409d60e8..169386a2b 100644
--- a/elements/50_pneumatic/61_drives/qet_directory
+++ b/elements/50_pneumatic/61_drives/qet_directory
@@ -9,5 +9,6 @@
Aandrijvingen
Pohony
Drev
+ 駆動
diff --git a/elements/50_pneumatic/81_air_treatment/qet_directory b/elements/50_pneumatic/81_air_treatment/qet_directory
index e76074a34..47fbac94a 100644
--- a/elements/50_pneumatic/81_air_treatment/qet_directory
+++ b/elements/50_pneumatic/81_air_treatment/qet_directory
@@ -11,5 +11,6 @@
Luchtbehandeling
Διαχείριση αέρα
Trykluft
+ 空気処理
diff --git a/elements/50_pneumatic/91_vacuum/qet_directory b/elements/50_pneumatic/91_vacuum/qet_directory
index 8a534c96d..31446811e 100644
--- a/elements/50_pneumatic/91_vacuum/qet_directory
+++ b/elements/50_pneumatic/91_vacuum/qet_directory
@@ -10,5 +10,6 @@
Vacuum
Υποπίεση
Vakuum
+ 真空
diff --git a/elements/50_pneumatic/95_lines&connections/qet_directory b/elements/50_pneumatic/95_lines&connections/qet_directory
index 2e5541867..84cdabd6c 100644
--- a/elements/50_pneumatic/95_lines&connections/qet_directory
+++ b/elements/50_pneumatic/95_lines&connections/qet_directory
@@ -11,5 +11,6 @@
Verbindingen
Σύνδεσμοι σωλήνων
Rør og fittings
+ 線と接続
diff --git a/elements/50_pneumatic/qet_directory b/elements/50_pneumatic/qet_directory
index 9c510ac19..8851f8134 100644
--- a/elements/50_pneumatic/qet_directory
+++ b/elements/50_pneumatic/qet_directory
@@ -11,5 +11,6 @@
Pneumatiek
Пневматика
Pneumatik
+ 空気圧
diff --git a/elements/60_energy/11_water/qet_directory b/elements/60_energy/11_water/qet_directory
index 925938d85..d9bfed5f9 100644
--- a/elements/60_energy/11_water/qet_directory
+++ b/elements/60_energy/11_water/qet_directory
@@ -9,5 +9,6 @@
Acqua
Voda
VVS teknik
+ 水
diff --git a/elements/60_energy/21_refrigeration/qet_directory b/elements/60_energy/21_refrigeration/qet_directory
index 593b4efd9..5122431ae 100644
--- a/elements/60_energy/21_refrigeration/qet_directory
+++ b/elements/60_energy/21_refrigeration/qet_directory
@@ -11,5 +11,6 @@
Ψύξη
Koelers
Køle teknik
+ 冷凍機
diff --git a/elements/60_energy/31_solar_thermal/qet_directory b/elements/60_energy/31_solar_thermal/qet_directory
index ac5097916..0f667779c 100644
--- a/elements/60_energy/31_solar_thermal/qet_directory
+++ b/elements/60_energy/31_solar_thermal/qet_directory
@@ -11,5 +11,6 @@
Ηλιακή θέρμανση
Zon thermisch
Sol og varme teknik
+ 太陽熱
diff --git a/elements/60_energy/41__manufacturers_articles/qet_directory b/elements/60_energy/41__manufacturers_articles/qet_directory
index bdf51771e..6b0c54419 100644
--- a/elements/60_energy/41__manufacturers_articles/qet_directory
+++ b/elements/60_energy/41__manufacturers_articles/qet_directory
@@ -9,5 +9,6 @@
Articulos de fabricantes
Articles constructeurs
Producent produkter
+ 製品
diff --git a/elements/60_energy/qet_directory b/elements/60_energy/qet_directory
index f07615fbf..4b9e86195 100644
--- a/elements/60_energy/qet_directory
+++ b/elements/60_energy/qet_directory
@@ -12,5 +12,6 @@
Energie
Сантехника
Energi teknik
+ エネルギー
diff --git a/misc/translations_stat.pl b/misc/translations_stat.pl
index c3971011c..6783f79c4 100755
--- a/misc/translations_stat.pl
+++ b/misc/translations_stat.pl
@@ -203,7 +203,7 @@ our %languages = (
'qt' => 1
},
'ja' => {
- 'name' => '日本人',
+ 'name' => '日本語',
'french_name' => 'Japonais',
'translator_name' => 'Yuki',
'translator_mail_ml' => 'yuki.atoh@gmail.com',
diff --git a/sources/ElementsCollection/elementcollectionhandler.cpp b/sources/ElementsCollection/elementcollectionhandler.cpp
index 653516593..ad35b6a45 100644
--- a/sources/ElementsCollection/elementcollectionhandler.cpp
+++ b/sources/ElementsCollection/elementcollectionhandler.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "elementcollectionhandler.h"
#include "renamedialog.h"
@@ -25,7 +25,8 @@
/******************************************************/
-ECHStrategy::ECHStrategy(ElementsLocation &source, ElementsLocation &destination) :
+ECHStrategy::ECHStrategy(ElementsLocation &source,
+ ElementsLocation &destination) :
m_source(source),
m_destination (destination)
{}
@@ -298,9 +299,9 @@ ElementsLocation ECHSToXml::copy()
/******************************************************/
/**
- * @brief ElementCollectionHandler::ElementCollectionHandler
- * @param widget
- */
+ @brief ElementCollectionHandler::ElementCollectionHandler
+ @param widget
+*/
ElementCollectionHandler::ElementCollectionHandler() {}
ElementCollectionHandler::~ElementCollectionHandler()
@@ -309,14 +310,14 @@ ElementCollectionHandler::~ElementCollectionHandler()
}
/**
- * @brief ElementCollectionHandler::copy
- * Copy the content of collection represented by source to the collection represented by destination.
- * Destination must be a directory, else the copy do nothing and return a null ElementLocation
- * if destination have an item with the same name of source, a dialog ask to user what to do.
- * @param source
- * @param destination
- * @return
- */
+ @brief ElementCollectionHandler::copy
+ Copy the content of collection represented by source to the collection represented by destination.
+ Destination must be a directory, else the copy do nothing and return a null ElementLocation
+ if destination have an item with the same name of source, a dialog ask to user what to do.
+ @param source
+ @param destination
+ @return
+*/
ElementsLocation ElementCollectionHandler::copy(ElementsLocation &source, ElementsLocation &destination)
{
if (!source.exist() || !destination.exist() || destination.isElement()) return ElementsLocation();
@@ -332,14 +333,14 @@ ElementsLocation ElementCollectionHandler::copy(ElementsLocation &source, Elemen
}
/**
- * @brief ElementCollectionHandler::createDir
- * Create a directorie with name @name as child of @parent.
- * Parent must be a directory
- * @param parent : parent of the dir to create
- * @param name : name of directorie to create
- * @param name_list : translations of the directorie name
- * @return : ElementsLocation that represent the new directorie, location can be null if an error was occurred
- */
+ @brief ElementCollectionHandler::createDir
+ Create a directorie with name @name as child of @parent.
+ Parent must be a directory
+ @param parent : parent of the dir to create
+ @param name : name of directorie to create
+ @param name_list : translations of the directorie name
+ @return : ElementsLocation that represent the new directorie, location can be null if an error was occurred
+*/
ElementsLocation ElementCollectionHandler::createDir(ElementsLocation &parent, const QString &name, const NamesList &name_list)
{
//Parent must be a directorie and writable
@@ -393,13 +394,13 @@ ElementsLocation ElementCollectionHandler::createDir(ElementsLocation &parent, c
}
/**
- * @brief ElementCollectionHandler::importFromProject
- * Import the element represented by @location to the embedded collection of @project at the same path.
- * @location must represente an element owned by a project embedded collection
- * @param project : project where copy the element
- * @param location : location to copy
- * @return true if import with success
- */
+ @brief ElementCollectionHandler::importFromProject
+ Import the element represented by @location to the embedded collection of @project at the same path.
+ @location must represente an element owned by a project embedded collection
+ @param project : project where copy the element
+ @param location : location to copy
+ @return true if import with success
+*/
bool ElementCollectionHandler::importFromProject(QETProject *project, ElementsLocation &location)
{
if (!(location.isElement() && location.exist() && location.isProject())) return false;
@@ -436,12 +437,12 @@ bool ElementCollectionHandler::importFromProject(QETProject *project, ElementsLo
}
/**
- * @brief ElementCollectionHandler::setNames
- * Set the names stored in @name_list as the names of the item represented by location
- * @param location : location to change the names
- * @param name_list : NamesList to use
- * @return return true if success
- */
+ @brief ElementCollectionHandler::setNames
+ Set the names stored in @name_list as the names of the item represented by location
+ @param location : location to change the names
+ @param name_list : NamesList to use
+ @return return true if success
+*/
bool ElementCollectionHandler::setNames(ElementsLocation &location, const NamesList &name_list)
{
if ( !(location.exist() && location.isWritable()) ) {
diff --git a/sources/ElementsCollection/elementcollectionhandler.h b/sources/ElementsCollection/elementcollectionhandler.h
index 0bad24579..14128e7f9 100644
--- a/sources/ElementsCollection/elementcollectionhandler.h
+++ b/sources/ElementsCollection/elementcollectionhandler.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef ELEMENTCOLLECTIONHANDLER_H
#define ELEMENTCOLLECTIONHANDLER_H
@@ -24,79 +24,105 @@
class QWidget;
/**
- * @brief The ECHStrategy class
- * Abstract class for manage copy of directory or element from a collection to another
- */
+ @brief The ECHStrategy class
+ Abstract class for manage copy of directory
+ or element from a collection to another
+*/
class ECHStrategy
{
- public:
- ECHStrategy(ElementsLocation &source, ElementsLocation &destination);
- virtual ~ECHStrategy();
+ public:
+ ECHStrategy(ElementsLocation &source,
+ ElementsLocation &destination);
+ virtual ~ECHStrategy();
virtual ElementsLocation copy() =0;
ElementsLocation m_source, m_destination;
};
/**
- * @brief The ECHSFileToFile class
- * Manage the copy of directory or element from a file system collection to another file system collection
- */
+ @brief The ECHSFileToFile class
+ Manage the copy of directory or element from a file system collection
+ to another file system collection
+*/
class ECHSFileToFile : public ECHStrategy
-{
- public:
- ECHSFileToFile (ElementsLocation &source, ElementsLocation &destination);
- ElementsLocation copy() override;
-
- private:
- ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, const QString& rename = QString());
- ElementsLocation copyElement(ElementsLocation &source, ElementsLocation &destination, const QString& rename = QString());
-};
-
-/**
- * @brief The ECHSXmlToFile class
- * Manage the copy of a directory or element from an xml collection to a file.
- */
-class ECHSXmlToFile : public ECHStrategy
{
public:
- ECHSXmlToFile (ElementsLocation &source, ElementsLocation &destination);
+ ECHSFileToFile (ElementsLocation &source,
+ ElementsLocation &destination);
ElementsLocation copy() override;
private:
- ElementsLocation copyDirectory(ElementsLocation &source, ElementsLocation &destination, const QString& rename = QString());
- ElementsLocation copyElement(ElementsLocation &source, ElementsLocation &destination, const QString& rename = QString());
+ ElementsLocation copyDirectory(
+ ElementsLocation &source,
+ ElementsLocation &destination,
+ const QString& rename = QString());
+ ElementsLocation copyElement(
+ ElementsLocation &source,
+ ElementsLocation &destination,
+ const QString& rename = QString());
};
/**
- * @brief The ECHSToXml class
- * Manage the copy of a directory or element from a collection (no matter if the source is a file system collection or an xml collection)
- * to an xml collection
- */
+ @brief The ECHSXmlToFile class
+ Manage the copy of a directory or element from an xml collection
+ to a file.
+*/
+class ECHSXmlToFile : public ECHStrategy
+{
+ public:
+ ECHSXmlToFile (ElementsLocation &source,
+ ElementsLocation &destination);
+ ElementsLocation copy() override;
+
+ private:
+ ElementsLocation copyDirectory(
+ ElementsLocation &source,
+ ElementsLocation &destination,
+ const QString& rename = QString());
+ ElementsLocation copyElement(
+ ElementsLocation &source,
+ ElementsLocation &destination,
+ const QString& rename = QString());
+};
+
+/**
+ @brief The ECHSToXml class
+ Manage the copy of a directory or element from a collection
+ (no matter if the source is a file system collection
+ or an xml collection)
+ to an xml collection
+*/
class ECHSToXml : public ECHStrategy
{
public:
- ECHSToXml (ElementsLocation &source, ElementsLocation &destination);
+ ECHSToXml (ElementsLocation &source,
+ ElementsLocation &destination);
ElementsLocation copy() override;
};
/**
- * @brief The ElementCollectionHandler class
- * Provide several method to copy element or directory from a collection
- * to another collection.
- */
+ @brief The ElementCollectionHandler class
+ Provide several method to copy element or directory from a collection
+ to another collection.
+*/
class ElementCollectionHandler
{
- public:
- ElementCollectionHandler();
- ~ElementCollectionHandler();
+ public:
+ ElementCollectionHandler();
+ ~ElementCollectionHandler();
- ElementsLocation copy(ElementsLocation &source, ElementsLocation &destination);
- ElementsLocation createDir(ElementsLocation &parent, const QString &name, const NamesList &name_list);
- bool importFromProject (QETProject *project, ElementsLocation &location);
- bool setNames(ElementsLocation &location, const NamesList &name_list);
+ ElementsLocation copy(ElementsLocation &source,
+ ElementsLocation &destination);
+ ElementsLocation createDir(ElementsLocation &parent,
+ const QString &name,
+ const NamesList &name_list);
+ bool importFromProject (QETProject *project,
+ ElementsLocation &location);
+ bool setNames(ElementsLocation &location,
+ const NamesList &name_list);
- private:
- ECHStrategy *m_strategy = nullptr;
+ private:
+ ECHStrategy *m_strategy = nullptr;
};
#endif // ELEMENTCOLLECTIONHANDLER_H
diff --git a/sources/ElementsCollection/elementcollectionitem.cpp b/sources/ElementsCollection/elementcollectionitem.cpp
index c6da9b3d7..7a9f70c59 100644
--- a/sources/ElementsCollection/elementcollectionitem.cpp
+++ b/sources/ElementsCollection/elementcollectionitem.cpp
@@ -19,16 +19,16 @@
#include "elementcollectionitem.h"
/**
- * @brief ElementCollectionItem::ElementCollectionItem
- * Constructor
- */
+ @brief ElementCollectionItem::ElementCollectionItem
+ Constructor
+*/
ElementCollectionItem::ElementCollectionItem()
{}
/**
- * @brief ElementCollectionItem::clearData
- * Reset the data
- */
+ @brief ElementCollectionItem::clearData
+ Reset the data
+*/
void ElementCollectionItem::clearData()
{
setText(QString());
@@ -38,13 +38,13 @@ void ElementCollectionItem::clearData()
}
/**
- * @brief ElementCollectionItem::lastItemForPath
- * Return the last existing item in this ElementCollectionItem hierarchy according to the given path.
- * Next_item is the first non existing item in this hierarchy according to the given path.
- * @param path : The path to find last item. The path must be in form : path/otherPath/.../.../myElement.elmt.
- * @param no_found_path : The first item that not exist in this hierarchy
- * @return : The last item that exist in this hierarchy, or nullptr can't find (an error was occurred, or path already exist)
- */
+ @brief ElementCollectionItem::lastItemForPath
+ Return the last existing item in this ElementCollectionItem hierarchy according to the given path.
+ Next_item is the first non existing item in this hierarchy according to the given path.
+ @param path : The path to find last item. The path must be in form : path/otherPath/.../.../myElement.elmt.
+ @param no_found_path : The first item that not exist in this hierarchy
+ @return : The last item that exist in this hierarchy, or nullptr can't find (an error was occurred, or path already exist)
+*/
ElementCollectionItem *ElementCollectionItem::lastItemForPath(const QString &path, QString &no_found_path)
{
QStringList str_list = path.split("/");
@@ -67,11 +67,11 @@ ElementCollectionItem *ElementCollectionItem::lastItemForPath(const QString &pat
}
/**
- * @brief ElementCollectionItem::childWithCollectionName
- * Return the child with the collection name @name, else return nullptr
- * @param name
- * @return
- */
+ @brief ElementCollectionItem::childWithCollectionName
+ Return the child with the collection name @name, else return nullptr
+ @param name
+ @return
+*/
ElementCollectionItem *ElementCollectionItem::childWithCollectionName(const QString& name) const
{
rowCount();
@@ -85,10 +85,10 @@ ElementCollectionItem *ElementCollectionItem::childWithCollectionName(const QStr
}
/**
- * @brief ElementCollectionItem::directChilds
- * Return the direct child of this item
- * @return
- */
+ @brief ElementCollectionItem::directChilds
+ Return the direct child of this item
+ @return
+*/
QList ElementCollectionItem::directChilds() const
{
QList item_list;
@@ -100,12 +100,12 @@ QList ElementCollectionItem::directChilds() const
}
/**
- * @brief ElementCollectionItem::rowForInsertItem
- * Return the row for insert a new child item to this item with name @collection_name.
- * If row can't be found (collection_name is null, or already exist) return -1;
- * @param collection_name
- * @return
- */
+ @brief ElementCollectionItem::rowForInsertItem
+ Return the row for insert a new child item to this item with name @collection_name.
+ If row can't be found (collection_name is null, or already exist) return -1;
+ @param collection_name
+ @return
+*/
int ElementCollectionItem::rowForInsertItem(const QString &name)
{
if (name.isEmpty())
@@ -137,10 +137,10 @@ int ElementCollectionItem::rowForInsertItem(const QString &name)
}
/**
- * @brief ElementCollectionItem::itemAtPath
- * @param path
- * @return the item at path or nullptr if doesn't exist
- */
+ @brief ElementCollectionItem::itemAtPath
+ @param path
+ @return the item at path or nullptr if doesn't exist
+*/
ElementCollectionItem *ElementCollectionItem::itemAtPath(const QString &path)
{
QStringList str_list = path.split("/");
@@ -160,9 +160,9 @@ ElementCollectionItem *ElementCollectionItem::itemAtPath(const QString &path)
}
/**
- * @brief ElementCollectionItem::elementsDirectChild
- * @return The direct element child of this item
- */
+ @brief ElementCollectionItem::elementsDirectChild
+ @return The direct element child of this item
+*/
QList ElementCollectionItem::elementsDirectChild() const
{
QList element_child;
@@ -177,9 +177,9 @@ QList ElementCollectionItem::elementsDirectChild() cons
}
/**
- * @brief ElementCollectionItem::directoriesDirectChild
- * @return the direct directory child of this item
- */
+ @brief ElementCollectionItem::directoriesDirectChild
+ @return the direct directory child of this item
+*/
QList ElementCollectionItem::directoriesDirectChild() const
{
QList dir_child;
@@ -194,9 +194,9 @@ QList ElementCollectionItem::directoriesDirectChild() c
}
/**
- * @brief ElementCollectionItem::elementsChild
- * @return Every elements child (direct and indirect) of this item
- */
+ @brief ElementCollectionItem::elementsChild
+ @return Every elements child (direct and indirect) of this item
+*/
QList ElementCollectionItem::elementsChild() const
{
QList list = elementsDirectChild();
@@ -208,9 +208,9 @@ QList ElementCollectionItem::elementsChild() const
}
/**
- * @brief ElementCollectionItem::directoriesChild
- * @return Every directories child (direct and indirect) of this item
- */
+ @brief ElementCollectionItem::directoriesChild
+ @return Every directories child (direct and indirect) of this item
+*/
QList ElementCollectionItem::directoriesChild() const
{
QList list = directoriesDirectChild();
@@ -224,9 +224,9 @@ QList ElementCollectionItem::directoriesChild() const
}
/**
- * @brief ElementCollectionItem::items
- * @return every childs of this item (direct and indirect childs)
- */
+ @brief ElementCollectionItem::items
+ @return every childs of this item (direct and indirect childs)
+*/
QList ElementCollectionItem::items() const
{
QList list;
diff --git a/sources/ElementsCollection/elementcollectionitem.h b/sources/ElementsCollection/elementcollectionitem.h
index f84ebd3aa..2e092ed6d 100644
--- a/sources/ElementsCollection/elementcollectionitem.h
+++ b/sources/ElementsCollection/elementcollectionitem.h
@@ -21,11 +21,11 @@
#include
/**
- * @brief The ElementCollectionItem class
- * This class represent a item (a directory or an element) in a element collection.
- * This class must be herited for specialisation.
- * This item is used by ElementsCollectionModel for manage the elements collection
- */
+ @brief The ElementCollectionItem class
+ This class represent a item (a directory or an element) in a element collection.
+ This class must be herited for specialisation.
+ This item is used by ElementsCollectionModel for manage the elements collection
+*/
class ElementCollectionItem : public QStandardItem
{
public:
diff --git a/sources/ElementsCollection/elementscollectionmodel.cpp b/sources/ElementsCollection/elementscollectionmodel.cpp
index 54193c79a..4dfb2284a 100644
--- a/sources/ElementsCollection/elementscollectionmodel.cpp
+++ b/sources/ElementsCollection/elementscollectionmodel.cpp
@@ -99,15 +99,15 @@ QStringList ElementsCollectionModel::mimeTypes() const
}
/**
- * @brief ElementsCollectionModel::canDropMimeData
- * Reimplemented from QStandardItemModel
- * @param data
- * @param action
- * @param row
- * @param column
- * @param parent
- * @return
- */
+ @brief ElementsCollectionModel::canDropMimeData
+ Reimplemented from QStandardItemModel
+ @param data
+ @param action
+ @param row
+ @param column
+ @param parent
+ @return
+*/
bool ElementsCollectionModel::canDropMimeData(const QMimeData *data,
Qt::DropAction action,
int row,
diff --git a/sources/ElementsCollection/elementscollectionwidget.cpp b/sources/ElementsCollection/elementscollectionwidget.cpp
index 308150307..f3acc4ee4 100644
--- a/sources/ElementsCollection/elementscollectionwidget.cpp
+++ b/sources/ElementsCollection/elementscollectionwidget.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "elementscollectionwidget.h"
#include "elementscollectionmodel.h"
@@ -38,10 +38,10 @@
#include
/**
- * @brief ElementsCollectionWidget::ElementsCollectionWidget
- * Default constructor.
- * @param parent : parent widget of this widget.
- */
+ @brief ElementsCollectionWidget::ElementsCollectionWidget
+ Default constructor.
+ @param parent : parent widget of this widget.
+*/
ElementsCollectionWidget::ElementsCollectionWidget(QWidget *parent):
QWidget(parent),
m_model(nullptr)
@@ -66,9 +66,9 @@ ElementsCollectionWidget::ElementsCollectionWidget(QWidget *parent):
}
/**
- * @brief ElementsCollectionWidget::expandFirstItems
- * Expand each first item in the tree view
- */
+ @brief ElementsCollectionWidget::expandFirstItems
+ Expand each first item in the tree view
+*/
void ElementsCollectionWidget::expandFirstItems()
{
if (!m_model)
@@ -79,10 +79,10 @@ void ElementsCollectionWidget::expandFirstItems()
}
/**
- * @brief ElementsCollectionWidget::addProject
- * Add @project to be displayed
- * @param project
- */
+ @brief ElementsCollectionWidget::addProject
+ Add @project to be displayed
+ @param project
+*/
void ElementsCollectionWidget::addProject(QETProject *project)
{
if (m_model)
@@ -103,10 +103,10 @@ void ElementsCollectionWidget::removeProject(QETProject *project) {
}
/**
- * @brief ElementsCollectionWidget::highlightUnusedElement
- * highlight the unused element
- * @See ElementsCollectionModel::highlightUnusedElement()
- */
+ @brief ElementsCollectionWidget::highlightUnusedElement
+ highlight the unused element
+ @See ElementsCollectionModel::highlightUnusedElement()
+*/
void ElementsCollectionWidget::highlightUnusedElement()
{
if (m_model)
@@ -114,17 +114,19 @@ void ElementsCollectionWidget::highlightUnusedElement()
}
/**
- * @brief ElementsCollectionWidget::setCurrentLocation
- * Set the current item to be the item for @location
- * @param location
- */
-void ElementsCollectionWidget::setCurrentLocation(const ElementsLocation &location)
+ @brief ElementsCollectionWidget::setCurrentLocation
+ Set the current item to be the item for @location
+ @param location
+*/
+void ElementsCollectionWidget::setCurrentLocation(
+ const ElementsLocation &location)
{
if (!location.exist())
return;
- if (m_model)
- m_tree_view->setCurrentIndex(m_model->indexFromLocation(location));
+ if (m_model)
+ m_tree_view->setCurrentIndex(
+ m_model->indexFromLocation(location));
}
void ElementsCollectionWidget::leaveEvent(QEvent *event)
@@ -137,26 +139,38 @@ void ElementsCollectionWidget::leaveEvent(QEvent *event)
void ElementsCollectionWidget::setUpAction()
{
- m_open_dir = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this);
- m_edit_element = new QAction(QET::Icons::ElementEdit, tr("Éditer l'élément"), this);
- m_delete_element = new QAction(QET::Icons::ElementDelete, tr("Supprimer l'élément"), this);
- m_delete_dir = new QAction(QET::Icons::FolderDelete, tr("Supprimer le dossier"), this);
- m_reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger les collections"), this);
- m_edit_dir = new QAction(QET::Icons::FolderEdit, tr("Éditer le dossier"), this);
- m_new_directory = new QAction(QET::Icons::FolderNew, tr("Nouveau dossier"), this);
- m_new_element = new QAction(QET::Icons::ElementNew, tr("Nouvel élément"), this);
- m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis, tr("Afficher uniquement ce dossier"), this);
- m_show_all_dir = new QAction(QET::Icons::FolderShowAll, tr("Afficher tous les dossiers"), this);
- m_dir_propertie = new QAction(QET::Icons::FolderProperties, tr("Propriété du dossier"), this);
+ m_open_dir = new QAction(QET::Icons::FolderOpen,
+ tr("Ouvrir le dossier correspondant"), this);
+ m_edit_element = new QAction(QET::Icons::ElementEdit,
+ tr("Éditer l'élément"), this);
+ m_delete_element = new QAction(QET::Icons::ElementDelete,
+ tr("Supprimer l'élément"), this);
+ m_delete_dir = new QAction(QET::Icons::FolderDelete,
+ tr("Supprimer le dossier"), this);
+ m_reload = new QAction(QET::Icons::ViewRefresh,
+ tr("Recharger les collections"), this);
+ m_edit_dir = new QAction(QET::Icons::FolderEdit,
+ tr("Éditer le dossier"), this);
+ m_new_directory = new QAction(QET::Icons::FolderNew,
+ tr("Nouveau dossier"), this);
+ m_new_element = new QAction(QET::Icons::ElementNew,
+ tr("Nouvel élément"), this);
+ m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis,
+ tr("Afficher uniquement ce dossier"),
+ this);
+ m_show_all_dir = new QAction(QET::Icons::FolderShowAll,
+ tr("Afficher tous les dossiers"), this);
+ m_dir_propertie = new QAction(QET::Icons::FolderProperties,
+ tr("Propriété du dossier"), this);
}
/**
- * @brief ElementsCollectionWidget::setUpWidget
- * Setup this widget
- */
+ @brief ElementsCollectionWidget::setUpWidget
+ Setup this widget
+*/
void ElementsCollectionWidget::setUpWidget()
{
- //Setup the main layout
+ //Setup the main layout
m_main_vlayout = new QVBoxLayout(this);
this->setLayout(m_main_vlayout);
@@ -165,7 +179,7 @@ void ElementsCollectionWidget::setUpWidget()
m_search_field->setClearButtonEnabled(true);
m_main_vlayout->addWidget(m_search_field);
- //Setup the tree view
+ //Setup the tree view
m_tree_view = new ElementsTreeView(this);
m_tree_view->setHeaderHidden(true);
m_tree_view->setIconSize(QSize(50, 50));
@@ -177,7 +191,7 @@ void ElementsCollectionWidget::setUpWidget()
m_tree_view->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
m_main_vlayout->addWidget(m_tree_view);
- //Setup the progress bar
+ //Setup the progress bar
m_progress_bar = new QProgressBar(this);
m_progress_bar->setFormat(QObject::tr("chargement %p% (%v sur %m)"));
@@ -188,31 +202,49 @@ void ElementsCollectionWidget::setUpWidget()
}
/**
- * @brief ElementsCollectionWidget::setUpConnection
- * Setup the connection used in this widget
- */
+ @brief ElementsCollectionWidget::setUpConnection
+ Setup the connection used in this widget
+*/
void ElementsCollectionWidget::setUpConnection()
{
- connect(m_tree_view, &QTreeView::customContextMenuRequested, this, &ElementsCollectionWidget::customContextMenu);
- connect(m_search_field, &QLineEdit::textEdited, [this]() {m_search_timer.start();});
- connect(&m_search_timer, &QTimer::timeout, this, &ElementsCollectionWidget::search);
- connect(m_open_dir, &QAction::triggered, this, &ElementsCollectionWidget::openDir);
- connect(m_edit_element, &QAction::triggered, this, &ElementsCollectionWidget::editElement);
- connect(m_delete_element, &QAction::triggered, this, &ElementsCollectionWidget::deleteElement);
- connect(m_delete_dir, &QAction::triggered, this, &ElementsCollectionWidget::deleteDirectory);
- connect(m_reload, &QAction::triggered, this, &ElementsCollectionWidget::reload);
- connect(m_edit_dir, &QAction::triggered, this, &ElementsCollectionWidget::editDirectory);
- connect(m_new_directory, &QAction::triggered, this, &ElementsCollectionWidget::newDirectory);
- connect(m_new_element, &QAction::triggered, this, &ElementsCollectionWidget::newElement);
- connect(m_show_this_dir, &QAction::triggered, this, &ElementsCollectionWidget::showThisDir);
- connect(m_show_all_dir, &QAction::triggered, this, &ElementsCollectionWidget::resetShowThisDir);
- connect(m_dir_propertie, &QAction::triggered, this, &ElementsCollectionWidget::dirProperties);
+ connect(m_tree_view, &QTreeView::customContextMenuRequested,
+ this, &ElementsCollectionWidget::customContextMenu);
+ connect(m_search_field, &QLineEdit::textEdited,
+ [this]() {m_search_timer.start();});
+ connect(&m_search_timer, &QTimer::timeout,
+ this, &ElementsCollectionWidget::search);
+ connect(m_open_dir, &QAction::triggered,
+ this, &ElementsCollectionWidget::openDir);
+ connect(m_edit_element, &QAction::triggered,
+ this, &ElementsCollectionWidget::editElement);
+ connect(m_delete_element, &QAction::triggered,
+ this, &ElementsCollectionWidget::deleteElement);
+ connect(m_delete_dir, &QAction::triggered,
+ this, &ElementsCollectionWidget::deleteDirectory);
+ connect(m_reload, &QAction::triggered,
+ this, &ElementsCollectionWidget::reload);
+ connect(m_edit_dir, &QAction::triggered,
+ this, &ElementsCollectionWidget::editDirectory);
+ connect(m_new_directory, &QAction::triggered,
+ this, &ElementsCollectionWidget::newDirectory);
+ connect(m_new_element, &QAction::triggered,
+ this, &ElementsCollectionWidget::newElement);
+ connect(m_show_this_dir, &QAction::triggered,
+ this, &ElementsCollectionWidget::showThisDir);
+ connect(m_show_all_dir, &QAction::triggered,
+ this, &ElementsCollectionWidget::resetShowThisDir);
+ connect(m_dir_propertie, &QAction::triggered,
+ this, &ElementsCollectionWidget::dirProperties);
- connect(m_tree_view, &QTreeView::doubleClicked, [this](const QModelIndex &index) {
- this->m_index_at_context_menu = index ;
- this->editElement();});
+ connect(m_tree_view, &QTreeView::doubleClicked,
+ [this](const QModelIndex &index)
+ {
+ this->m_index_at_context_menu = index ;
+ this->editElement();
+ });
- connect(m_tree_view, &QTreeView::entered, [this] (const QModelIndex &index) {
+ connect(m_tree_view, &QTreeView::entered,
+ [this] (const QModelIndex &index) {
QETDiagramEditor *qde = QETApp::diagramEditorAncestorOf(this);
ElementCollectionItem *eci = elementCollectionItemForIndex(index);
if (qde && eci)
@@ -221,10 +253,10 @@ void ElementsCollectionWidget::setUpConnection()
}
/**
- * @brief ElementsCollectionWidget::customContextMenu
- * Display the context menu of this widget at @point
- * @param point
- */
+ @brief ElementsCollectionWidget::customContextMenu
+ Display the context menu of this widget at point
+ @param point
+*/
void ElementsCollectionWidget::customContextMenu(const QPoint &point)
{
m_index_at_context_menu = m_tree_view->indexAt(point);
@@ -232,7 +264,8 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
m_context_menu->clear();
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
+ ElementCollectionItem *eci = elementCollectionItemForIndex(
+ m_index_at_context_menu);
bool add_open_dir = false;
if (eci->isElement())
@@ -241,7 +274,8 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
if (eci->type() == FileElementCollectionItem::Type)
{
add_open_dir = true;
- FileElementCollectionItem *feci = static_cast(eci);
+ FileElementCollectionItem *feci =
+ static_cast(eci);
if (!feci->isCommonCollection())
{
if (feci->isDir())
@@ -260,7 +294,8 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
}
if (eci->type() == XmlProjectElementCollectionItem::Type)
{
- XmlProjectElementCollectionItem *xpeci = static_cast(eci);
+ XmlProjectElementCollectionItem *xpeci =
+ static_cast(eci);
if (xpeci->isCollectionRoot())
add_open_dir = true;
}
@@ -269,7 +304,7 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
if (eci->isDir())
{
m_context_menu->addAction(m_show_this_dir);
- //there is a current filtered dir, add entry to reset it
+ //there is a current filtered dir, add entry to reset it
if (m_showed_index.isValid())
m_context_menu->addAction(m_show_all_dir);
@@ -283,12 +318,13 @@ void ElementsCollectionWidget::customContextMenu(const QPoint &point)
}
/**
- * @brief ElementsCollectionWidget::openDir
- * Open the directory represented by the current selected item
- */
+ @brief ElementsCollectionWidget::openDir
+ Open the directory represented by the current selected item
+*/
void ElementsCollectionWidget::openDir()
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
+ ElementCollectionItem *eci =
+ elementCollectionItemForIndex(m_index_at_context_menu);
if (!eci) return;
if (eci->type() == FileElementCollectionItem::Type)
@@ -309,9 +345,9 @@ void ElementsCollectionWidget::openDir()
}
/**
- * @brief ElementsCollectionWidget::editElement
- * Edit the element represented by the current selected item
- */
+ @brief ElementsCollectionWidget::editElement
+ Edit the element represented by the current selected item
+*/
void ElementsCollectionWidget::editElement()
{
ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
@@ -324,86 +360,112 @@ void ElementsCollectionWidget::editElement()
app->openElementLocations(QList() << location);
foreach (QETElementEditor *element_editor, app->elementEditors())
- connect(element_editor, &QETElementEditor::saveToLocation, this, &ElementsCollectionWidget::locationWasSaved);
+ connect(element_editor,
+ &QETElementEditor::saveToLocation,
+ this,
+ &ElementsCollectionWidget::locationWasSaved);
}
/**
- * @brief ElementsCollectionWidget::deleteElement
- * Delete the element represented by the current selected item.
- */
+ @brief ElementsCollectionWidget::deleteElement
+ Delete the element represented by the current selected item.
+*/
void ElementsCollectionWidget::deleteElement()
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
+ ElementCollectionItem *eci = elementCollectionItemForIndex(
+ m_index_at_context_menu);
if (!eci) return;
ElementsLocation loc(eci->collectionPath());
- if (! (loc.isElement() && loc.exist() && loc.isFileSystem() && loc.collectionPath().startsWith("custom://")) ) return;
+ if (! (loc.isElement()
+ && loc.exist()
+ && loc.isFileSystem()
+ && loc.collectionPath().startsWith("custom://")) ) return;
- if (QET::QetMessageBox::question(this,
- tr("Supprimer l'élément ?", "message box title"),
- tr("Êtes-vous sûr de vouloir supprimer cet élément ?\n", "message box content"),
- QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
+ if (QET::QetMessageBox::question(
+ this,
+ tr("Supprimer l'élément ?", "message box title"),
+ tr("Êtes-vous sûr de vouloir supprimer cet élément ?\n",
+ "message box content"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
{
QFile file(loc.fileSystemPath());
if (file.remove())
{
- m_model->removeRows(m_index_at_context_menu.row(), 1, m_index_at_context_menu.parent());
+ m_model->removeRows(m_index_at_context_menu.row(),
+ 1,
+ m_index_at_context_menu.parent());
}
else
{
- QET::QetMessageBox::warning(this,
- tr("Suppression de l'élément", "message box title"),
- tr("La suppression de l'élément a échoué.", "message box content"));
+ QET::QetMessageBox::warning(
+ this,
+ tr("Suppression de l'élément",
+ "message box title"),
+ tr("La suppression de l'élément a échoué.",
+ "message box content"));
}
}
}
/**
- * @brief ElementsCollectionWidget::deleteDirectory
- * Delete directory represented by the current selected item
- */
+ @brief ElementsCollectionWidget::deleteDirectory
+ Delete directory represented by the current selected item
+*/
void ElementsCollectionWidget::deleteDirectory()
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
+ ElementCollectionItem *eci = elementCollectionItemForIndex(
+ m_index_at_context_menu);
if (!eci) return;
ElementsLocation loc (eci->collectionPath());
- if (! (loc.isDirectory() && loc.exist() && loc.isFileSystem() && loc.collectionPath().startsWith("custom://")) ) return;
+ if (! (loc.isDirectory()
+ && loc.exist()
+ && loc.isFileSystem()
+ && loc.collectionPath().startsWith("custom://")) ) return;
- if (QET::QetMessageBox::question(this,
- tr("Supprimer le dossier?", "message box title"),
- tr("Êtes-vous sûr de vouloir supprimer le dossier ?\n"
- "Tout les éléments et les dossier contenus dans ce dossier seront supprimés.",
- "message box content"),
- QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
+ if (QET::QetMessageBox::question(
+ this,
+ tr("Supprimer le dossier?", "message box title"),
+ tr("Êtes-vous sûr de vouloir supprimer le dossier ?\n"
+ "Tout les éléments et les dossier contenus dans ce dossier seront supprimés.",
+ "message box content"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)
{
QDir dir (loc.fileSystemPath());
if (dir.removeRecursively())
{
- m_model->removeRows(m_index_at_context_menu.row(), 1, m_index_at_context_menu.parent());
+ m_model->removeRows(m_index_at_context_menu.row(),
+ 1,
+ m_index_at_context_menu.parent());
}
else
{
- QET::QetMessageBox::warning(this,
- tr("Suppression du dossier", "message box title"),
- tr("La suppression du dossier a échoué.", "message box content"));
+ QET::QetMessageBox::warning(
+ this,
+ tr("Suppression du dossier",
+ "message box title"),
+ tr("La suppression du dossier a échoué.",
+ "message box content"));
}
}
}
/**
- * @brief ElementsCollectionWidget::editDirectory
- * Edit the directory represented by the current selected item
- */
+ @brief ElementsCollectionWidget::editDirectory
+ Edit the directory represented by the current selected item
+*/
void ElementsCollectionWidget::editDirectory()
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
+ ElementCollectionItem *eci = elementCollectionItemForIndex(
+ m_index_at_context_menu);
if (eci->type() != FileElementCollectionItem::Type) return;
- FileElementCollectionItem *feci = static_cast(eci);
+ FileElementCollectionItem *feci =
+ static_cast(eci);
if(feci->isCommonCollection()) return;
ElementsLocation location(feci->collectionPath());
@@ -414,16 +476,18 @@ void ElementsCollectionWidget::editDirectory()
}
/**
- * @brief ElementsCollectionWidget::newDirectory
- * Create a new directory
- */
+ @brief ElementsCollectionWidget::newDirectory
+ Create a new directory
+*/
void ElementsCollectionWidget::newDirectory()
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
+ ElementCollectionItem *eci = elementCollectionItemForIndex(
+ m_index_at_context_menu);
if (eci->type() != FileElementCollectionItem::Type) return;
- FileElementCollectionItem *feci = static_cast(eci);
+ FileElementCollectionItem *feci =
+ static_cast(eci);
if(feci->isCommonCollection()) return;
ElementsLocation location(feci->collectionPath());
@@ -433,18 +497,20 @@ void ElementsCollectionWidget::newDirectory()
}
/**
- * @brief ElementsCollectionWidget::newElement
- * Create a new element.
- */
+ @brief ElementsCollectionWidget::newElement
+ Create a new element.
+*/
void ElementsCollectionWidget::newElement()
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
+ ElementCollectionItem *eci = elementCollectionItemForIndex(
+ m_index_at_context_menu);
if (eci->type() != FileElementCollectionItem::Type) {
return;
}
- FileElementCollectionItem *feci = static_cast(eci);
+ FileElementCollectionItem *feci =
+ static_cast(eci);
if(feci->isCommonCollection()) {
return;
}
@@ -454,20 +520,25 @@ void ElementsCollectionWidget::newElement()
elmt_wizard.preselectedLocation(loc);
elmt_wizard.exec();
- foreach (QETElementEditor *element_editor, QETApp::instance()->elementEditors())
- connect(element_editor, &QETElementEditor::saveToLocation, this, &ElementsCollectionWidget::locationWasSaved);
+ foreach (QETElementEditor *element_editor,
+ QETApp::instance()->elementEditors())
+ connect(element_editor,
+ &QETElementEditor::saveToLocation,
+ this,
+ &ElementsCollectionWidget::locationWasSaved);
}
/**
- * @brief ElementsCollectionWidget::showThisDir
- * Hide all directories except the pointed dir;
- */
+ @brief ElementsCollectionWidget::showThisDir
+ Hide all directories except the pointed dir;
+*/
void ElementsCollectionWidget::showThisDir()
{
//Disable the yellow background of the previous index
if (m_showed_index.isValid())
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index);
+ ElementCollectionItem *eci =
+ elementCollectionItemForIndex(m_showed_index);
if (eci)
eci->setBackground(QBrush());
}
@@ -477,9 +548,10 @@ void ElementsCollectionWidget::showThisDir()
{
hideCollection(true);
showAndExpandItem(m_showed_index, true, true);
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index);
+ ElementCollectionItem *eci =
+ elementCollectionItemForIndex(m_showed_index);
if (eci)
- eci->setBackground(QBrush(QColor(255, 204, 0, 255)));
+ eci->setBackground(QBrush(QColor(255, 204, 0, 255)));
search();
}
else
@@ -487,15 +559,16 @@ void ElementsCollectionWidget::showThisDir()
}
/**
- * @brief ElementsCollectionWidget::resetShowThisDir
- * reset show this dir, all collection are show.
- * If search field isn't empty, apply the search after show all collection
- */
+ @brief ElementsCollectionWidget::resetShowThisDir
+ reset show this dir, all collection are show.
+ If search field isn't empty, apply the search after show all collection
+*/
void ElementsCollectionWidget::resetShowThisDir()
{
if (m_showed_index.isValid())
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index);
+ ElementCollectionItem *eci = elementCollectionItemForIndex(
+ m_showed_index);
if (eci)
eci->setBackground(QBrush());
}
@@ -505,36 +578,49 @@ void ElementsCollectionWidget::resetShowThisDir()
}
/**
- * @brief ElementsCollectionWidget::dirProperties
- * Open an informative dialog about the curent index
- */
+ @brief ElementsCollectionWidget::dirProperties
+ Open an informative dialog about the curent index
+*/
void ElementsCollectionWidget::dirProperties()
{
- ElementCollectionItem *eci = elementCollectionItemForIndex(m_index_at_context_menu);
+ ElementCollectionItem *eci = elementCollectionItemForIndex(
+ m_index_at_context_menu);
if (eci && eci->isDir()) {
- QString txt1 = tr("Le dossier %1 contient").arg(eci->localName());
- QString txt2 = tr("%n élément(s), répartie(s)", "", eci->elementsChild().size());
- QString txt3 = tr("dans %n dossier(s).", "" , eci->directoriesChild().size());
- QString txt4 = tr("Chemin de la collection : %1").arg(eci->collectionPath());
+ QString txt1 = tr("Le dossier %1 contient").arg(
+ eci->localName());
+ QString txt2 = tr("%n élément(s), répartie(s)",
+ "",
+ eci->elementsChild().size());
+ QString txt3 = tr("dans %n dossier(s).",
+ "" ,
+ eci->directoriesChild().size());
+ QString txt4 = tr("Chemin de la collection : %1").arg(
+ eci->collectionPath());
QString txt5;
if (eci->type() == FileElementCollectionItem::Type) {
- txt5 = tr("Chemin dans le système de fichiers : %1").arg(static_cast(eci)->fileSystemPath());
+ txt5 = tr("Chemin dans le système de fichiers : %1")
+ .arg(static_cast(eci)->fileSystemPath());
}
- QMessageBox::information(this,
- tr("Propriété du dossier %1").arg(eci->localName()),
- txt1 + " " + txt2 + " " + txt3 + "\n\n" + txt4 + "\n" + txt5);
+ QMessageBox::information(
+ this,
+ tr("Propriété du dossier %1").arg(eci->localName()),
+ txt1 + " " + txt2 + " " + txt3 + "\n\n" + txt4 + "\n" + txt5);
}
}
/**
- * @brief ElementsCollectionWidget::reload, the displayed collections.
- */
+ @brief ElementsCollectionWidget::reload, the displayed collections.
+*/
void ElementsCollectionWidget::reload()
{
m_progress_bar->show();
- m_progress_bar->setValue(1); //Force to repaint now, else progress bar will be not displayed immediately
+ // Force to repaint now,
+ // else progress bar will be not displayed immediately
+ m_progress_bar->setValue(1);
m_tree_view->setDisabled(true);
- m_tree_view->repaint(); //Force to repaint now, else tree view will be not disabled immediately
+ // Force to repaint now,
+ // else tree view will be not disabled immediately
+ m_tree_view->repaint();
QList project_list;
project_list.append(m_waiting_project);
@@ -546,17 +632,26 @@ void ElementsCollectionWidget::reload()
m_new_model->deleteLater();
}
m_new_model = new ElementsCollectionModel(m_tree_view);
- connect(m_new_model, &ElementsCollectionModel::loadingProgressRangeChanged, m_progress_bar, &QProgressBar::setRange);
- connect(m_new_model, &ElementsCollectionModel::loadingProgressValueChanged, m_progress_bar, &QProgressBar::setValue);
- connect(m_new_model, &ElementsCollectionModel::loadingFinished, this, &ElementsCollectionWidget::loadingFinished);
+ connect(m_new_model,
+ &ElementsCollectionModel::loadingProgressRangeChanged,
+ m_progress_bar,
+ &QProgressBar::setRange);
+ connect(m_new_model,
+ &ElementsCollectionModel::loadingProgressValueChanged,
+ m_progress_bar,
+ &QProgressBar::setValue);
+ connect(m_new_model,
+ &ElementsCollectionModel::loadingFinished,
+ this,
+ &ElementsCollectionWidget::loadingFinished);
m_new_model->loadCollections(true, true, project_list);
}
/**
- * @brief ElementsCollectionWidget::loadingFinished
- * Process when collection finished to be loaded
- */
+ @brief ElementsCollectionWidget::loadingFinished
+ Process when collection finished to be loaded
+*/
void ElementsCollectionWidget::loadingFinished()
{
if (m_new_model)
@@ -579,15 +674,17 @@ void ElementsCollectionWidget::loadingFinished()
}
/**
- * @brief ElementsCollectionWidget::locationWasSaved
- * This method is connected with the signal savedToLocation of Element editor (see ElementsCollectionWidget::editElement())
- * Update or add the item represented by location to m_model
- * @param location
- */
-void ElementsCollectionWidget::locationWasSaved(const ElementsLocation& location)
+ @brief ElementsCollectionWidget::locationWasSaved
+ This method is connected with the signal savedToLocation
+ of Element editor (see ElementsCollectionWidget::editElement())
+ Update or add the item represented by location to m_model
+ @param location
+*/
+void ElementsCollectionWidget::locationWasSaved(
+ const ElementsLocation& location)
{
- //Because this method update an item in the model, location must
- //represente an existing element (in file system of project)
+ //Because this method update an item in the model, location must
+ //represente an existing element (in file system of project)
if (!location.exist())
return;
@@ -606,10 +703,11 @@ void ElementsCollectionWidget::locationWasSaved(const ElementsLocation& location
}
/**
- * @brief ElementsCollectionWidget::search
- * Search every item (directory or element) that match the text of m_search_field
- * and display it, other item who does not match @text is hidden
- */
+ @brief ElementsCollectionWidget::search
+ Search every item (directory or element)
+ that match the text of m_search_field and display it,
+ other item who does not match text is hidden
+*/
void ElementsCollectionWidget::search()
{
QString text = m_search_field->text();
@@ -627,7 +725,7 @@ void ElementsCollectionWidget::search()
else
expandFirstItems();
- //Expand the tree and scroll to the last selected index
+ //Expand the tree and scroll to the last selected index
if (current_index.isValid())
{
showAndExpandItem(current_index);
@@ -646,8 +744,14 @@ void ElementsCollectionWidget::search()
#endif
QModelIndexList match_index;
foreach (QString txt, text_list) {
- match_index << m_model->match(m_showed_index.isValid() ? m_model->index(0,0,m_showed_index) : m_model->index(0,0),
- Qt::UserRole+1, QVariant(txt), -1, Qt::MatchContains | Qt::MatchRecursive);
+ match_index << m_model->match(m_showed_index.isValid()
+ ? m_model->index(0,0,m_showed_index)
+ : m_model->index(0,0),
+ Qt::UserRole+1,
+ QVariant(txt),
+ -1,
+ Qt::MatchContains
+ | Qt::MatchRecursive);
}
foreach(QModelIndex index, match_index)
@@ -655,10 +759,10 @@ void ElementsCollectionWidget::search()
}
/**
- * @brief ElementsCollectionWidget::hideCollection
- * Hide all collection displayed in this tree
- * @param hide- true = hide , false = visible
- */
+ @brief ElementsCollectionWidget::hideCollection
+ Hide all collection displayed in this tree
+ @param hide- true = hide , false = visible
+*/
void ElementsCollectionWidget::hideCollection(bool hide)
{
for (int i=0 ; i rowCount() ; i++)
@@ -666,13 +770,16 @@ void ElementsCollectionWidget::hideCollection(bool hide)
}
/**
- * @brief ElementsCollectionWidget::hideItem
- * Hide the item @index. If @recursive is true, hide all subchilds of @index
- * @param hide- true = hide , false = visible
- * @param index- index to hide
- * @param recursive- true = apply to child , false = only for @index
- */
-void ElementsCollectionWidget::hideItem(bool hide, const QModelIndex &index, bool recursive)
+ @brief ElementsCollectionWidget::hideItem
+ Hide the item index. If @recursive is true,
+ hide all subchilds of index
+ @param hide- true = hide , false = visible
+ @param index- index to hide
+ @param recursive- true = apply to child , false = only for index
+*/
+void ElementsCollectionWidget::hideItem(bool hide,
+ const QModelIndex &index,
+ bool recursive)
{
m_tree_view->setRowHidden(index.row(), index.parent(), hide);
@@ -682,15 +789,17 @@ void ElementsCollectionWidget::hideItem(bool hide, const QModelIndex &index, boo
}
/**
- * @brief ElementsCollectionWidget::showAndExpandItem
- * Show the item @index and expand it.
- * If parent is true, ensure parents of @index is show and expanded
- * If child is true, ensure all childs of @index is show and expended
- * @param index- index to show
- * @param parent- Apply to parent
- * @param child- Apply to all childs
- */
-void ElementsCollectionWidget::showAndExpandItem(const QModelIndex &index, bool parent, bool child)
+ @brief ElementsCollectionWidget::showAndExpandItem
+ Show the item index and expand it.
+ If parent is true, ensure parents of index is show and expanded
+ If child is true, ensure all childs of index is show and expended
+ @param index- index to show
+ @param parent- Apply to parent
+ @param child- Apply to all childs
+*/
+void ElementsCollectionWidget::showAndExpandItem(const QModelIndex &index,
+ bool parent,
+ bool child)
{
if (index.isValid()) {
if (parent)
@@ -702,13 +811,15 @@ void ElementsCollectionWidget::showAndExpandItem(const QModelIndex &index, bool
}
/**
- * @brief ElementsCollectionWidget::elementCollectionItemForIndex
- * @param index
- * @return The internal pointer of index casted to ElementCollectionItem;
- */
-ElementCollectionItem *ElementsCollectionWidget::elementCollectionItemForIndex(const QModelIndex &index) {
+ @brief ElementsCollectionWidget::elementCollectionItemForIndex
+ @param index
+ @return The internal pointer of index casted to ElementCollectionItem;
+*/
+ElementCollectionItem *ElementsCollectionWidget::elementCollectionItemForIndex(
+ const QModelIndex &index) {
if (!index.isValid())
return nullptr;
- return static_cast(m_model->itemFromIndex(index));
+ return static_cast(
+ m_model->itemFromIndex(index));
}
diff --git a/sources/ElementsCollection/elementscollectionwidget.h b/sources/ElementsCollection/elementscollectionwidget.h
index 2f5c37b6d..4b3bb74a1 100644
--- a/sources/ElementsCollection/elementscollectionwidget.h
+++ b/sources/ElementsCollection/elementscollectionwidget.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef ELEMENTSCOLLECTIONWIDGET_H
#define ELEMENTSCOLLECTIONWIDGET_H
@@ -34,19 +34,19 @@ class QETProject;
class ElementsTreeView;
/**
- * @brief The ElementsCollectionWidget class
- * This widget embedd a tree view that display the element collection (common, custom, embedded)
- * and all action needed to use this widget.
- * This is the element collection widget used in the diagram editor.
- */
+ @brief The ElementsCollectionWidget class
+ This widget embedd a tree view that display the element collection (common, custom, embedded)
+ and all action needed to use this widget.
+ This is the element collection widget used in the diagram editor.
+*/
class ElementsCollectionWidget : public QWidget
{
- Q_OBJECT
+ Q_OBJECT
- public:
- ElementsCollectionWidget(QWidget *parent = nullptr);
+ public:
+ ElementsCollectionWidget(QWidget *parent = nullptr);
- void expandFirstItems();
+ void expandFirstItems();
void addProject (QETProject *project);
void removeProject (QETProject *project);
diff --git a/sources/ElementsCollection/elementslocation.cpp b/sources/ElementsCollection/elementslocation.cpp
index 40d55ce0e..87d1bc477 100644
--- a/sources/ElementsCollection/elementslocation.cpp
+++ b/sources/ElementsCollection/elementslocation.cpp
@@ -125,7 +125,7 @@ bool ElementsLocation::operator!=(const ElementsLocation &other) const {
this method don't return the extension name.
For exemple if this location represent an element they return myElement.
@see fileName()
- */
+*/
QString ElementsLocation::baseName() const {
QRegExp regexp("^.*([^/]+)\\.elmt$");
if (regexp.exactMatch(m_collection_path)) {
diff --git a/sources/ElementsCollection/elementstreeview.cpp b/sources/ElementsCollection/elementstreeview.cpp
index b04f473bf..53d50257e 100644
--- a/sources/ElementsCollection/elementstreeview.cpp
+++ b/sources/ElementsCollection/elementstreeview.cpp
@@ -29,18 +29,18 @@ static int MAX_DND_PIXMAP_WIDTH = 500;
static int MAX_DND_PIXMAP_HEIGHT = 375;
/**
- * @brief ElementsTreeView::ElementsTreeView
- * @param parent
- */
+ @brief ElementsTreeView::ElementsTreeView
+ @param parent
+*/
ElementsTreeView::ElementsTreeView(QWidget *parent) :
QTreeView(parent)
{}
/**
- * @brief ElementsTreeView::startDrag
- * Reimplemented from QTreeView
- * @param supportedActions
- */
+ @brief ElementsTreeView::startDrag
+ Reimplemented from QTreeView
+ @param supportedActions
+*/
void ElementsTreeView::startDrag(Qt::DropActions supportedActions)
{
QModelIndex index = currentIndex();
@@ -63,10 +63,10 @@ void ElementsTreeView::startDrag(Qt::DropActions supportedActions)
}
/**
- * @brief ElementsTreeView::startElementDrag
- * Build a QDrag according to the content of @location
- * @param location : location to use for create the content of the QDrag
- */
+ @brief ElementsTreeView::startElementDrag
+ Build a QDrag according to the content of @location
+ @param location : location to use for create the content of the QDrag
+*/
void ElementsTreeView::startElementDrag(const ElementsLocation &location)
{
if (!location.exist())
diff --git a/sources/ElementsCollection/elementstreeview.h b/sources/ElementsCollection/elementstreeview.h
index d864f4ab9..333f843ff 100644
--- a/sources/ElementsCollection/elementstreeview.h
+++ b/sources/ElementsCollection/elementstreeview.h
@@ -23,11 +23,11 @@
class ElementsLocation;
/**
- * @brief The ElementsTreeView class
- * This class just reimplement startDrag from QTreeView, for set a custom pixmap.
- * This class must be used when the tree view have an ElementsCollectionModel as model.
- * The pixmap used is the pixmap of the dragged element or a directory pixmap.
- */
+ @brief The ElementsTreeView class
+ This class just reimplement startDrag from QTreeView, for set a custom pixmap.
+ This class must be used when the tree view have an ElementsCollectionModel as model.
+ The pixmap used is the pixmap of the dragged element or a directory pixmap.
+*/
class ElementsTreeView : public QTreeView
{
public:
diff --git a/sources/ElementsCollection/fileelementcollectionitem.h b/sources/ElementsCollection/fileelementcollectionitem.h
index b5992bbeb..57f5221f4 100644
--- a/sources/ElementsCollection/fileelementcollectionitem.h
+++ b/sources/ElementsCollection/fileelementcollectionitem.h
@@ -22,10 +22,10 @@
#include "elementslocation.h"
/**
- * @brief The FileElementCollectionItem class
- * This class specialise ElementCollectionItem for manage a collection in
- * a file system. They represente a directory or an element.
- */
+ @brief The FileElementCollectionItem class
+ This class specialise ElementCollectionItem for manage a collection in
+ a file system. They represente a directory or an element.
+*/
class FileElementCollectionItem : public ElementCollectionItem
{
public:
diff --git a/sources/ElementsCollection/ui/renamedialog.cpp b/sources/ElementsCollection/ui/renamedialog.cpp
index a1621299e..09b4feaf1 100644
--- a/sources/ElementsCollection/ui/renamedialog.cpp
+++ b/sources/ElementsCollection/ui/renamedialog.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "renamedialog.h"
@@ -21,12 +21,12 @@
#include "ui_renamedialog.h"
RenameDialog::RenameDialog(QString path, QWidget *parent) :
- QDialog(parent),
- ui(new Ui::RenameDialog),
- m_path(std::move(path))
+ QDialog(parent),
+ ui(new Ui::RenameDialog),
+ m_path(std::move(path))
{
- ui->setupUi(this);
- m_name = m_path.split("/").last();
+ ui->setupUi(this);
+ m_name = m_path.split("/").last();
if (m_name.endsWith(".elmt")) m_name.remove(".elmt");
ui->m_label->setText(tr("L'élément « %1 » existe déjà. Que souhaitez-vous faire ?").arg(m_path));
ui->lineEdit->setText(m_name + QDate::currentDate().toString("dd-MM-yy"));
@@ -34,14 +34,14 @@ RenameDialog::RenameDialog(QString path, QWidget *parent) :
RenameDialog::~RenameDialog()
{
- delete ui;
+ delete ui;
}
void RenameDialog::on_lineEdit_textEdited(const QString &arg1)
{
- if (arg1.isEmpty() || (arg1 == m_name))
+ if (arg1.isEmpty() || (arg1 == m_name))
ui->m_rename_pb->setDisabled(true);
- else
+ else
ui->m_rename_pb->setEnabled(true);
}
diff --git a/sources/ElementsCollection/ui/renamedialog.h b/sources/ElementsCollection/ui/renamedialog.h
index 74e3d5d47..9f22d2ae5 100644
--- a/sources/ElementsCollection/ui/renamedialog.h
+++ b/sources/ElementsCollection/ui/renamedialog.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef RENAMEDIALOG_H
#define RENAMEDIALOG_H
@@ -27,25 +27,25 @@ namespace Ui {
class RenameDialog : public QDialog
{
- Q_OBJECT
+ Q_OBJECT
- public:
- explicit RenameDialog(QString path, QWidget *parent = nullptr);
- ~RenameDialog() override;
+ public:
+ explicit RenameDialog(QString path, QWidget *parent = nullptr);
+ ~RenameDialog() override;
QString newName() const {return m_new_name;}
QET::Action selectedAction() const {return m_action;}
- private slots:
- void on_lineEdit_textEdited(const QString &arg1);
+ private slots:
+ void on_lineEdit_textEdited(const QString &arg1);
void on_m_erase_pb_clicked();
void on_m_rename_pb_clicked();
void on_m_cancel_pb_clicked();
private:
- Ui::RenameDialog *ui;
- QString m_path;
- QString m_name;
+ Ui::RenameDialog *ui;
+ QString m_path;
+ QString m_name;
QString m_new_name;
QET::Action m_action;
};
diff --git a/sources/ElementsCollection/xmlelementcollection.cpp b/sources/ElementsCollection/xmlelementcollection.cpp
index 7fab4e958..b9884e2fc 100644
--- a/sources/ElementsCollection/xmlelementcollection.cpp
+++ b/sources/ElementsCollection/xmlelementcollection.cpp
@@ -22,16 +22,16 @@
#include "qetproject.h"
/**
- * @brief XmlElementCollection::XmlElementCollection
- * Build an empty collection.
- * The collection start by :
+ @brief XmlElementCollection::XmlElementCollection
+ Build an empty collection.
+ The collection start by :
*
*
- * @param project : the project of this collection
- */
+ All elements and category are stored as child of XmlElementCollection::directories(const QDomElement &parent_element) const
{
QList directory_list;
@@ -194,10 +194,10 @@ QList XmlElementCollection::directories(const QDomElement &parent_e
}
/**
- * @brief XmlElementCollection::directoriesNames
- * @param parent_element
- * @return a list of names for every child directories of @parent_element
- */
+ @brief XmlElementCollection::directoriesNames
+ @param parent_element
+ @return a list of names for every child directories of @parent_element
+*/
QStringList XmlElementCollection::directoriesNames(const QDomElement &parent_element) const
{
QList childs = directories(parent_element);
@@ -214,10 +214,10 @@ QStringList XmlElementCollection::directoriesNames(const QDomElement &parent_ele
}
/**
- * @brief XmlElementCollection::elements
- * @param parent_element
- * @return A list of element stored in @parent_element
- */
+ @brief XmlElementCollection::elements
+ @param parent_element
+ @return A list of element stored in @parent_element
+*/
QList XmlElementCollection::elements(const QDomElement &parent_element) const
{
QList element_list;
@@ -235,10 +235,10 @@ QList XmlElementCollection::elements(const QDomElement &parent_elem
}
/**
- * @brief XmlElementCollection::elementsNames
- * @param parent_element
- * @return A list of names fr every childs element of @parent_element
- */
+ @brief XmlElementCollection::elementsNames
+ @param parent_element
+ @return A list of names fr every childs element of @parent_element
+*/
QStringList XmlElementCollection::elementsNames(const QDomElement &parent_element) const
{
QList childs = elements(parent_element);
@@ -255,11 +255,11 @@ QStringList XmlElementCollection::elementsNames(const QDomElement &parent_elemen
}
/**
- * @brief XmlElementCollection::element
- * @param path : path of the element in this collection
- * @return the QDomElement that represent the element at path @path
- * or a null QDomElement if not found or doesn't represent an element
- */
+ @brief XmlElementCollection::element
+ @param path : path of the element in this collection
+ @return the QDomElement that represent the element at path @path
+ or a null QDomElement if not found or doesn't represent an element
+*/
QDomElement XmlElementCollection::element(const QString &path) const
{
if (!path.endsWith(".elmt")) return QDomElement();
@@ -273,11 +273,11 @@ QDomElement XmlElementCollection::element(const QString &path) const
}
/**
- * @brief XmlElementCollection::directory
- * @param path : path of the directory in this collection
- * @return the QDomElement that represent the directory at path @path
- * or a null QDomElement if not found.
- */
+ @brief XmlElementCollection::directory
+ @param path : path of the directory in this collection
+ @return the QDomElement that represent the directory at path @path
+ or a null QDomElement if not found.
+*/
QDomElement XmlElementCollection::directory(const QString &path) const
{
QDomElement directory = child(path);
@@ -289,15 +289,15 @@ QDomElement XmlElementCollection::directory(const QString &path) const
}
/**
- * @brief XmlElementCollection::addElement
- * Add the element at location to this collection.
- * The element is copied in this collection in "import" dir with the same path, in other word
- * if the path is dir1/dir2/dir3/myElement.elmt, myElement is copied to this collection at the path : import/dir1/dir2/dir3/myElement.elmt
- * If the path doesn't exist, he was created.
- * If the element already exist, do nothing.
- * @param location, location of the element
- * @return the collection path of the added item or a null QString if element can't be added.
- */
+ @brief XmlElementCollection::addElement
+ Add the element at location to this collection.
+ The element is copied in this collection in "import" dir with the same path, in other word
+ if the path is dir1/dir2/dir3/myElement.elmt, myElement is copied to this collection at the path : import/dir1/dir2/dir3/myElement.elmt
+ If the path doesn't exist, he was created.
+ If the element already exist, do nothing.
+ @param location, location of the element
+ @return the collection path of the added item or a null QString if element can't be added.
+*/
QString XmlElementCollection::addElement(ElementsLocation &location)
{
//location must be an element and exist
@@ -423,15 +423,15 @@ QString XmlElementCollection::addElement(ElementsLocation &location)
}
/**
- * @brief XmlElementCollection::addElementDefinition
- * Add the élément defintion @xml_definition in the directory at path @dir_path with the name @elmt_name.
- * @param dir_path : the path of the directory where we must add the element.
- * The path must be an existing directory of this collection.
- * @param elmt_name : The name used to store the element (the name must end with .elmt, if not, .elmt will be append to @elmt_name)
- * @param xml_definition : The xml definition of the element.
- * The tag name of @xml_definition must be "definition".
- * @return True if the element is added with success.
- */
+ @brief XmlElementCollection::addElementDefinition
+ Add the élément defintion @xml_definition in the directory at path @dir_path with the name @elmt_name.
+ @param dir_path : the path of the directory where we must add the element.
+ The path must be an existing directory of this collection.
+ @param elmt_name : The name used to store the element (the name must end with .elmt, if not, .elmt will be append to @elmt_name)
+ @param xml_definition : The xml definition of the element.
+ The tag name of @xml_definition must be "definition".
+ @return True if the element is added with success.
+*/
bool XmlElementCollection::addElementDefinition(const QString &dir_path, const QString &elmt_name, const QDomElement &xml_definition)
{
QDomElement dom_dir = directory(dir_path);
@@ -461,12 +461,12 @@ bool XmlElementCollection::addElementDefinition(const QString &dir_path, const Q
}
/**
- * @brief XmlElementCollection::removeElement
- * Remove the element at path @path.
- * @param path
- * @return True if element is removed and emit the signal elementRemoved.
- * else false.
- */
+ @brief XmlElementCollection::removeElement
+ Remove the element at path @path.
+ @param path
+ @return True if element is removed and emit the signal elementRemoved.
+ else false.
+*/
bool XmlElementCollection::removeElement(const QString& path)
{
QDomElement elmt = element(path);
@@ -481,16 +481,16 @@ bool XmlElementCollection::removeElement(const QString& path)
}
/**
- * @brief XmlElementCollection::copy
- * Copy the content represented by source (an element or a directory) to destination.
- * Destination must be a directory of this collection.
- * If the destination already have an item at the same path of source, he will be replaced by source.
- * @param source : content to copy
- * @param destination : destination of the copy, must be a directory of this collection
- * @param rename : rename the copy with @rename else use the name of source
- * @param deep_copy : if true copy all childs of source (only if source is directory)
- * @return the ElementLocation that represent the copy, if copy failed return a null ElementLocation
- */
+ @brief XmlElementCollection::copy
+ Copy the content represented by source (an element or a directory) to destination.
+ Destination must be a directory of this collection.
+ If the destination already have an item at the same path of source, he will be replaced by source.
+ @param source : content to copy
+ @param destination : destination of the copy, must be a directory of this collection
+ @param rename : rename the copy with @rename else use the name of source
+ @param deep_copy : if true copy all childs of source (only if source is directory)
+ @return the ElementLocation that represent the copy, if copy failed return a null ElementLocation
+*/
ElementsLocation XmlElementCollection::copy(ElementsLocation &source, ElementsLocation &destination, const QString& rename, bool deep_copy)
{
if (!(source.exist() && destination.isDirectory() && destination.isProject() && destination.projectCollection() == this))
@@ -503,11 +503,11 @@ ElementsLocation XmlElementCollection::copy(ElementsLocation &source, ElementsLo
}
/**
- * @brief XmlElementCollection::exist
- * Return true if the path @path exist in this collection
- * @param path
- * @return
- */
+ @brief XmlElementCollection::exist
+ Return true if the path @path exist in this collection
+ @param path
+ @return
+*/
bool XmlElementCollection::exist(const QString &path) const
{
if (child(path).isNull())
@@ -517,14 +517,14 @@ bool XmlElementCollection::exist(const QString &path) const
}
/**
- * @brief XmlElementCollection::createDir
- * Create a child directorie at path @path with the name @name.
- * Emit directorieAdded if success.
- * @param path : path of parent diectorie
- * @param name : name of the directori to create.
- * @param name_list : translation of the directorie name.
- * @return true if creation success, if directorie already exist return true.
- */
+ @brief XmlElementCollection::createDir
+ Create a child directorie at path @path with the name @name.
+ Emit directorieAdded if success.
+ @param path : path of parent diectorie
+ @param name : name of the directori to create.
+ @param name_list : translation of the directorie name.
+ @return true if creation success, if directorie already exist return true.
+*/
bool XmlElementCollection::createDir(const QString& path, const QString& name, const NamesList &name_list)
{
QString new_dir_path = path + "/" + name;
@@ -551,12 +551,12 @@ bool XmlElementCollection::createDir(const QString& path, const QString& name, c
}
/**
- * @brief XmlElementCollection::removeDir
- * Remove the directory at path @path.
- * @param path
- * @return true if successfuly removed and emit directoryRemoved(QString),
- * else false.
- */
+ @brief XmlElementCollection::removeDir
+ Remove the directory at path @path.
+ @param path
+ @return true if successfuly removed and emit directoryRemoved(QString),
+ else false.
+*/
bool XmlElementCollection::removeDir(const QString& path)
{
QDomElement dir = directory(path);
@@ -569,14 +569,14 @@ bool XmlElementCollection::removeDir(const QString& path)
}
/**
- * @brief XmlElementCollection::elementsLocation
- * Return all locations stored in dom_element (element and directory).
- * If dom_element is null, return all location owned by this collection
- * dom_element must be a child of this collection.
- * @param dom_element : dom_element where we must to search location.
- * @param childs = if true return all childs location of dom_element, if false, only return the direct childs location of dom_element.
- * @return
- */
+ @brief XmlElementCollection::elementsLocation
+ Return all locations stored in dom_element (element and directory).
+ If dom_element is null, return all location owned by this collection
+ dom_element must be a child of this collection.
+ @param dom_element : dom_element where we must to search location.
+ @param childs = if true return all childs location of dom_element, if false, only return the direct childs location of dom_element.
+ @return
+*/
QList XmlElementCollection::elementsLocation(QDomElement dom_element, bool childs) const
{
QList location_list;
@@ -612,13 +612,13 @@ QList XmlElementCollection::elementsLocation(QDomElement dom_e
}
/**
- * @brief XmlElementCollection::domToLocation
- * Return the element location who represent the xml element : dom_element
- * dom_element must be owned by this collection
- * @param dom_element : the dom_element of this collection that represent an element.
- * The tag name of dom_element must be "element"
- * @return the element location, location can be null if fail.
- */
+ @brief XmlElementCollection::domToLocation
+ Return the element location who represent the xml element : dom_element
+ dom_element must be owned by this collection
+ @param dom_element : the dom_element of this collection that represent an element.
+ The tag name of dom_element must be "element"
+ @return the element location, location can be null if fail.
+*/
ElementsLocation XmlElementCollection::domToLocation(QDomElement dom_element) const
{
if (dom_element.ownerDocument() == m_dom_document) {
@@ -638,9 +638,9 @@ ElementsLocation XmlElementCollection::domToLocation(QDomElement dom_element) co
}
/**
- * @brief XmlElementCollection::cleanUnusedElement
- * Remove elements in this collection which is not used in the owner project
- */
+ @brief XmlElementCollection::cleanUnusedElement
+ Remove elements in this collection which is not used in the owner project
+*/
void XmlElementCollection::cleanUnusedElement()
{
foreach (ElementsLocation loc, m_project->unusedElements())
@@ -648,9 +648,9 @@ void XmlElementCollection::cleanUnusedElement()
}
/**
- * @brief XmlElementCollection::cleanUnusedDirectory
- * Remove the empty directories of this collection
- */
+ @brief XmlElementCollection::cleanUnusedDirectory
+ Remove the empty directories of this collection
+*/
void XmlElementCollection::cleanUnusedDirectory()
{
QDomNodeList lst = importCategory().elementsByTagName("category");
@@ -666,15 +666,15 @@ void XmlElementCollection::cleanUnusedDirectory()
}
/**
- * @brief XmlElementCollection::copyDirectory
- * Copy the directory represented by source to destination.
- * if destination have a directory with the same name as source, then this directory is removed
- * @param source : directory to copy
- * @param destination : destination of the copy
- * @param rename : rename the copy with @rename else use the name of source
- * @param deep_copy :if true copy all childs of source
- * @return the ElementLocation that represent the copy, if copy failed return a null ElementLocation
- */
+ @brief XmlElementCollection::copyDirectory
+ Copy the directory represented by source to destination.
+ if destination have a directory with the same name as source, then this directory is removed
+ @param source : directory to copy
+ @param destination : destination of the copy
+ @param rename : rename the copy with @rename else use the name of source
+ @param deep_copy :if true copy all childs of source
+ @return the ElementLocation that represent the copy, if copy failed return a null ElementLocation
+*/
ElementsLocation XmlElementCollection::copyDirectory(ElementsLocation &source, ElementsLocation &destination, const QString& rename, bool deep_copy)
{
QString new_dir_name = rename.isEmpty() ? source.fileName() : rename;
@@ -754,14 +754,14 @@ ElementsLocation XmlElementCollection::copyDirectory(ElementsLocation &source, E
}
/**
- * @brief XmlElementCollection::copyElement
- * Copy the element represented by source to destination (must be a directory)
- * If element already exist in destination he will be replaced by the new.
- * @param source : element to copy
- * @param destination : destination of the copy
- * @param rename : rename the copy with @rename else use the name of source
- * @return The ElementsLocation of the copy
- */
+ @brief XmlElementCollection::copyElement
+ Copy the element represented by source to destination (must be a directory)
+ If element already exist in destination he will be replaced by the new.
+ @param source : element to copy
+ @param destination : destination of the copy
+ @param rename : rename the copy with @rename else use the name of source
+ @return The ElementsLocation of the copy
+*/
ElementsLocation XmlElementCollection::copyElement(ElementsLocation &source, ElementsLocation &destination, const QString& rename)
{
QString new_elmt_name = rename.isEmpty() ? source.fileName() : rename;
diff --git a/sources/ElementsCollection/xmlelementcollection.h b/sources/ElementsCollection/xmlelementcollection.h
index 9b5ead121..427eda365 100644
--- a/sources/ElementsCollection/xmlelementcollection.h
+++ b/sources/ElementsCollection/xmlelementcollection.h
@@ -27,9 +27,9 @@ class QFile;
class QETProject;
/**
- * @brief The XmlElementCollection class
- * This class represent a collection of elements stored to xml
- */
+ @brief The XmlElementCollection class
+ This class represent a collection of elements stored to xml
+*/
class XmlElementCollection : public QObject
{
Q_OBJECT
@@ -68,34 +68,34 @@ class XmlElementCollection : public QObject
signals:
/**
- * @brief elementAdded
- * This signal is emited when a element is added to this collection
- * @param collection_path, the path of element in this collection
- */
+ @brief elementAdded
+ This signal is emited when a element is added to this collection
+ @param collection_path, the path of element in this collection
+ */
void elementAdded(QString collection_path);
/**
- * @brief elementChanged
- * This signal is emited when the defintion of the element at path was changed
- * @param collection_path, the path of this element in this collection
- */
+ @brief elementChanged
+ This signal is emited when the defintion of the element at path was changed
+ @param collection_path, the path of this element in this collection
+ */
void elementChanged (QString collection_path);
/**
- * @brief elementRemoved
- * This signal is emited when an element is removed to this collection
- * @param collection_path, the path of the removed element in this collection
- */
+ @brief elementRemoved
+ This signal is emited when an element is removed to this collection
+ @param collection_path, the path of the removed element in this collection
+ */
void elementRemoved(QString collection_path);
/**
- * @brief directorieAdded
- * This signal is emited when a directorie is added to this collection
- * @param collection_path, the path of the new directorie
- */
+ @brief directorieAdded
+ This signal is emited when a directorie is added to this collection
+ @param collection_path, the path of the new directorie
+ */
void directorieAdded(QString collection_path);
/**
- * @brief directoryRemoved
- * This signal is emited when a directory is removed to this collection
- * @param collection_path, the path of the removed directory
- */
+ @brief directoryRemoved
+ This signal is emited when a directory is removed to this collection
+ @param collection_path, the path of the removed directory
+ */
void directoryRemoved(QString collection_path);
private:
diff --git a/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp b/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp
index ed2c53f37..9f1f56b84 100644
--- a/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp
+++ b/sources/ElementsCollection/xmlprojectelementcollectionitem.cpp
@@ -21,16 +21,16 @@
#include "xmlprojectelementcollectionitem.h"
/**
- * @brief XmlProjectElementCollectionItem::XmlProjectElementCollectionItem
- * Constructor
- */
+ @brief XmlProjectElementCollectionItem::XmlProjectElementCollectionItem
+ Constructor
+*/
XmlProjectElementCollectionItem::XmlProjectElementCollectionItem()
{}
/**
- * @brief XmlProjectElementCollectionItem::isDir
- * @return true if this item represent a directory
- */
+ @brief XmlProjectElementCollectionItem::isDir
+ @return true if this item represent a directory
+*/
bool XmlProjectElementCollectionItem::isDir() const
{
if (m_dom_element.tagName() == "category") return true;
@@ -38,9 +38,9 @@ bool XmlProjectElementCollectionItem::isDir() const
}
/**
- * @brief XmlProjectElementCollectionItem::isElement
- * @return true if this item represent an element
- */
+ @brief XmlProjectElementCollectionItem::isElement
+ @return true if this item represent an element
+*/
bool XmlProjectElementCollectionItem::isElement() const
{
if (m_dom_element.tagName() == "element") return true;
@@ -48,9 +48,9 @@ bool XmlProjectElementCollectionItem::isElement() const
}
/**
- * @brief XmlProjectElementCollectionItem::localName
- * @return the located name of this item
- */
+ @brief XmlProjectElementCollectionItem::localName
+ @return the located name of this item
+*/
QString XmlProjectElementCollectionItem::localName()
{
if (!text().isNull())
@@ -71,18 +71,18 @@ QString XmlProjectElementCollectionItem::localName()
}
/**
- * @brief XmlProjectElementCollectionItem::name
- * @return The collection name of this item
- */
+ @brief XmlProjectElementCollectionItem::name
+ @return The collection name of this item
+*/
QString XmlProjectElementCollectionItem::name() const
{
return m_dom_element.attribute("name");
}
/**
- * @brief XmlProjectElementCollectionItem::collectionPath
- * @return The path of this item relative to the collection.
- */
+ @brief XmlProjectElementCollectionItem::collectionPath
+ @return The path of this item relative to the collection.
+*/
QString XmlProjectElementCollectionItem::collectionPath() const
{
ElementsLocation loc (embeddedPath(), m_project);
@@ -93,10 +93,10 @@ QString XmlProjectElementCollectionItem::collectionPath() const
}
/**
- * @brief XmlProjectElementCollectionItem::embeddedPath
- * @return The embedde path of this item
- * The path is in form : embed://dir/subdir/myElement.elmt
- */
+ @brief XmlProjectElementCollectionItem::embeddedPath
+ @return The embedde path of this item
+ The path is in form : embed://dir/subdir/myElement.elmt
+*/
QString XmlProjectElementCollectionItem::embeddedPath() const
{
if (isCollectionRoot())
@@ -114,9 +114,9 @@ QString XmlProjectElementCollectionItem::embeddedPath() const
}
/**
- * @brief XmlProjectElementCollectionItem::isCollectionRoot
- * @return true if this item represent the root of collection
- */
+ @brief XmlProjectElementCollectionItem::isCollectionRoot
+ @return true if this item represent the root of collection
+*/
bool XmlProjectElementCollectionItem::isCollectionRoot() const
{
if (!parent())
@@ -128,11 +128,11 @@ bool XmlProjectElementCollectionItem::isCollectionRoot() const
}
/**
- * @brief XmlProjectElementCollectionItem::addChildAtPath
- * Ask to this item item to add a new child with collection name @collection_name
- * (the child must exist in the xml element collection)
- * @param collection_name : name of the child item to add.
- */
+ @brief XmlProjectElementCollectionItem::addChildAtPath
+ Ask to this item item to add a new child with collection name @collection_name
+ (the child must exist in the xml element collection)
+ @param collection_name : name of the child item to add.
+*/
void XmlProjectElementCollectionItem::addChildAtPath(const QString &collection_name)
{
if (collection_name.isEmpty())
@@ -155,21 +155,21 @@ void XmlProjectElementCollectionItem::addChildAtPath(const QString &collection_n
}
/**
- * @brief XmlProjectElementCollectionItem::project
- * @return the paretn project of the managed collection
- */
+ @brief XmlProjectElementCollectionItem::project
+ @return the paretn project of the managed collection
+*/
QETProject *XmlProjectElementCollectionItem::project() const
{
return m_project;
}
/**
- * @brief XmlProjectElementCollectionItem::setProject
- * Set the project for this item.
- * Use this method for set this item the root of the collection
- * @param project : project to manage the collection
- * @param set_data : if true, call setUpData for every child of this item
- */
+ @brief XmlProjectElementCollectionItem::setProject
+ Set the project for this item.
+ Use this method for set this item the root of the collection
+ @param project : project to manage the collection
+ @param set_data : if true, call setUpData for every child of this item
+*/
void XmlProjectElementCollectionItem::setProject(QETProject *project, bool set_data, bool hide_element)
{
if (m_project)
@@ -181,9 +181,9 @@ void XmlProjectElementCollectionItem::setProject(QETProject *project, bool set_d
}
/**
- * @brief XmlProjectElementCollectionItem::setUpData
- * SetUp the data of this item
- */
+ @brief XmlProjectElementCollectionItem::setUpData
+ SetUp the data of this item
+*/
void XmlProjectElementCollectionItem::setUpData()
{
//Setup the displayed name
@@ -212,10 +212,10 @@ void XmlProjectElementCollectionItem::setUpData()
}
/**
- * @brief XmlProjectElementCollectionItem::setUpIcon
- * SetUp the icon of this item.
- * Because icon use several memory, we use this method for setup icon instead setUpData.
- */
+ @brief XmlProjectElementCollectionItem::setUpIcon
+ SetUp the icon of this item.
+ Because icon use several memory, we use this method for setup icon instead setUpData.
+*/
void XmlProjectElementCollectionItem::setUpIcon()
{
if (!icon().isNull())
@@ -232,10 +232,10 @@ void XmlProjectElementCollectionItem::setUpIcon()
}
/**
- * @brief XmlProjectElementCollectionItem::populate
- * Create the childs of this item
- * @param set_data : if true, call setUpData for every child of this item
- */
+ @brief XmlProjectElementCollectionItem::populate
+ Create the childs of this item
+ @param set_data : if true, call setUpData for every child of this item
+*/
void XmlProjectElementCollectionItem::populate(bool set_data, bool hide_element)
{
QList dom_category = m_project->embeddedElementCollection()->directories(m_dom_element);
@@ -267,12 +267,12 @@ void XmlProjectElementCollectionItem::populate(bool set_data, bool hide_element)
}
/**
- * @brief XmlProjectElementCollectionItem::setXmlElement
- * Set the managed content of this item
- * @param element : the dom element (directory or element), to be managed by this item
- * @param project : the parent project of managed collection
- * @param set_data : if true, call setUpData for every child of this item
- */
+ @brief XmlProjectElementCollectionItem::setXmlElement
+ Set the managed content of this item
+ @param element : the dom element (directory or element), to be managed by this item
+ @param project : the parent project of managed collection
+ @param set_data : if true, call setUpData for every child of this item
+*/
void XmlProjectElementCollectionItem::setXmlElement(const QDomElement& element, QETProject *project, bool set_data, bool hide_element)
{
m_dom_element = element;
diff --git a/sources/ElementsCollection/xmlprojectelementcollectionitem.h b/sources/ElementsCollection/xmlprojectelementcollectionitem.h
index 1a6de5d4e..2a7bbb508 100644
--- a/sources/ElementsCollection/xmlprojectelementcollectionitem.h
+++ b/sources/ElementsCollection/xmlprojectelementcollectionitem.h
@@ -24,9 +24,9 @@
class QETProject;
/**
- * @brief The XmlProjectElementCollectionItem class
- * This class specialise ElementCollectionItem for manage an xml collection embedded in a project.
- */
+ @brief The XmlProjectElementCollectionItem class
+ This class specialise ElementCollectionItem for manage an xml collection embedded in a project.
+*/
class XmlProjectElementCollectionItem : public ElementCollectionItem
{
public:
diff --git a/sources/NameList/nameslist.cpp b/sources/NameList/nameslist.cpp
index fc518c4d5..067307f06 100644
--- a/sources/NameList/nameslist.cpp
+++ b/sources/NameList/nameslist.cpp
@@ -126,15 +126,15 @@ void NamesList::fromXml(const QDomElement &xml_element, const QHash name from an xml description.
- * @xml_element must be the parent of a child element tagged "names"
- * If a couple lang <-> name already exist, they will overwrited, else
- * they will be appened.
- * @param xml_element : xml element to analyze
- * @param xml_options : A set of options related to XML parsing.
- * @see getXmlOptions()
- */
+ @brief NamesList::fromXml
+ Load the list of lang <-> name from an xml description.
+ @xml_element must be the parent of a child element tagged "names"
+ If a couple lang <-> name already exist, they will overwrited, else
+ they will be appened.
+ @param xml_element : xml element to analyze
+ @param xml_options : A set of options related to XML parsing.
+ @see getXmlOptions()
+*/
void NamesList::fromXml(const pugi::xml_node &xml_element, const QHash &xml_options)
{
QHash xml_opt = getXmlOptions(xml_options);
diff --git a/sources/NameList/ui/namelistdialog.cpp b/sources/NameList/ui/namelistdialog.cpp
index 3ded9db89..1f90eed88 100644
--- a/sources/NameList/ui/namelistdialog.cpp
+++ b/sources/NameList/ui/namelistdialog.cpp
@@ -44,10 +44,10 @@ void NameListDialog::setInformationText(const QString &text) {
}
/**
- * @brief NameListDialog::namelistWidget
- * @return the name list widget used by this dialog.
- * The ownership of the namelistwidget stay to this dialog
- */
+ @brief NameListDialog::namelistWidget
+ @return the name list widget used by this dialog.
+ The ownership of the namelistwidget stay to this dialog
+*/
NameListWidget *NameListDialog::namelistWidget() const {
return m_namelist_widget;
}
diff --git a/sources/NameList/ui/namelistdialog.h b/sources/NameList/ui/namelistdialog.h
index 118a8f6d4..35299c04f 100644
--- a/sources/NameList/ui/namelistdialog.h
+++ b/sources/NameList/ui/namelistdialog.h
@@ -27,9 +27,9 @@ namespace Ui {
}
/**
- * @brief The NameListDialog class
- * Provide a dialog for let user define localized string;
- */
+ @brief The NameListDialog class
+ Provide a dialog for let user define localized string;
+*/
class NameListDialog : public QDialog
{
Q_OBJECT
diff --git a/sources/NameList/ui/namelistwidget.cpp b/sources/NameList/ui/namelistwidget.cpp
index 5b3784335..612cc6c82 100644
--- a/sources/NameList/ui/namelistwidget.cpp
+++ b/sources/NameList/ui/namelistwidget.cpp
@@ -36,9 +36,9 @@ NameListWidget::~NameListWidget()
}
/**
- * @brief NameListWidget::addLine
- * Add a new line to the name list widget
- */
+ @brief NameListWidget::addLine
+ Add a new line to the name list widget
+*/
void NameListWidget::addLine()
{
clean();
@@ -53,10 +53,10 @@ void NameListWidget::addLine()
}
/**
- * @brief NameListWidget::setNames
- * Set the current names of this dialog from @name_list
- * @param name_list
- */
+ @brief NameListWidget::setNames
+ Set the current names of this dialog from @name_list
+ @param name_list
+*/
void NameListWidget::setNames(const NamesList &name_list)
{
for (QString lang : name_list.langs())
@@ -74,9 +74,9 @@ void NameListWidget::setNames(const NamesList &name_list)
}
/**
- * @brief NameListWidget::names
- * @return the current name list edited by this dialog
- */
+ @brief NameListWidget::names
+ @return the current name list edited by this dialog
+*/
NamesList NameListWidget::names() const
{
NamesList nl_;
@@ -95,10 +95,10 @@ NamesList NameListWidget::names() const
}
/**
- * @brief NameListWidget::setReadOnly
- * Set this dialog to read only or not.
- * @param ro
- */
+ @brief NameListWidget::setReadOnly
+ Set this dialog to read only or not.
+ @param ro
+*/
void NameListWidget::setReadOnly(bool ro)
{
m_read_only = ro;
@@ -116,10 +116,10 @@ void NameListWidget::setReadOnly(bool ro)
}
/**
- * @brief NameListWidget::isEmpty
- * @return true if empty.
- * An empty dialog, is a dialog without any edited lang.
- */
+ @brief NameListWidget::isEmpty
+ @return true if empty.
+ An empty dialog, is a dialog without any edited lang.
+*/
bool NameListWidget::isEmpty() const {
return names().isEmpty();
}
@@ -142,9 +142,9 @@ void NameListWidget::setClipboardValue(QHash value)
}
/**
- * @brief NameListWidget::clean
- * Clean the lists of names by removing the emtpy lines
- */
+ @brief NameListWidget::clean
+ Clean the lists of names by removing the emtpy lines
+*/
void NameListWidget::clean()
{
int names_count = ui->m_tree->topLevelItemCount() - 1;
diff --git a/sources/NameList/ui/namelistwidget.h b/sources/NameList/ui/namelistwidget.h
index 3bb29bcea..2bd30f531 100644
--- a/sources/NameList/ui/namelistwidget.h
+++ b/sources/NameList/ui/namelistwidget.h
@@ -26,9 +26,9 @@ namespace Ui {
}
/**
- * @brief The NameListWidget class
- * Provide a widget for let user define localized string;
- */
+ @brief The NameListWidget class
+ Provide a widget for let user define localized string;
+*/
class NameListWidget : public QWidget
{
Q_OBJECT
diff --git a/sources/PropertiesEditor/propertieseditordialog.h b/sources/PropertiesEditor/propertieseditordialog.h
index 43d0fab9e..570f64bdf 100644
--- a/sources/PropertiesEditor/propertieseditordialog.h
+++ b/sources/PropertiesEditor/propertieseditordialog.h
@@ -24,16 +24,16 @@
#include
/**
- * @brief The PropertiesEditorDialog class
- * Create a dialog to edit some properties of a thing.
- * Only create a instance of this class and call exec, all is done for you in this class.
- * The first argument (a template) must be a subclass of QWidget and provide the 3 methods bellow :
- * QString::title()
- * void::apply()
- * void::reset()
- * You can subclass the interface PropertiesEditorWidget who provide all this methods.
- * This dialog take ownership of the editor, so the editor will be deleted by this dialog
- */
+ @brief The PropertiesEditorDialog class
+ Create a dialog to edit some properties of a thing.
+ Only create a instance of this class and call exec, all is done for you in this class.
+ The first argument (a template) must be a subclass of QWidget and provide the 3 methods bellow :
+ QString::title()
+ void::apply()
+ void::reset()
+ You can subclass the interface PropertiesEditorWidget who provide all this methods.
+ This dialog take ownership of the editor, so the editor will be deleted by this dialog
+*/
class PropertiesEditorDialog : public QDialog
{
Q_OBJECT
diff --git a/sources/PropertiesEditor/propertieseditordockwidget.cpp b/sources/PropertiesEditor/propertieseditordockwidget.cpp
index d4d80eb03..5ac7cac25 100644
--- a/sources/PropertiesEditor/propertieseditordockwidget.cpp
+++ b/sources/PropertiesEditor/propertieseditordockwidget.cpp
@@ -20,10 +20,10 @@
#include "propertieseditorwidget.h"
/**
- * @brief PropertiesEditorDockWidget::PropertiesEditorDockWidget
- * Constructor
- * @param parent : parent widget
- */
+ @brief PropertiesEditorDockWidget::PropertiesEditorDockWidget
+ Constructor
+ @param parent : parent widget
+*/
PropertiesEditorDockWidget::PropertiesEditorDockWidget(QWidget *parent) :
QDockWidget(parent),
ui(new Ui::PropertiesEditorDockWidget)
@@ -32,9 +32,9 @@ PropertiesEditorDockWidget::PropertiesEditorDockWidget(QWidget *parent) :
}
/**
- * @brief PropertiesEditorDockWidget::~PropertiesEditorDockWidget
- * Destructor
- */
+ @brief PropertiesEditorDockWidget::~PropertiesEditorDockWidget
+ Destructor
+*/
PropertiesEditorDockWidget::~PropertiesEditorDockWidget()
{
clear();
@@ -42,26 +42,26 @@ PropertiesEditorDockWidget::~PropertiesEditorDockWidget()
}
/**
- * @brief PropertiesEditorDockWidget::clear
- * Remove all editor present in this dock and delete it.
- * They also disabled the button box at the bottom of this dock
- */
+ @brief PropertiesEditorDockWidget::clear
+ Remove all editor present in this dock and delete it.
+ They also disabled the button box at the bottom of this dock
+*/
void PropertiesEditorDockWidget::clear()
{
foreach (PropertiesEditorWidget *editor, m_editor_list)
{
m_editor_list.removeOne(editor);
ui->m_main_vlayout->removeWidget(editor);
- delete editor;
+ delete editor;
}
m_editor_list.clear();
}
/**
- * @brief PropertiesEditorDockWidget::apply
- * Call the apply method for each editor present in this dock
- */
+ @brief PropertiesEditorDockWidget::apply
+ Call the apply method for each editor present in this dock
+*/
void PropertiesEditorDockWidget::apply()
{
foreach(PropertiesEditorWidget *editor, m_editor_list)
@@ -69,9 +69,9 @@ void PropertiesEditorDockWidget::apply()
}
/**
- * @brief PropertiesEditorDockWidget::reset
- * Call the reset method for each editor present in this widget
- */
+ @brief PropertiesEditorDockWidget::reset
+ Call the reset method for each editor present in this widget
+*/
void PropertiesEditorDockWidget::reset()
{
foreach(PropertiesEditorWidget *editor, m_editor_list)
@@ -79,14 +79,14 @@ void PropertiesEditorDockWidget::reset()
}
/**
- * @brief PropertiesEditorDockWidget::addEditor
- * Add an @editor in this dock at @index in the main vertical layout (note the button box
- * are displayed at bottom of this layout by default)
- * When an editor is added, we enable the button box
- * @param editor : editor to add;
- * @param index : index of editor in the layout
- * @return true if was added (or already add) or false if can't be add (editor = nullptr)
- */
+ @brief PropertiesEditorDockWidget::addEditor
+ Add an @editor in this dock at @index in the main vertical layout (note the button box
+ are displayed at bottom of this layout by default)
+ When an editor is added, we enable the button box
+ @param editor : editor to add;
+ @param index : index of editor in the layout
+ @return true if was added (or already add) or false if can't be add (editor = nullptr)
+*/
bool PropertiesEditorDockWidget::addEditor(PropertiesEditorWidget *editor, int index)
{
if (!editor) return false;
@@ -98,20 +98,20 @@ bool PropertiesEditorDockWidget::addEditor(PropertiesEditorWidget *editor, int i
}
/**
- * @brief PropertiesEditorDockWidget::editors
- * @return all editor used in this dock
- */
+ @brief PropertiesEditorDockWidget::editors
+ @return all editor used in this dock
+*/
QList PropertiesEditorDockWidget::editors() const {
return m_editor_list;
}
/**
- * @brief PropertiesEditorDockWidget::removeEditor
- * Remove @editor from this dock. The editor wasn't delete a the end of this method
- * If the editor was the last on this widget, we disabled the button box
- * @param editor : editor to remove
- * @return true on success, else false
- */
+ @brief PropertiesEditorDockWidget::removeEditor
+ Remove @editor from this dock. The editor wasn't delete a the end of this method
+ If the editor was the last on this widget, we disabled the button box
+ @param editor : editor to remove
+ @return true on success, else false
+*/
bool PropertiesEditorDockWidget::removeEditor(PropertiesEditorWidget *editor)
{
bool result = m_editor_list.removeOne(editor);
diff --git a/sources/PropertiesEditor/propertieseditorwidget.cpp b/sources/PropertiesEditor/propertieseditorwidget.cpp
index da8f1b07b..a579d9474 100644
--- a/sources/PropertiesEditor/propertieseditorwidget.cpp
+++ b/sources/PropertiesEditor/propertieseditorwidget.cpp
@@ -19,52 +19,52 @@
#include
/**
- * @brief PropertiesEditorWidget::PropertiesEditorWidget
- * Constructor
- * @param parent : parent widget
- */
+ @brief PropertiesEditorWidget::PropertiesEditorWidget
+ Constructor
+ @param parent : parent widget
+*/
PropertiesEditorWidget::PropertiesEditorWidget(QWidget *parent) :
QWidget(parent),
m_live_edit(false)
{}
/**
- * @brief PropertiesEditorWidget::associatedUndo
- * By default, return a nullptr
- * @return nullptr
- */
+ @brief PropertiesEditorWidget::associatedUndo
+ By default, return a nullptr
+ @return nullptr
+*/
QUndoCommand *PropertiesEditorWidget::associatedUndo() const{
return nullptr;
}
/**
- * @brief PropertiesEditorWidget::title
- * @return the title of this editor
- */
+ @brief PropertiesEditorWidget::title
+ @return the title of this editor
+*/
QString PropertiesEditorWidget::title() const {
return QString();
}
/**
- * @brief PropertiesEditorWidget::setLiveEdit
- * Set the editor in live edit mode.
- * When an editor is in live edit mode, every change is applied immediately (no need to call apply).
- * If live edit can be enable, return true, else false.
- * By default this method do nothing and return false (live edit is disable).
- * Herited class of PropertiesEditorWidget must reimplemente this methode to manage the live edit mode.
- * @param live_edit true to enable live edit
- * @return true if live edit is enable, else false.
- */
+ @brief PropertiesEditorWidget::setLiveEdit
+ Set the editor in live edit mode.
+ When an editor is in live edit mode, every change is applied immediately (no need to call apply).
+ If live edit can be enable, return true, else false.
+ By default this method do nothing and return false (live edit is disable).
+ Herited class of PropertiesEditorWidget must reimplemente this methode to manage the live edit mode.
+ @param live_edit true to enable live edit
+ @return true if live edit is enable, else false.
+*/
bool PropertiesEditorWidget::setLiveEdit(bool live_edit) {
Q_UNUSED(live_edit);
return false;
}
/**
- * @brief PropertiesEditorWidget::isLiveEdit
- * @return true if this editor is in live edit mode
- * else return fasle.
- */
+ @brief PropertiesEditorWidget::isLiveEdit
+ @return true if this editor is in live edit mode
+ else return fasle.
+*/
bool PropertiesEditorWidget::isLiveEdit() const {
return m_live_edit;
}
diff --git a/sources/PropertiesEditor/propertieseditorwidget.h b/sources/PropertiesEditor/propertieseditorwidget.h
index 96b994edb..f2575a953 100644
--- a/sources/PropertiesEditor/propertieseditorwidget.h
+++ b/sources/PropertiesEditor/propertieseditorwidget.h
@@ -23,10 +23,10 @@
class QUndoCommand;
/**
- * @brief The PropertiesEditorWidget class
- * This class extend QWidget method for have common way
- * to edit propertie.
- */
+ @brief The PropertiesEditorWidget class
+ This class extend QWidget method for have common way
+ to edit propertie.
+*/
class PropertiesEditorWidget : public QWidget
{
Q_OBJECT
diff --git a/sources/QPropertyUndoCommand/qpropertyundocommand.cpp b/sources/QPropertyUndoCommand/qpropertyundocommand.cpp
index 3ce5ef929..fd7948dc1 100644
--- a/sources/QPropertyUndoCommand/qpropertyundocommand.cpp
+++ b/sources/QPropertyUndoCommand/qpropertyundocommand.cpp
@@ -19,13 +19,13 @@
#include
/**
- * @brief QPropertyUndoCommand::QPropertyUndoCommand
- * Default constructor with old and new value
- * This command don't take ownership of @object
- * @param object
- * @param old_value
- * @param new_value
- */
+ @brief QPropertyUndoCommand::QPropertyUndoCommand
+ Default constructor with old and new value
+ This command don't take ownership of @object
+ @param object
+ @param old_value
+ @param new_value
+*/
QPropertyUndoCommand::QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, const QVariant &new_value, QUndoCommand *parent) :
QUndoCommand(parent),
m_object(object),
@@ -35,14 +35,14 @@ QPropertyUndoCommand::QPropertyUndoCommand(QObject *object, const char *property
{}
/**
- * @brief QPropertyUndoCommand::QPropertyUndoCommand
- * Default constructor with old value.
- * Call setNewValue to setup the new value of the edited QObject
- * This command don't take ownership of @object
- * @param object
- * @param old_value
- * @param parent
- */
+ @brief QPropertyUndoCommand::QPropertyUndoCommand
+ Default constructor with old value.
+ Call setNewValue to setup the new value of the edited QObject
+ This command don't take ownership of @object
+ @param object
+ @param old_value
+ @param parent
+*/
QPropertyUndoCommand::QPropertyUndoCommand(QObject *object, const char *property_name, const QVariant &old_value, QUndoCommand *parent) :
QUndoCommand(parent),
m_object(object),
@@ -62,29 +62,29 @@ QPropertyUndoCommand::QPropertyUndoCommand(const QPropertyUndoCommand *other)
}
/**
- * @brief QPropertyUndoCommand::setNewValue
- * Set the new value of the property (set with redo) to @new_value
- * @param new_value
- */
+ @brief QPropertyUndoCommand::setNewValue
+ Set the new value of the property (set with redo) to @new_value
+ @param new_value
+*/
void QPropertyUndoCommand::setNewValue(const QVariant &new_value) {
m_new_value = new_value;
}
/**
- * @brief QPropertyUndoCommand::enableAnimation
- * True to enable animation
- * @param animate
- */
+ @brief QPropertyUndoCommand::enableAnimation
+ True to enable animation
+ @param animate
+*/
void QPropertyUndoCommand::enableAnimation (bool animate) {
m_animate = animate;
}
/**
- * @brief QPropertyUndoCommand::setAnimated
- * @param animate = true for animate this undo
- * @param first_time = if true, the first animation is done at the first call of redo
- * if false, the first animation is done at the second call of redo.
- */
+ @brief QPropertyUndoCommand::setAnimated
+ @param animate = true for animate this undo
+ @param first_time = if true, the first animation is done at the first call of redo
+ if false, the first animation is done at the second call of redo.
+*/
void QPropertyUndoCommand::setAnimated(bool animate, bool first_time)
{
m_animate = animate;
@@ -92,11 +92,11 @@ void QPropertyUndoCommand::setAnimated(bool animate, bool first_time)
}
/**
- * @brief QPropertyUndoCommand::mergeWith
- * Try to merge this command with other command
- * @param other
- * @return true if was merged, else false
- */
+ @brief QPropertyUndoCommand::mergeWith
+ Try to merge this command with other command
+ @param other
+ @return true if was merged, else false
+*/
bool QPropertyUndoCommand::mergeWith(const QUndoCommand *other)
{
if (id() != other->id() || other->childCount()) return false;
@@ -107,9 +107,9 @@ bool QPropertyUndoCommand::mergeWith(const QUndoCommand *other)
}
/**
- * @brief QPropertyUndoCommand::redo
- * Redo this command
- */
+ @brief QPropertyUndoCommand::redo
+ Redo this command
+*/
void QPropertyUndoCommand::redo()
{
if (m_object->property(m_property_name) != m_new_value)
@@ -132,9 +132,9 @@ void QPropertyUndoCommand::redo()
}
/**
- * @brief QPropertyUndoCommand::undo
- * Undo this command
- */
+ @brief QPropertyUndoCommand::undo
+ Undo this command
+*/
void QPropertyUndoCommand::undo()
{
if (m_object->property(m_property_name) != m_old_value)
diff --git a/sources/QPropertyUndoCommand/qpropertyundocommand.h b/sources/QPropertyUndoCommand/qpropertyundocommand.h
index db2c71907..77f274777 100644
--- a/sources/QPropertyUndoCommand/qpropertyundocommand.h
+++ b/sources/QPropertyUndoCommand/qpropertyundocommand.h
@@ -24,12 +24,12 @@
class QObject;
/**
- * @brief The QPropertyUndoCommand class
- * This undo command manage QProperty of a QObject.
- * This undo command can use QPropertyAnimation to animate the change when undo/redo is call
- * To use animation call setAnimated(true). By default animation is disable.
- * Some QVariant date can't be animated and result this command don't work.
- */
+ @brief The QPropertyUndoCommand class
+ This undo command manage QProperty of a QObject.
+ This undo command can use QPropertyAnimation to animate the change when undo/redo is call
+ To use animation call setAnimated(true). By default animation is disable.
+ Some QVariant date can't be animated and result this command don't work.
+*/
class QPropertyUndoCommand : public QUndoCommand
{
public:
diff --git a/sources/QWidgetAnimation/qwidgetanimation.cpp b/sources/QWidgetAnimation/qwidgetanimation.cpp
index df0932a91..246543f9a 100644
--- a/sources/QWidgetAnimation/qwidgetanimation.cpp
+++ b/sources/QWidgetAnimation/qwidgetanimation.cpp
@@ -19,11 +19,11 @@
#include
/**
- * @brief QWidgetAnimation::QWidgetAnimation
- * @param widget : widget to animate
- * @param orientation : animate widget horizontally or vertically
- * @param duration : the duration of animation @see void QVariantAnimation::setDuration(int msecs)
- */
+ @brief QWidgetAnimation::QWidgetAnimation
+ @param widget : widget to animate
+ @param orientation : animate widget horizontally or vertically
+ @param duration : the duration of animation @see void QVariantAnimation::setDuration(int msecs)
+*/
QWidgetAnimation::QWidgetAnimation(QWidget *widget, Qt::Orientation orientation, QWidgetAnimation::Behavior behavior, int duration) :
QPropertyAnimation(widget),
m_orientation(orientation),
@@ -51,10 +51,10 @@ QWidgetAnimation::QWidgetAnimation(QWidget *widget, Qt::Orientation orientation,
}
/**
- * @brief QWidgetAnimation::widgetToSubtract
- * Widget to subtract the size when the behavior is availableSpace
- * @param widgets
- */
+ @brief QWidgetAnimation::widgetToSubtract
+ Widget to subtract the size when the behavior is availableSpace
+ @param widgets
+*/
void QWidgetAnimation::widgetToSubtract(QVector widgets)
{
m_widget_to_substract.clear();
@@ -62,9 +62,9 @@ void QWidgetAnimation::widgetToSubtract(QVector widgets)
}
/**
- * @brief QWidgetAnimation::show
- * show the widget
- */
+ @brief QWidgetAnimation::show
+ show the widget
+*/
void QWidgetAnimation::show()
{
if (m_state == QWidgetAnimation::Showing)
@@ -113,9 +113,9 @@ void QWidgetAnimation::show()
}
/**
- * @brief QWidgetAnimation::hide
- * Hide the widget
- */
+ @brief QWidgetAnimation::hide
+ Hide the widget
+*/
void QWidgetAnimation::hide()
{
if (m_state == QWidgetAnimation::Hidding)
@@ -135,10 +135,10 @@ void QWidgetAnimation::hide()
}
/**
- * @brief QWidgetAnimation::setHidden
- * true hide, false show
- * @param hidden
- */
+ @brief QWidgetAnimation::setHidden
+ true hide, false show
+ @param hidden
+*/
void QWidgetAnimation::setHidden(bool hidden)
{
if (hidden)
@@ -148,10 +148,10 @@ void QWidgetAnimation::setHidden(bool hidden)
}
/**
- * @brief QWidgetAnimation::setLastShowSize
- * Force the last show size value to @size
- * @param size
- */
+ @brief QWidgetAnimation::setLastShowSize
+ Force the last show size value to @size
+ @param size
+*/
void QWidgetAnimation::setLastShowSize(int size)
{
if (m_orientation == Qt::Vertical) {
diff --git a/sources/QWidgetAnimation/qwidgetanimation.h b/sources/QWidgetAnimation/qwidgetanimation.h
index 92e6b18b2..48748d7a9 100644
--- a/sources/QWidgetAnimation/qwidgetanimation.h
+++ b/sources/QWidgetAnimation/qwidgetanimation.h
@@ -23,18 +23,18 @@
#include
/**
- * @brief The QWidgetAnimation class
- * This class animate the show and hide function of a QWidget.
+ @brief The QWidgetAnimation class
+ This class animate the show and hide function of a QWidget.
*
- * The role of @behavior is to calcul as best the animation process when widget is show.
- * Because this class don't change the current and final size of the widget but her maximum size during the animation process,
- * we must to know in advance the final size of the widget.
- * Behavior minimumSizeHint : the final size of the widget will be his minimum size hint.
- * Behavior availableSpace : the final size of widget will be the available size of her parent.
- * Since parent can have other widgets you can add a QVector of widget to subtract of the final size.
- * Because we suppose the animated widget will take the maximum available space, we subtract the minimum size hint of widgets in QVector.
- * Behavior lastSize : The widget will have the same size as the last time he was showed.
- */
+ The role of @behavior is to calcul as best the animation process when widget is show.
+ Because this class don't change the current and final size of the widget but her maximum size during the animation process,
+ we must to know in advance the final size of the widget.
+ Behavior minimumSizeHint : the final size of the widget will be his minimum size hint.
+ Behavior availableSpace : the final size of widget will be the available size of her parent.
+ Since parent can have other widgets you can add a QVector of widget to subtract of the final size.
+ Because we suppose the animated widget will take the maximum available space, we subtract the minimum size hint of widgets in QVector.
+ Behavior lastSize : The widget will have the same size as the last time he was showed.
+*/
class QWidgetAnimation : public QPropertyAnimation
{
Q_OBJECT
diff --git a/sources/QetGraphicsItemModeler/qetgraphicshandleritem.cpp b/sources/QetGraphicsItemModeler/qetgraphicshandleritem.cpp
index 4c64b9f42..db25f8dab 100644
--- a/sources/QetGraphicsItemModeler/qetgraphicshandleritem.cpp
+++ b/sources/QetGraphicsItemModeler/qetgraphicshandleritem.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "qetgraphicshandleritem.h"
#include
@@ -21,9 +21,9 @@
#include
/**
- * @brief QetGraphicsHandlerItem::QetGraphicsHandlerItem
- * @param size, the size of the handler
- */
+ @brief QetGraphicsHandlerItem::QetGraphicsHandlerItem
+ @param size, the size of the handler
+*/
QetGraphicsHandlerItem::QetGraphicsHandlerItem(qreal size) :
m_size(size)
{
@@ -34,17 +34,17 @@ QetGraphicsHandlerItem::QetGraphicsHandlerItem(qreal size) :
}
/**
- * @brief QetGraphicsHandlerItem::boundingRect
- * @return
- */
+ @brief QetGraphicsHandlerItem::boundingRect
+ @return
+*/
QRectF QetGraphicsHandlerItem::boundingRect() const {
return m_br;
}
/**
- * @brief QetGraphicsHandlerItem::setColor
- * @param color, set the color of the handler
- */
+ @brief QetGraphicsHandlerItem::setColor
+ @param color, set the color of the handler
+*/
void QetGraphicsHandlerItem::setColor(QColor color)
{
m_color = std::move(color);
@@ -52,40 +52,48 @@ void QetGraphicsHandlerItem::setColor(QColor color)
}
/**
- * @brief QetGraphicsHandlerItem::paint
- * @param painter
- * @param option
- * @param widget
- */
-void QetGraphicsHandlerItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+ @brief QetGraphicsHandlerItem::paint
+ @param painter
+ @param option
+ @param widget
+*/
+void QetGraphicsHandlerItem::paint(QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget)
{
Q_UNUSED(option)
Q_UNUSED(widget)
- painter->save();
- painter->setBrush(QBrush(m_color));
- QPen pen(QBrush(m_color), 2, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
+ painter->save();
+ painter->setBrush(QBrush(m_color));
+ QPen pen(QBrush(m_color),
+ 2,
+ Qt::SolidLine,
+ Qt::SquareCap,
+ Qt::MiterJoin);
pen.setCosmetic(true);
- painter->setPen(pen);
+ painter->setPen(pen);
painter->setRenderHint(QPainter::Antialiasing, true);
- painter->drawEllipse(m_handler_rect);
+ painter->drawEllipse(m_handler_rect);
painter->restore();
}
/**
- * @brief QetGraphicsHandlerItem::handlerForPoint
- * @param points
- * @return A list of handler with pos at point
- */
-QVector QetGraphicsHandlerItem::handlerForPoint(const QVector &points, int size)
+ @brief QetGraphicsHandlerItem::handlerForPoint
+ @param points
+ @return A list of handler with pos at point
+*/
+QVector QetGraphicsHandlerItem::handlerForPoint(
+ const QVector &points,
+ int size)
{
- QVector list_;
- for (QPointF point : points)
- {
- QetGraphicsHandlerItem *qghi = new QetGraphicsHandlerItem(size);
- qghi->setPos(point);
- list_ << qghi;
- }
+ QVector list_;
+ for (QPointF point : points)
+ {
+ QetGraphicsHandlerItem *qghi = new QetGraphicsHandlerItem(size);
+ qghi->setPos(point);
+ list_ << qghi;
+ }
return list_;
}
diff --git a/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h b/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
index 48f1bfc1d..270b30123 100644
--- a/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
+++ b/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef QETGRAPHICSHANDLERITEM_H
#define QETGRAPHICSHANDLERITEM_H
@@ -22,35 +22,43 @@
#include
/**
- * @brief The QetGraphicsHandlerItem class
- * This graphics item represents a point, destined to be used as an handler,
- * for modifie the geometrie of a another graphics item (like shapes).
- * The graphics item to be modified, must call "installSceneEventFilter" of this item with itself for argument,.
- * The ghraphics item to be modified, need to reimplement "sceneEventFilter" for create the modification behavior.
- */
+ @brief The QetGraphicsHandlerItem class
+ This graphics item represents a point,
+ destined to be used as an handler,
+ for modifie the geometrie of a another graphics item (like shapes).
+ The graphics item to be modified,
+ must call "installSceneEventFilter"
+ of this item with itself for argument,.
+ The ghraphics item to be modified,
+ need to reimplement "sceneEventFilter"
+ for create the modification behavior.
+*/
class QetGraphicsHandlerItem : public QGraphicsItem
{
- public:
- QetGraphicsHandlerItem(qreal size = 10);
- QRectF boundingRect() const override;
+ public:
+ QetGraphicsHandlerItem(qreal size = 10);
+ QRectF boundingRect() const override;
enum { Type = UserType + 1200};
int type() const override {return Type;}
void setColor(QColor color);
- protected:
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+ protected:
+ void paint(QPainter *painter,
+ const QStyleOptionGraphicsItem *option,
+ QWidget *widget) override;
- private:
+ private:
QRectF m_handler_rect,
m_br;
- qreal m_size;
+ qreal m_size;
QColor m_color;
QPen m_pen;
public:
- static QVector handlerForPoint(const QVector &points, int size = 10);
+ static QVector handlerForPoint(
+ const QVector &points, int size = 10);
};
#endif // QETGRAPHICSHANDLERITEM_H
diff --git a/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp b/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp
index 24557ca7f..827f2d99c 100644
--- a/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp
+++ b/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.cpp
@@ -20,19 +20,19 @@
/**
- * @brief QetGraphicsHandlerUtility::pointsForRect
- * Return the keys points of the rectangle, stored in a vector.
- * The points in the vector are stored like this :
- * **********
- * 0---1---2
- * | |
- * 3 4
- * | |
- * 5---6---7
- * ************
- * @param rect
- * @return
- */
+ @brief QetGraphicsHandlerUtility::pointsForRect
+ Return the keys points of the rectangle, stored in a vector.
+ The points in the vector are stored like this :
+ **********
+ 0---1---2
+ | |
+ 3 4
+ | |
+ 5---6---7
+ ************
+ @param rect
+ @return
+*/
QVector QetGraphicsHandlerUtility::pointsForRect(const QRectF &rect)
{
QVector vector;
@@ -56,25 +56,26 @@ QVector QetGraphicsHandlerUtility::pointsForRect(const QRectF &rect)
}
/**
- * @brief QetGraphicsHandlerUtility::pointsForLine
- * The point that define a line in a QVector.
- * there is two points.
- * @param line
- * @return
- */
+ @brief QetGraphicsHandlerUtility::pointsForLine
+ The point that define a line in a QVector.
+ there is two points.
+ @param line
+ @return
+*/
QVector QetGraphicsHandlerUtility::pointsForLine(const QLineF &line) {
return (QVector {line.p1(), line.p2()});
}
/**
- * @brief QetGraphicsHandlerUtility::pointsForArc
- * Return the points for the given arc.
- * The first value in the vector is the start point, the second the end point.
- * @param rect
- * @param start_angle : start angle in degree
- * @param span_angle : span angle in degree;
- * @return
- */
+ @brief QetGraphicsHandlerUtility::pointsForArc
+ Return the points for the given arc.
+ The first value in the vector is the start point,
+ the second the end point.
+ @param rect
+ @param start_angle : start angle in degree
+ @param span_angle : span angle in degree;
+ @return
+*/
QVector QetGraphicsHandlerUtility::pointsForArc(const QRectF &rect, qreal start_angle, qreal span_angle)
{
QVector vector;
@@ -88,14 +89,18 @@ QVector QetGraphicsHandlerUtility::pointsForArc(const QRectF &rect, qre
}
/**
- * @brief QetGraphicsHandlerUtility::rectForPosAtIndex
- * Return a rectangle after modification of the point '@pos' at index '@index' of original rectangle '@old_rect'.
- * @param old_rect - the rectangle befor modification
- * @param pos - the new position of a key point
- * @param index - the index of the key point to modifie see QetGraphicsHandlerUtility::pointsForRect to know
- * the index of each keys points of a rectangle)
- * @return : the rectangle with modification. If index is lower than 0 or higher than 7, this method return old_rect.
- */
+ @brief QetGraphicsHandlerUtility::rectForPosAtIndex
+ Return a rectangle after modification
+ of the point '@pos' at index '@index' of original rectangle '@old_rect'.
+ @param old_rect - the rectangle befor modification
+ @param pos - the new position of a key point
+ @param index - the index of the key point to modifie
+ @see QetGraphicsHandlerUtility::pointsForRect to know
+ the index of each keys points of a rectangle)
+ @return : the rectangle with modification.
+ If index is lower than 0 or higher than 7,
+ this method return old_rect.
+*/
QRectF QetGraphicsHandlerUtility::rectForPosAtIndex(const QRectF &old_rect, const QPointF &pos, int index)
{
if (index < 0 || index > 7) return old_rect;
@@ -114,15 +119,19 @@ QRectF QetGraphicsHandlerUtility::rectForPosAtIndex(const QRectF &old_rect, cons
}
/**
- * @brief QetGraphicsHandlerUtility::mirrorRectForPosAtIndex
- * Return a rectangle after modification of the point '@pos' at index '@index' of original rectangle '@old_rect'.
- * the opposite edge is modified inversely (like a mirror)
- * @param old_rect : the rectangle befor modification
- * @param pos : the new position of a key point
- * @param index : the index of the key point to modifie see QetGraphicsHandlerUtility::pointsForRect to know
- * the index of each keys points of a rectangle)
- * @return : the rectangle with modification. If index is lower than 0 or higher than 7, this method return old_rect.
- */
+ @brief QetGraphicsHandlerUtility::mirrorRectForPosAtIndex
+ Return a rectangle after modification of the point '@pos'
+ at index '@index' of original rectangle '@old_rect'.
+ the opposite edge is modified inversely (like a mirror)
+ @param old_rect : the rectangle befor modification
+ @param pos : the new position of a key point
+ @param index : the index of the key point to modifie
+ @see QetGraphicsHandlerUtility::pointsForRect to know
+ the index of each keys points of a rectangle)
+ @return : the rectangle with modification.
+ If index is lower than 0 or higher than 7,
+ this method return old_rect.
+*/
QRectF QetGraphicsHandlerUtility::mirrorRectForPosAtIndex(const QRectF &old_rect, const QPointF &pos, int index)
{
if (index < 0 || index > 7) return old_rect;
@@ -172,13 +181,13 @@ QRectF QetGraphicsHandlerUtility::mirrorRectForPosAtIndex(const QRectF &old_rect
}
/**
- * @brief QetGraphicsHandlerUtility::lineForPosAtIndex
- * Return a line after modification of @pos at index @index of @old_line.
- * @param old_line
- * @param pos
- * @param index
- * @return
- */
+ @brief QetGraphicsHandlerUtility::lineForPosAtIndex
+ Return a line after modification of @pos at index @index of @old_line.
+ @param old_line
+ @param pos
+ @param index
+ @return
+*/
QLineF QetGraphicsHandlerUtility::lineForPosAtIndex(const QLineF &old_line, const QPointF &pos, int index) {
QLineF line = old_line;
index == 0 ? line.setP1(pos) : line.setP2(pos);
@@ -186,12 +195,12 @@ QLineF QetGraphicsHandlerUtility::lineForPosAtIndex(const QLineF &old_line, cons
}
/**
- * @brief QetGraphicsHandlerUtility::polygonForInsertPoint
- * @param old_polygon : the polygon which we insert a new point.
- * @param closed : polygon is closed or not
- * @param pos : the pos where the new point must be added
- * @return the new polygon
- */
+ @brief QetGraphicsHandlerUtility::polygonForInsertPoint
+ @param old_polygon : the polygon which we insert a new point.
+ @param closed : polygon is closed or not
+ @param pos : the pos where the new point must be added
+ @return the new polygon
+*/
QPolygonF QetGraphicsHandlerUtility::polygonForInsertPoint(const QPolygonF &old_polygon, bool closed, const QPointF &pos)
{
qreal max_angle = 0;
@@ -241,15 +250,17 @@ QPolygonF QetGraphicsHandlerUtility::polygonForInsertPoint(const QPolygonF &old_
}
/**
- * @brief QetGraphicsHandlerUtility::pointForRadiusRect
- * @param rect the rectangle.
- * @param xRadius : x radius
- * @param yRadius : y radius
- * @param mode : absolute or relative size: NOTE this argument is not used, this function always compute with relative size.
- * @return the points of x and y radius of a rounded rect.
- * The points are always based on the top right corner of the rect.
- * the first point of vector is X the second Y
- */
+ @brief QetGraphicsHandlerUtility::pointForRadiusRect
+ @param rect the rectangle.
+ @param xRadius : x radius
+ @param yRadius : y radius
+ @param mode :
+ absolute or relative size: NOTE this argument is not used,
+ this function always compute with relative size.
+ @return the points of x and y radius of a rounded rect.
+ The points are always based on the top right corner of the rect.
+ the first point of vector is X the second Y
+*/
QVector QetGraphicsHandlerUtility::pointForRadiusRect(const QRectF &rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode)
{
QVector v;
@@ -283,13 +294,13 @@ QVector QetGraphicsHandlerUtility::pointForRadiusRect(const QRectF &rec
}
/**
- * @brief QetGraphicsHandlerUtility::radiusForPosAtIndex
- * @param rect the rectangle
- * @param pos : the pos of the new radius
- * @param index : index of radius 0=X 1=Y
- * @param mode
- * @return
- */
+ @brief QetGraphicsHandlerUtility::radiusForPosAtIndex
+ @param rect the rectangle
+ @param pos : the pos of the new radius
+ @param index : index of radius 0=X 1=Y
+ @param mode
+ @return
+*/
qreal QetGraphicsHandlerUtility::radiusForPosAtIndex(const QRectF &rect, const QPointF &pos, int index, Qt::SizeMode mode)
{
if (mode == Qt::AbsoluteSize)
diff --git a/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h b/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h
index dee501ec7..950f27fa4 100644
--- a/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h
+++ b/sources/QetGraphicsItemModeler/qetgraphicshandlerutility.h
@@ -26,11 +26,11 @@
class QPainter;
/**
- * @brief The QetGraphicsHandlerUtility class
- * This class provide some methods to create and use handler for
- * modify graphics shape like line rectangle etc...
- * They also provide some conveniance static method.
- */
+ @brief The QetGraphicsHandlerUtility class
+ This class provide some methods to create and use handler for
+ modify graphics shape like line rectangle etc...
+ They also provide some conveniance static method.
+*/
class QetGraphicsHandlerUtility
{
public:
diff --git a/sources/SearchAndReplace/searchandreplaceworker.cpp b/sources/SearchAndReplace/searchandreplaceworker.cpp
index 654f3b95c..2995939ad 100644
--- a/sources/SearchAndReplace/searchandreplaceworker.cpp
+++ b/sources/SearchAndReplace/searchandreplaceworker.cpp
@@ -32,11 +32,12 @@ SearchAndReplaceWorker::SearchAndReplaceWorker()
}
/**
- * @brief SearchAndReplaceWorker::replaceDiagram
- * Replace all properties of each diagram in @diagram_list,
- * by the current titleblock propertie of this worker
- * @param diagram_list, list of diagram to be changed, all diagrams must belong to the same project;
- */
+ @brief SearchAndReplaceWorker::replaceDiagram
+ Replace all properties of each diagram in @diagram_list,
+ by the current titleblock propertie of this worker
+ @param diagram_list, list of diagram to be changed,
+ all diagrams must belong to the same project;
+*/
void SearchAndReplaceWorker::replaceDiagram(QList diagram_list)
{
if (diagram_list.isEmpty()) {
@@ -91,12 +92,14 @@ void SearchAndReplaceWorker::replaceDiagram(Diagram *diagram)
}
/**
- * @brief SearchAndReplaceWorker::replaceElement
- * Replace all properties of each elements in @list
- * All element must belong to the same project, if not this function do nothing.
- * All change are made through a undo command append to undo list of the project.
- * @param list
- */
+ @brief SearchAndReplaceWorker::replaceElement
+ Replace all properties of each elements in @list
+ All element must belong to the same project,
+ if not this function do nothing.
+ All change are made through a undo command append
+ to undo list of the project.
+ @param list
+*/
void SearchAndReplaceWorker::replaceElement(QList list)
{
if (list.isEmpty() || !list.first()->diagram()) {
@@ -147,11 +150,11 @@ void SearchAndReplaceWorker::replaceElement(Element *element)
}
/**
- * @brief SearchAndReplaceWorker::replaceIndiText
- * Replace all displayed text of independent text of @list
- * Each must belong to the same project, if not this function do nothing
- * @param list
- */
+ @brief SearchAndReplaceWorker::replaceIndiText
+ Replace all displayed text of independent text of @list
+ Each must belong to the same project, if not this function do nothing
+ @param list
+*/
void SearchAndReplaceWorker::replaceIndiText(QList list)
{
if (list.isEmpty() || !list.first()->diagram()) {
@@ -183,12 +186,14 @@ void SearchAndReplaceWorker::replaceIndiText(IndependentTextItem *text)
}
/**
- * @brief SearchAndReplaceWorker::replaceConductor
- * Replace all properties of each conductor in @list
- * All conductor must belong to the same project, if not this function do nothing.
- * All change are made through a undo command append to undo list of the project.
- * @param list
- */
+ @brief SearchAndReplaceWorker::replaceConductor
+ Replace all properties of each conductor in @list
+ All conductor must belong to the same project,
+ if not this function do nothing.
+ All change are made through a undo command append
+ to undo list of the project.
+ @param list
+*/
void SearchAndReplaceWorker::replaceConductor(QList list)
{
if (list.isEmpty() || !list.first()->diagram()) {
@@ -232,15 +237,15 @@ void SearchAndReplaceWorker::replaceConductor(Conductor *conductor)
}
/**
- * @brief SearchAndReplaceWorker::replaceAdvanced
- * Apply the change of text according to the current advancedStruct
- * All items in the 4 list must belong to the same QETProject,
- * if not this function do nothing
- * @param d
- * @param e
- * @param t
- * @param c
- */
+ @brief SearchAndReplaceWorker::replaceAdvanced
+ Apply the change of text according to the current advancedStruct
+ All items in the 4 list must belong to the same QETProject,
+ if not this function do nothing
+ @param d
+ @param e
+ @param t
+ @param c
+*/
void SearchAndReplaceWorker::replaceAdvanced(QList diagrams, QList elements, QList texts, QList conductors)
{
QETProject *project_ = nullptr;
@@ -348,15 +353,17 @@ void SearchAndReplaceWorker::replaceAdvanced(QList diagrams, QListsetText(str);
@@ -385,11 +392,11 @@ ConductorProperties SearchAndReplaceWorker::invalidConductorProperties()
}
/**
- * @brief SearchAndReplaceWorker::applyChange
- * @param original : the original properties
- * @param change : the change properties, to be merged with @original
- * @return a new conductor properties with the change applyed.
- */
+ @brief SearchAndReplaceWorker::applyChange
+ @param original : the original properties
+ @param change : the change properties, to be merged with @original
+ @return a new conductor properties with the change applyed.
+*/
ConductorProperties SearchAndReplaceWorker::applyChange(const ConductorProperties &original, const ConductorProperties &change)
{
ConductorProperties new_properties = original;
@@ -420,11 +427,11 @@ ConductorProperties SearchAndReplaceWorker::applyChange(const ConductorPropertie
}
/**
- * @brief SearchAndReplaceWorker::applyChange
- * @param original : the original string
- * @param change : the changed string:
- * @return the string to be use in the properties
- */
+ @brief SearchAndReplaceWorker::applyChange
+ @param original : the original string
+ @param change : the changed string:
+ @return the string to be use in the properties
+*/
QString SearchAndReplaceWorker::applyChange(const QString &original, const QString &change)
{
if (change.isEmpty()) {return original;}
@@ -433,11 +440,11 @@ QString SearchAndReplaceWorker::applyChange(const QString &original, const QStri
}
/**
- * @brief SearchAndReplaceWorker::replaceAdvanced
- * @param diagram
- * @return the titleblock properties with the change applied,
- * according to the state of @m_advanced_struct
- */
+ @brief SearchAndReplaceWorker::replaceAdvanced
+ @param diagram
+ @return the titleblock properties with the change applied,
+ according to the state of @m_advanced_struct
+*/
TitleBlockProperties SearchAndReplaceWorker::replaceAdvanced(Diagram *diagram)
{
TitleBlockProperties p = diagram->border_and_titleblock.exportTitleBlock();
@@ -459,11 +466,11 @@ TitleBlockProperties SearchAndReplaceWorker::replaceAdvanced(Diagram *diagram)
}
/**
- * @brief SearchAndReplaceWorker::replaceAdvanced
- * @param element
- * @return The diagram context with the change applied,
- * according to the state of @m_advanced_struct
- */
+ @brief SearchAndReplaceWorker::replaceAdvanced
+ @param element
+ @return The diagram context with the change applied,
+ according to the state of @m_advanced_struct
+*/
DiagramContext SearchAndReplaceWorker::replaceAdvanced(Element *element)
{
DiagramContext context = element->elementInformations();
@@ -484,11 +491,11 @@ DiagramContext SearchAndReplaceWorker::replaceAdvanced(Element *element)
}
/**
- * @brief SearchAndReplaceWorker::replaceAdvanced
- * @param conductor
- * @return the conductor properties with the change applied,
- * according to the state of @m_advanced_struct
- */
+ @brief SearchAndReplaceWorker::replaceAdvanced
+ @param conductor
+ @return the conductor properties with the change applied,
+ according to the state of @m_advanced_struct
+*/
ConductorProperties SearchAndReplaceWorker::replaceAdvanced(Conductor *conductor)
{
ConductorProperties properties = conductor->properties();
diff --git a/sources/SearchAndReplace/searchandreplaceworker.h b/sources/SearchAndReplace/searchandreplaceworker.h
index 5740c4b9c..0f6e7f7bb 100644
--- a/sources/SearchAndReplace/searchandreplaceworker.h
+++ b/sources/SearchAndReplace/searchandreplaceworker.h
@@ -44,9 +44,10 @@ struct advancedReplaceStruct
};
/**
- * @brief The SearchAndReplaceWorker class
- * This class is the worker use to change properties when use the search and replace function of QET
- */
+ @brief The SearchAndReplaceWorker class
+ This class is the worker use to change properties
+ when use the search and replace function of QET
+*/
class SearchAndReplaceWorker
{
public:
diff --git a/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp b/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp
index dc9acebf0..ae3aea8f1 100644
--- a/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp
+++ b/sources/SearchAndReplace/ui/replaceadvanceddialog.cpp
@@ -22,10 +22,10 @@
#include
/**
- * @brief replaceAdvancedDialog::replaceAdvancedDialog
- * @param advanced
- * @param parent
- */
+ @brief replaceAdvancedDialog::replaceAdvancedDialog
+ @param advanced
+ @param parent
+*/
replaceAdvancedDialog::replaceAdvancedDialog(advancedReplaceStruct advanced, QWidget *parent) :
QDialog(parent),
ui(new Ui::replaceAdvancedDialog)
@@ -47,10 +47,10 @@ replaceAdvancedDialog::~replaceAdvancedDialog()
}
/**
- * @brief replaceAdvancedDialog::setAdvancedStruct
- * Set the edited advanced struct
- * @param advanced
- */
+ @brief replaceAdvancedDialog::setAdvancedStruct
+ Set the edited advanced struct
+ @param advanced
+*/
void replaceAdvancedDialog::setAdvancedStruct(advancedReplaceStruct advanced)
{
int index = advanced.who;
@@ -73,9 +73,9 @@ void replaceAdvancedDialog::setAdvancedStruct(advancedReplaceStruct advanced)
}
/**
- * @brief replaceAdvancedDialog::advancedStruct
- * @return the edited advanced struct
- */
+ @brief replaceAdvancedDialog::advancedStruct
+ @return the edited advanced struct
+*/
advancedReplaceStruct replaceAdvancedDialog::advancedStruct() const
{
advancedReplaceStruct a;
@@ -110,9 +110,9 @@ void replaceAdvancedDialog::fillWhatComboBox(int index)
}
/**
- * @brief replaceAdvancedDialog::on_m_who_cb_currentIndexChanged
- * @param index
- */
+ @brief replaceAdvancedDialog::on_m_who_cb_currentIndexChanged
+ @param index
+*/
void replaceAdvancedDialog::on_m_who_cb_currentIndexChanged(int index) {
fillWhatComboBox(index);
}
diff --git a/sources/SearchAndReplace/ui/replaceconductordialog.cpp b/sources/SearchAndReplace/ui/replaceconductordialog.cpp
index d95423c46..9719c7a1e 100644
--- a/sources/SearchAndReplace/ui/replaceconductordialog.cpp
+++ b/sources/SearchAndReplace/ui/replaceconductordialog.cpp
@@ -25,9 +25,9 @@
typedef SearchAndReplaceWorker sarw;
/**
- * @brief ReplaceConductorDialog::ReplaceConductorDialog
- * @param parent
- */
+ @brief ReplaceConductorDialog::ReplaceConductorDialog
+ @param parent
+*/
ReplaceConductorDialog::ReplaceConductorDialog(const ConductorProperties &properties, QWidget *parent) :
QDialog(parent),
ui(new Ui::ReplaceConductorDialog)
@@ -43,11 +43,12 @@ ReplaceConductorDialog::~ReplaceConductorDialog()
}
/**
- * @brief ReplaceConductorDialog::updatePreview
- * Update the preview for single line
- * @param b true: update from the value displayed by this widget
- * false: update from the properties given at the constructor of this widget
- */
+ @brief ReplaceConductorDialog::updatePreview
+ Update the preview for single line
+ @param b :
+ true: update from the value displayed by this widget
+ false: update from the properties given at the constructor of this widget
+*/
void ReplaceConductorDialog::updatePreview(bool b)
{
const QRect pixmap_rect(0, 0, 96, 96);
@@ -124,9 +125,9 @@ void ReplaceConductorDialog::setProperties(const ConductorProperties &properties
}
/**
- * @brief ReplaceConductorDialog::properties
- * @return the properties edited by this widget
- */
+ @brief ReplaceConductorDialog::properties
+ @return the properties edited by this widget
+*/
ConductorProperties ReplaceConductorDialog::properties() const
{
ConductorProperties properties_;
@@ -158,37 +159,66 @@ ConductorProperties ReplaceConductorDialog::properties() const
}
properties_.verti_rotate_text = ui->m_vertical_angle_sb->value();
properties_.horiz_rotate_text = ui->m_horizontal_angle_sb->value();
- properties_.color = ui->m_mod_color_cb->isChecked() ? ui->m_color_pb->palette().color(QPalette::Button) : QColor();
- properties_.style = ui->m_line_style_cb->itemData(ui->m_line_style_cb->currentIndex()).value().style();
+ properties_.color = ui->m_mod_color_cb->isChecked()
+ ? ui->m_color_pb->palette().color(QPalette::Button)
+ : QColor();
+ properties_.style = ui->m_line_style_cb->itemData(
+ ui->m_line_style_cb->currentIndex())
+ .value()
+ .style();
properties_.cond_size = ui->m_cond_size_sb->value();
properties_.m_bicolor = ui->m_second_color_gb->isChecked();
- properties_.m_color_2 = ui->m_mod_color_2_cb->isChecked() ? ui->m_color_2_pb->palette().color(QPalette::Button) : QColor();
+ properties_.m_color_2 = ui->m_mod_color_2_cb->isChecked()
+ ? ui->m_color_2_pb->palette().color(QPalette::Button)
+ : QColor();
properties_.m_dash_size = ui->m_color_2_dash_size_sb->value();
- properties_.singleLineProperties.hasGround = ui->m_earth_cb->isChecked();
- properties_.singleLineProperties.hasNeutral = ui->m_neutral_cb->isChecked();
- properties_.singleLineProperties.is_pen = ui->m_pen_cb->isChecked();
- properties_.singleLineProperties.setPhasesCount(ui->m_phase_cb->isChecked() ? ui->m_phase_sb->value() : 0);
+ properties_.singleLineProperties.hasGround =
+ ui->m_earth_cb->isChecked();
+ properties_.singleLineProperties.hasNeutral =
+ ui->m_neutral_cb->isChecked();
+ properties_.singleLineProperties.is_pen =
+ ui->m_pen_cb->isChecked();
+ properties_.singleLineProperties.setPhasesCount(
+ ui->m_phase_cb->isChecked()
+ ? ui->m_phase_sb->value()
+ : 0);
return properties_;
}
void ReplaceConductorDialog::initWidget()
{
- connect(ui->m_button_box, &QDialogButtonBox::clicked, [this](QAbstractButton *button_) {
+ connect(ui->m_button_box, &QDialogButtonBox::clicked,
+ [this](QAbstractButton *button_) {
this->done(ui->m_button_box->buttonRole(button_));
});
ui->m_update_preview_pb->setHidden(true);
ui->m_line_style_cb->addItem(tr("Ne pas modifier"), QPen(Qt::NoPen));
- ui->m_line_style_cb->addItem(tr("Trait plein", "conductor style: solid line"), QPen(Qt::SolidLine));
- ui->m_line_style_cb->addItem(tr("Trait en pointillés", "conductor style: dashed line"), QPen(Qt::DashLine));
- ui->m_line_style_cb->addItem(tr("Traits et points", "conductor style: dashed and dotted line"), QPen(Qt::DashDotLine));
+ ui->m_line_style_cb->addItem(tr("Trait plein",
+ "conductor style: solid line"),
+ QPen(Qt::SolidLine));
+ ui->m_line_style_cb->addItem(tr("Trait en pointillés",
+ "conductor style: dashed line"),
+ QPen(Qt::DashLine));
+ ui->m_line_style_cb->addItem(tr("Traits et points",
+ "conductor style: dashed and dotted line"),
+ QPen(Qt::DashDotLine));
- connect(ui->m_multi_gb, &QGroupBox::toggled, [this](bool toggle) {this->ui->m_singlewire_gb->setChecked(!toggle);});
- connect(ui->m_singlewire_gb, &QGroupBox::toggled, [this](bool toggle) {this->ui->m_multi_gb->setChecked(!toggle);});
- connect(ui->m_formula_le, &QLineEdit::textChanged, [this](QString text) {this->ui->m_text_le->setEnabled(text.isEmpty());});
+ connect(ui->m_multi_gb,
+ &QGroupBox::toggled,
+ [this](bool toggle)
+ {this->ui->m_singlewire_gb->setChecked(!toggle);});
+ connect(ui->m_singlewire_gb,
+ &QGroupBox::toggled,
+ [this](bool toggle)
+ {this->ui->m_multi_gb->setChecked(!toggle);});
+ connect(ui->m_formula_le,
+ &QLineEdit::textChanged,
+ [this](QString text)
+ {this->ui->m_text_le->setEnabled(text.isEmpty());});
ui->m_multi_gb->setChecked(true);
ui->m_singlewire_gb->setChecked(true);
}
@@ -197,50 +227,75 @@ void ReplaceConductorDialog::setColorButton(const QColor &color)
{
QPalette palette;
palette.setColor(QPalette::Button, color);
- ui->m_color_pb->setStyleSheet(QString("background-color: %1; min-height: 1.5em; border-style: outset; border-width: 2px; border-color: gray; border-radius: 4px;").arg(color.name()));
+ ui->m_color_pb->setStyleSheet(
+ QString("background-color: %1; min-height: 1.5em; border-style:"
+ " outset; border-width: 2px; border-color: gray;"
+ " border-radius: 4px;").arg(color.name()));
}
void ReplaceConductorDialog::setColorButton2(const QColor &color)
{
QPalette palette;
palette.setColor(QPalette::Button, color);
- ui->m_color_2_pb->setStyleSheet(QString("background-color: %1; min-height: 1.5em; border-style: outset; border-width: 2px; border-color: gray; border-radius: 4px;").arg(color.name()));
+ ui->m_color_2_pb->setStyleSheet(
+ QString("background-color: %1;"
+ " min-height: 1.5em; border-style:"
+ " outset; border-width: 2px;"
+ " border-color: gray;"
+ " border-radius: 4px;").arg(
+ color.name()));
}
void ReplaceConductorDialog::on_m_erase_formula_cb_clicked()
{
- ui->m_formula_le->setText(ui->m_erase_formula_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_formula_le->setText(ui->m_erase_formula_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_formula_le->setDisabled(ui->m_erase_formula_cb->isChecked());
}
void ReplaceConductorDialog::on_m_erase_text_cb_clicked()
{
- ui->m_text_le->setText(ui->m_erase_text_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_text_le->setText(ui->m_erase_text_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_text_le->setDisabled(ui->m_erase_text_cb->isChecked());
}
void ReplaceConductorDialog::on_m_erase_function_cb_clicked()
{
- ui->m_function_le->setText(ui->m_erase_function_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_function_le->setText(ui->m_erase_function_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_function_le->setDisabled(ui->m_erase_function_cb->isChecked());
}
void ReplaceConductorDialog::on_m_erase_tension_protocol_cb_clicked()
{
- ui->m_tension_protocol_le->setText(ui->m_erase_tension_protocol_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
- ui->m_tension_protocol_le->setDisabled(ui->m_erase_tension_protocol_cb->isChecked());
+ ui->m_tension_protocol_le->setText(
+ ui->m_erase_tension_protocol_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
+ ui->m_tension_protocol_le->setDisabled(
+ ui->m_erase_tension_protocol_cb->isChecked());
}
void ReplaceConductorDialog::on_m_erase_m_wire_color_cb_clicked()
{
- ui->m_wire_color_le->setText(ui->m_erase_wire_color_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
- ui->m_wire_color_le->setDisabled(ui->m_erase_wire_color_cb->isChecked());
+ ui->m_wire_color_le->setText(ui->m_erase_wire_color_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
+ ui->m_wire_color_le->setDisabled(
+ ui->m_erase_wire_color_cb->isChecked());
}
void ReplaceConductorDialog::on_m_erase_m_wire_section_cb_clicked()
{
- ui->m_wire_section_le->setText(ui->m_erase_wire_section_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
- ui->m_wire_section_le->setDisabled(ui->m_erase_wire_section_cb->isChecked());
+ ui->m_wire_section_le->setText(ui->m_erase_wire_section_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
+ ui->m_wire_section_le->setDisabled(
+ ui->m_erase_wire_section_cb->isChecked());
}
void ReplaceConductorDialog::on_m_earth_cb_toggled(bool checked)
@@ -262,7 +317,7 @@ void ReplaceConductorDialog::on_m_neutral_cb_toggled(bool checked)
}
void ReplaceConductorDialog::on_m_update_preview_pb_clicked() {
- updatePreview();
+ updatePreview();
}
void ReplaceConductorDialog::on_m_color_pb_clicked()
diff --git a/sources/SearchAndReplace/ui/replaceconductordialog.h b/sources/SearchAndReplace/ui/replaceconductordialog.h
index 8b99900fb..a28ed243d 100644
--- a/sources/SearchAndReplace/ui/replaceconductordialog.h
+++ b/sources/SearchAndReplace/ui/replaceconductordialog.h
@@ -27,9 +27,9 @@ namespace Ui {
}
/**
- * @brief The ReplaceConductorDialog class
- * A Qdialog to edit a conductor properties, use for the search and replace feature of QElectrotech.
- */
+ @brief The ReplaceConductorDialog class
+ A Qdialog to edit a conductor properties, use for the search and replace feature of QElectrotech.
+*/
class ReplaceConductorDialog : public QDialog
{
Q_OBJECT
diff --git a/sources/SearchAndReplace/ui/replaceelementdialog.cpp b/sources/SearchAndReplace/ui/replaceelementdialog.cpp
index 837a1152f..c0fb6d57d 100644
--- a/sources/SearchAndReplace/ui/replaceelementdialog.cpp
+++ b/sources/SearchAndReplace/ui/replaceelementdialog.cpp
@@ -39,10 +39,10 @@ ReplaceElementDialog::~ReplaceElementDialog()
}
/**
- * @brief ReplaceElementDialog::setContext
- * Set the current diagram context to be edited
- * @param context
- */
+ @brief ReplaceElementDialog::setContext
+ Set the current diagram context to be edited
+ @param context
+*/
void ReplaceElementDialog::setContext(DiagramContext context)
{
m_context = context;
@@ -53,9 +53,9 @@ void ReplaceElementDialog::setContext(DiagramContext context)
}
/**
- * @brief ReplaceElementDialog::context
- * @return The edited diagram context
- */
+ @brief ReplaceElementDialog::context
+ @return The edited diagram context
+*/
DiagramContext ReplaceElementDialog::context() const
{
DiagramContext context;
diff --git a/sources/SearchAndReplace/ui/replacefoliowidget.cpp b/sources/SearchAndReplace/ui/replacefoliowidget.cpp
index f953c2341..40cedbc74 100644
--- a/sources/SearchAndReplace/ui/replacefoliowidget.cpp
+++ b/sources/SearchAndReplace/ui/replacefoliowidget.cpp
@@ -39,9 +39,9 @@ ReplaceFolioWidget::~ReplaceFolioWidget()
}
/**
- * @brief ReplaceFolioWidget::titleBlockProperties
- * @return the title block properties edited by this widget
- */
+ @brief ReplaceFolioWidget::titleBlockProperties
+ @return the title block properties edited by this widget
+*/
TitleBlockProperties ReplaceFolioWidget::titleBlockProperties() const
{
TitleBlockProperties prop;
@@ -71,11 +71,12 @@ TitleBlockProperties ReplaceFolioWidget::titleBlockProperties() const
}
/**
- * @brief ReplaceFolioWidget::setTitleBlockProperties
- * Set the title block properties edited by this widget
- * @param properties
- */
-void ReplaceFolioWidget::setTitleBlockProperties(const TitleBlockProperties &properties)
+ @brief ReplaceFolioWidget::setTitleBlockProperties
+ Set the title block properties edited by this widget
+ @param properties
+*/
+void ReplaceFolioWidget::setTitleBlockProperties(
+ const TitleBlockProperties &properties)
{
sarw::setupLineEdit(ui->m_title_le, ui->m_title_cb, properties.title);
sarw::setupLineEdit(ui->m_author_le, ui->m_author_cb, properties.author);
@@ -118,9 +119,15 @@ ReplaceFolioDialog::ReplaceFolioDialog(QWidget *parent) :
{
QVBoxLayout *layout = new QVBoxLayout(this);
layout->addWidget(m_widget = new ReplaceFolioWidget(this));
- layout->addWidget(m_button_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Reset, this));
+ layout->addWidget(m_button_box = new QDialogButtonBox(
+ QDialogButtonBox::Ok
+ | QDialogButtonBox::Cancel
+ | QDialogButtonBox::Reset,
+ this));
- connect(m_button_box, &QDialogButtonBox::clicked, [this](QAbstractButton *button_)
+ connect(m_button_box,
+ &QDialogButtonBox::clicked,
+ [this](QAbstractButton *button_)
{
this->done(m_button_box->buttonRole(button_));
});
@@ -130,51 +137,66 @@ ReplaceFolioDialog::~ReplaceFolioDialog()
{}
/**
- * @brief ReplaceFolioDialog::titleBlockProperties
- * @return The title block properties edited by this dialog
- */
+ @brief ReplaceFolioDialog::titleBlockProperties
+ @return The title block properties edited by this dialog
+*/
TitleBlockProperties ReplaceFolioDialog::titleBlockProperties() const {
return m_widget->titleBlockProperties();
}
/**
- * @brief ReplaceFolioDialog::setTitleBlockProperties
- * @param properties : set the title block properties edited by this dialog
- */
-void ReplaceFolioDialog::setTitleBlockProperties(const TitleBlockProperties &properties) {
+ @brief ReplaceFolioDialog::setTitleBlockProperties
+ @param properties : set the title block properties edited by this dialog
+*/
+void ReplaceFolioDialog::setTitleBlockProperties(
+ const TitleBlockProperties &properties) {
m_widget->setTitleBlockProperties(properties);
}
void ReplaceFolioWidget::on_m_title_cb_clicked() {
- ui->m_title_le->setText(ui->m_title_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_title_le->setText(ui->m_title_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_title_le->setDisabled(ui->m_title_cb->isChecked());
}
void ReplaceFolioWidget::on_m_author_cb_clicked() {
- ui->m_author_le->setText(ui->m_author_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_author_le->setText(ui->m_author_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_author_le->setDisabled(ui->m_author_cb->isChecked());
}
void ReplaceFolioWidget::on_m_file_cb_clicked() {
- ui->m_file_le->setText(ui->m_file_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_file_le->setText(ui->m_file_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_file_le->setDisabled(ui->m_file_cb->isChecked());
}
void ReplaceFolioWidget::on_m_folio_cb_clicked() {
- ui->m_folio_le->setText(ui->m_folio_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_folio_le->setText(ui->m_folio_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_folio_le->setDisabled(ui->m_folio_cb->isChecked());
}
void ReplaceFolioWidget::on_m_plant_cb_clicked() {
- ui->m_plant->setText(ui->m_plant_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_plant->setText(ui->m_plant_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_plant->setDisabled(ui->m_plant_cb->isChecked());
}
void ReplaceFolioWidget::on_m_loc_cb_clicked() {
- ui->m_loc->setText(ui->m_loc_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_loc->setText(ui->m_loc_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_loc->setDisabled(ui->m_loc_cb->isChecked());
}
void ReplaceFolioWidget::on_m_indice_cb_clicked() {
- ui->m_indice->setText(ui->m_indice_cb->isChecked() ? SearchAndReplaceWorker::eraseText() : QString());
+ ui->m_indice->setText(ui->m_indice_cb->isChecked()
+ ? SearchAndReplaceWorker::eraseText()
+ : QString());
ui->m_indice->setDisabled(ui->m_indice_cb->isChecked());
}
diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
index 3e4351a33..51aec37fc 100644
--- a/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
+++ b/sources/SearchAndReplace/ui/searchandreplacewidget.cpp
@@ -36,18 +36,25 @@
#include
/**
- * @brief SearchAndReplaceWidget::SearchAndReplaceWidget
- * Constructor
- * @param parent
- */
+ @brief SearchAndReplaceWidget::SearchAndReplaceWidget
+ Constructor
+ @param parent
+*/
SearchAndReplaceWidget::SearchAndReplaceWidget(QWidget *parent) :
QWidget(parent),
ui(new Ui::SearchAndReplaceWidget)
{
ui->setupUi(this);
- m_horizontal_animation = new QWidgetAnimation(ui->m_advanced_button_widget, Qt::Horizontal, QWidgetAnimation::minimumSizeHint, 250);
- m_vertical_animation = new QWidgetAnimation(ui->m_advanced_widget, Qt::Vertical, QWidgetAnimation::availableSpace, 250);
+ m_horizontal_animation = new QWidgetAnimation(
+ ui->m_advanced_button_widget,
+ Qt::Horizontal,
+ QWidgetAnimation::minimumSizeHint,
+ 250);
+ m_vertical_animation = new QWidgetAnimation(
+ ui->m_advanced_widget,
+ Qt::Vertical,
+ QWidgetAnimation::availableSpace, 250);
QVector v;
v << ui->m_header_widget;
m_vertical_animation->widgetToSubtract(v);
@@ -55,24 +62,25 @@ SearchAndReplaceWidget::SearchAndReplaceWidget(QWidget *parent) :
setHideAdvanced(true);
setUpTreeItems();
- connect(ui->m_search_le, &QLineEdit::textEdited, this, &SearchAndReplaceWidget::search);
+ connect(ui->m_search_le, &QLineEdit::textEdited,
+ this, &SearchAndReplaceWidget::search);
}
/**
- * @brief SearchAndReplaceWidget::~SearchAndReplaceWidget
- * Destructor
- */
+ @brief SearchAndReplaceWidget::~SearchAndReplaceWidget
+ Destructor
+*/
SearchAndReplaceWidget::~SearchAndReplaceWidget() {
delete ui;
}
/**
- * @brief SearchAndReplaceWidget::event
- * Reimplemented to clear the the lines edit and hide
- * the advanced widgets, when this widget become hidden
- * @param event
- * @return
- */
+ @brief SearchAndReplaceWidget::event
+ Reimplemented to clear the the lines edit and hide
+ the advanced widgets, when this widget become hidden
+ @param event
+ @return
+*/
bool SearchAndReplaceWidget::event(QEvent *event)
{
if (event->type() == QEvent::Hide)
@@ -95,13 +103,14 @@ bool SearchAndReplaceWidget::event(QEvent *event)
}
/**
- * @brief SearchAndReplaceWidget::clear
- * Clear the content of the search and replace line edit
- * Clear all tree items in the tree widget (except the category items).
- */
+ @brief SearchAndReplaceWidget::clear
+ Clear the content of the search and replace line edit
+ Clear all tree items in the tree widget (except the category items).
+*/
void SearchAndReplaceWidget::clear()
{
- disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged, this, &SearchAndReplaceWidget::itemChanged);
+ disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged,
+ this, &SearchAndReplaceWidget::itemChanged);
qDeleteAll(m_diagram_hash.keys());
m_diagram_hash.clear();
@@ -128,18 +137,18 @@ void SearchAndReplaceWidget::clear()
}
/**
- * @brief SearchAndReplaceWidget::setEditor
- * Set the diagram editor of this widget
- * @param editor
- */
+ @brief SearchAndReplaceWidget::setEditor
+ Set the diagram editor of this widget
+ @param editor
+*/
void SearchAndReplaceWidget::setEditor(QETDiagramEditor *editor) {
m_editor = editor;
}
/**
- * @brief SearchAndReplaceWidget::setUpTreeItems
- * Set up the main tree widget items
- */
+ @brief SearchAndReplaceWidget::setUpTreeItems
+ Set up the main tree widget items
+*/
void SearchAndReplaceWidget::setUpTreeItems()
{
m_root_qtwi = new QTreeWidgetItem(ui->m_tree_widget);
@@ -207,10 +216,10 @@ void SearchAndReplaceWidget::setUpTreeItems()
}
/**
- * @brief SearchAndReplaceWidget::setHideAdvanced
- * Hide advanced widgets
- * @param hide
- */
+ @brief SearchAndReplaceWidget::setHideAdvanced
+ Hide advanced widgets
+ @param hide
+*/
void SearchAndReplaceWidget::setHideAdvanced(bool hide)
{
m_vertical_animation->setHidden(hide);
@@ -218,12 +227,13 @@ void SearchAndReplaceWidget::setHideAdvanced(bool hide)
}
/**
- * @brief SearchAndReplaceWidget::fillItemsList
- * Fill the tree
- */
+ @brief SearchAndReplaceWidget::fillItemsList
+ Fill the tree
+*/
void SearchAndReplaceWidget::fillItemsList()
{
- disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged, this, &SearchAndReplaceWidget::itemChanged);
+ disconnect(ui->m_tree_widget, &QTreeWidget::itemChanged,
+ this, &SearchAndReplaceWidget::itemChanged);
qDeleteAll(m_element_hash.keys());
m_element_hash.clear();
@@ -235,7 +245,8 @@ void SearchAndReplaceWidget::fillItemsList()
return;
}
ui->m_replace_all_pb->setEnabled(true);
- connect(project_, &QETProject::destroyed, this, &SearchAndReplaceWidget::on_m_reload_pb_clicked);
+ connect(project_, &QETProject::destroyed, this,
+ &SearchAndReplaceWidget::on_m_reload_pb_clicked);
DiagramContent dc;
@@ -263,8 +274,8 @@ void SearchAndReplaceWidget::fillItemsList()
for (Element *elmt : dc.m_elements)
addElement(elmt);
- //Sort child of each "element type" tree item.
- //we hide, "element type" tree item, if they do not have children
+ //Sort child of each "element type" tree item.
+ //we hide, "element type" tree item, if they do not have children
for(QTreeWidgetItem *qtwi : m_qtwi_elmts)
{
qtwi->sortChildren(0, Qt::AscendingOrder);
@@ -292,14 +303,15 @@ void SearchAndReplaceWidget::fillItemsList()
m_conductor_qtwi->sortChildren(0, Qt::AscendingOrder);
updateNextPreviousButtons();
- connect(ui->m_tree_widget, &QTreeWidget::itemChanged, this, &SearchAndReplaceWidget::itemChanged);
+ connect(ui->m_tree_widget, &QTreeWidget::itemChanged,
+ this, &SearchAndReplaceWidget::itemChanged);
}
/**
- * @brief SearchAndReplaceWidget::addElement
- * Add a tree widget item for @element
- * @param element
- */
+ @brief SearchAndReplaceWidget::addElement
+ Add a tree widget item for @element
+ @param element
+*/
void SearchAndReplaceWidget::addElement(Element *element)
{
QTreeWidgetItem *parent = m_elements_qtwi;
@@ -341,9 +353,9 @@ void SearchAndReplaceWidget::addElement(Element *element)
}
/**
- * @brief SearchAndReplaceWidget::search
- * Start the search
- */
+ @brief SearchAndReplaceWidget::search
+ Start the search
+*/
void SearchAndReplaceWidget::search()
{
QString str = ui->m_search_le->text();
@@ -378,19 +390,25 @@ void SearchAndReplaceWidget::search()
qtwi_list.append(m_conductor_hash.keys());
for (QTreeWidgetItem *qtwi : qtwi_list)
{
- QStringList list = qtwi->data(0, Qt::UserRole).toStringList();
+ QStringList list = qtwi->data(0, Qt::UserRole)
+ .toStringList();
if(ui->m_mode_cb->currentIndex() == 0)
{
//Contain string
- list = list.filter(str, ui->m_case_sensitive_cb->isChecked()? Qt::CaseSensitive : Qt::CaseInsensitive);
+ list = list.filter(
+ str,
+ ui->m_case_sensitive_cb->isChecked()
+ ? Qt::CaseSensitive
+ : Qt::CaseInsensitive);
}
else
{
//entire word
QRegularExpression rx("\\b" + str + "\\b");
if (!ui->m_case_sensitive_cb->isChecked()) {
- rx.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
+ rx.setPatternOptions(
+ QRegularExpression::CaseInsensitiveOption);
}
list = list.filter(rx);
}
@@ -403,7 +421,9 @@ void SearchAndReplaceWidget::search()
}
QPalette background = ui->m_search_le->palette();
- background.setColor(QPalette::Base, match ? QColor("#E0FFF0") : QColor("#FFE0EF"));
+ background.setColor(QPalette::Base, match
+ ? QColor("#E0FFF0")
+ : QColor("#FFE0EF"));
ui->m_search_le->setPalette(background);
//Go to the first occurence
@@ -413,12 +433,13 @@ void SearchAndReplaceWidget::search()
}
/**
- * @brief SearchAndReplaceWidget::setVisibleAllParents
- * Set visible all parents of @item until the invisible root item
- * @param item
- * @param expend_parent
- */
-void SearchAndReplaceWidget::setVisibleAllParents(QTreeWidgetItem *item, bool expend_parent)
+ @brief SearchAndReplaceWidget::setVisibleAllParents
+ Set visible all parents of @item until the invisible root item
+ @param item
+ @param expend_parent
+*/
+void SearchAndReplaceWidget::setVisibleAllParents(QTreeWidgetItem *item,
+ bool expend_parent)
{
if (item->parent())
{
@@ -430,12 +451,16 @@ void SearchAndReplaceWidget::setVisibleAllParents(QTreeWidgetItem *item, bool ex
}
/**
- * @brief SearchAndReplaceWidget::nextItem
- * @param item : find the next item from @item, if @item is nullptr, start the search for the root of the tree
- * @param flags
- * @return the next item according to flag or nullptr if there is not a next item
- */
-QTreeWidgetItem *SearchAndReplaceWidget::nextItem(QTreeWidgetItem *item, QTreeWidgetItemIterator::IteratorFlag flags) const
+ @brief SearchAndReplaceWidget::nextItem
+ @param item : find the next item from @item,
+ if @item is nullptr, start the search for the root of the tree
+ @param flags
+ @return the next item according to flag
+ or nullptr if there is not a next item
+*/
+QTreeWidgetItem *SearchAndReplaceWidget::nextItem(
+ QTreeWidgetItem *item,
+ QTreeWidgetItemIterator::IteratorFlag flags) const
{
QTreeWidgetItem *qtwi = item;
if (!item) {
@@ -459,12 +484,16 @@ QTreeWidgetItem *SearchAndReplaceWidget::nextItem(QTreeWidgetItem *item, QTreeWi
}
/**
- * @brief SearchAndReplaceWidget::previousItem
- * @param item : find the previous item from @item, if @item is nullptr, start the search for the root of the tree
- * @param flags
- * @return the previous item according to flag or nullptr if there is not a previous item
- */
-QTreeWidgetItem *SearchAndReplaceWidget::previousItem(QTreeWidgetItem *item, QTreeWidgetItemIterator::IteratorFlag flags) const
+ @brief SearchAndReplaceWidget::previousItem
+ @param item : find the previous item from @item,
+ if @item is nullptr, start the search for the root of the tree
+ @param flags
+ @return the previous item according to flag
+ or nullptr if there is not a previous item
+*/
+QTreeWidgetItem *SearchAndReplaceWidget::previousItem(
+ QTreeWidgetItem *item,
+ QTreeWidgetItemIterator::IteratorFlag flags) const
{
QTreeWidgetItem *qtwi = item;
if (!item) {
@@ -488,10 +517,10 @@ QTreeWidgetItem *SearchAndReplaceWidget::previousItem(QTreeWidgetItem *item, QTr
}
/**
- * @brief SearchAndReplaceWidget::updateNextPreviousButtons
- * According to the current item, if there is a next or a previous item,
- * we enable/disable the buttons next/previous item.
- */
+ @brief SearchAndReplaceWidget::updateNextPreviousButtons
+ According to the current item, if there is a next or a previous item,
+ we enable/disable the buttons next/previous item.
+*/
void SearchAndReplaceWidget::updateNextPreviousButtons()
{
QTreeWidgetItem *item_ = ui->m_tree_widget->currentItem();
@@ -521,7 +550,8 @@ void SearchAndReplaceWidget::updateNextPreviousButtons()
QTreeWidgetItem *previous_ = item_;
do
{
- previous_ = previousItem(previous_, QTreeWidgetItemIterator::NotHidden);
+ previous_ = previousItem(previous_,
+ QTreeWidgetItemIterator::NotHidden);
if (!previous_)
{
ui->m_previous_pb->setDisabled(true);
@@ -536,12 +566,12 @@ void SearchAndReplaceWidget::updateNextPreviousButtons()
}
/**
- * @brief SearchAndReplaceWidget::itemChanged
- * Reimplemented from QTreeWidget.
- * Use to update the check state of items.
- * @param item
- * @param column
- */
+ @brief SearchAndReplaceWidget::itemChanged
+ Reimplemented from QTreeWidget.
+ Use to update the check state of items.
+ @param item
+ @param column
+*/
void SearchAndReplaceWidget::itemChanged(QTreeWidgetItem *item, int column)
{
Q_UNUSED(column);
@@ -554,12 +584,14 @@ void SearchAndReplaceWidget::itemChanged(QTreeWidgetItem *item, int column)
}
/**
- * @brief SearchAndReplaceWidget::setChildCheckState
- * @param item : Parent of the items to be evaluated
- * @param check : check state
- * @param deep : if true, we evaluate every subchilds.
- */
-void SearchAndReplaceWidget::setChildCheckState(QTreeWidgetItem *item, Qt::CheckState check, bool deep)
+ @brief SearchAndReplaceWidget::setChildCheckState
+ @param item : Parent of the items to be evaluated
+ @param check : check state
+ @param deep : if true, we evaluate every subchilds.
+*/
+void SearchAndReplaceWidget::setChildCheckState(QTreeWidgetItem *item,
+ Qt::CheckState check,
+ bool deep)
{
for (int i=0 ; ichildCount() ; ++i)
{
@@ -571,11 +603,13 @@ void SearchAndReplaceWidget::setChildCheckState(QTreeWidgetItem *item, Qt::Check
}
/**
- * @brief SearchAndReplaceWidget::updateParentCheckState
- * @param item : a child item of the parent to be evaluated.
- * @param all_parents : if true, we evaluate every parents, until the root item.
- */
-void SearchAndReplaceWidget::updateParentCheckState(QTreeWidgetItem *item, bool all_parents)
+ @brief SearchAndReplaceWidget::updateParentCheckState
+ @param item : a child item of the parent to be evaluated.
+ @param all_parents : if true, we evaluate every parents,
+ until the root item.
+*/
+void SearchAndReplaceWidget::updateParentCheckState(QTreeWidgetItem *item,
+ bool all_parents)
{
QTreeWidgetItem *parent = item->parent();
@@ -616,9 +650,9 @@ void SearchAndReplaceWidget::updateParentCheckState(QTreeWidgetItem *item, bool
}
/**
- * @brief SearchAndReplaceWidget::activateNextChecked
- * Activate the next checked (and visible) item
- */
+ @brief SearchAndReplaceWidget::activateNextChecked
+ Activate the next checked (and visible) item
+*/
void SearchAndReplaceWidget::activateNextChecked()
{
//Next button is disabled, so there is not a next item.
@@ -627,14 +661,15 @@ void SearchAndReplaceWidget::activateNextChecked()
do {
on_m_next_pb_clicked();
- } while ((ui->m_tree_widget->currentItem()->checkState(0) != Qt::Checked) &&
- ui->m_next_pb->isEnabled());
+ } while ((ui->m_tree_widget->currentItem()->checkState(0)
+ != Qt::Checked
+ ) && ui->m_next_pb->isEnabled());
}
/**
- * @brief SearchAndReplaceWidget::selectedDiagram
- * @return The list of visible and selected diagram in the tree widget
- */
+ @brief SearchAndReplaceWidget::selectedDiagram
+ @return The list of visible and selected diagram in the tree widget
+*/
QList SearchAndReplaceWidget::selectedDiagram() const
{
QList diagram_list;
@@ -654,9 +689,9 @@ QList SearchAndReplaceWidget::selectedDiagram() const
}
/**
- * @brief SearchAndReplaceWidget::selectedElement
- * @return The list of visible and selected element in the tree widget
- */
+ @brief SearchAndReplaceWidget::selectedElement
+ @return The list of visible and selected element in the tree widget
+*/
QList SearchAndReplaceWidget::selectedElement() const
{
QList element_list;
@@ -676,9 +711,9 @@ QList SearchAndReplaceWidget::selectedElement() const
}
/**
- * @brief SearchAndReplaceWidget::selectedConductor
- * @return The list of visible and selected conductor in the tree widget
- */
+ @brief SearchAndReplaceWidget::selectedConductor
+ @return The list of visible and selected conductor in the tree widget
+*/
QList SearchAndReplaceWidget::selectedConductor() const
{
QList conductor_list;
@@ -698,9 +733,10 @@ QList SearchAndReplaceWidget::selectedConductor() const
}
/**
- * @brief SearchAndReplaceWidget::selectedText
- * @return The list of visible and selected independant text in the tree widget
- */
+ @brief SearchAndReplaceWidget::selectedText
+ @return The list of visible and selected independant text
+ in the tree widget
+*/
QList SearchAndReplaceWidget::selectedText() const
{
QList text_list;
@@ -709,7 +745,8 @@ QList SearchAndReplaceWidget::selectedText() const
{
if (!qtwi->isHidden() && qtwi->checkState(0) == Qt::Checked)
{
- QPointer t = m_text_hash.value(qtwi);
+ QPointer t =
+ m_text_hash.value(qtwi);
if (t) {
text_list.append(t.data());
}
@@ -720,14 +757,15 @@ QList SearchAndReplaceWidget::selectedText() const
}
/**
- * @brief SearchAndReplaceWidget::searchTerms
- * @param diagram
- * @return All QStrings use as terms for search.
- */
+ @brief SearchAndReplaceWidget::searchTerms
+ @param diagram
+ @return All QStrings use as terms for search.
+*/
QStringList SearchAndReplaceWidget::searchTerms(Diagram *diagram)
{
QStringList list;
- TitleBlockProperties prop = diagram->border_and_titleblock.exportTitleBlock();
+ TitleBlockProperties prop =
+ diagram->border_and_titleblock.exportTitleBlock();
list.append(prop.title);
list.append(prop.author);
list.append(prop.filename);
@@ -744,10 +782,10 @@ QStringList SearchAndReplaceWidget::searchTerms(Diagram *diagram)
}
/**
- * @brief SearchAndReplaceWidget::searchTerms
- * @param element
- * @return All QString use as terms for search
- */
+ @brief SearchAndReplaceWidget::searchTerms
+ @param element
+ @return All QString use as terms for search
+*/
QStringList SearchAndReplaceWidget::searchTerms(Element *element)
{
QStringList list;
@@ -762,7 +800,10 @@ QStringList SearchAndReplaceWidget::searchTerms(Element *element)
for (DynamicElementTextItem *deti : element->dynamicTextItems())
{
- if (deti->textFrom() == DynamicElementTextItem::UserText || deti->textFrom() == DynamicElementTextItem::CompositeText) {
+ if (deti->textFrom()
+ == DynamicElementTextItem::UserText
+ || deti->textFrom()
+ == DynamicElementTextItem::CompositeText) {
list.append(deti->toPlainText());
}
}
@@ -771,7 +812,10 @@ QStringList SearchAndReplaceWidget::searchTerms(Element *element)
list.append(group->name());
for (DynamicElementTextItem *deti : group->texts()) {
- if (deti->textFrom() == DynamicElementTextItem::UserText || deti->textFrom() == DynamicElementTextItem::CompositeText) {
+ if (deti->textFrom()
+ == DynamicElementTextItem::UserText
+ || deti->textFrom()
+ == DynamicElementTextItem::CompositeText) {
list.append(deti->toPlainText());
}
}
@@ -781,10 +825,10 @@ QStringList SearchAndReplaceWidget::searchTerms(Element *element)
}
/**
- * @brief SearchAndReplaceWidget::searchTerms
- * @param conductor
- * @return all QString use as terms for search.
- */
+ @brief SearchAndReplaceWidget::searchTerms
+ @param conductor
+ @return all QString use as terms for search.
+*/
QStringList SearchAndReplaceWidget::searchTerms(Conductor *conductor)
{
QStringList list;
@@ -800,11 +844,13 @@ QStringList SearchAndReplaceWidget::searchTerms(Conductor *conductor)
}
/**
- * @brief SearchAndReplaceWidget::on_m_quit_button_clicked
- */
+ @brief SearchAndReplaceWidget::on_m_quit_button_clicked
+*/
void SearchAndReplaceWidget::on_m_quit_button_clicked()
{
- if (auto animator = this->findChild("search and replace animator")) {
+ if (auto animator =
+ this->findChild(
+ "search and replace animator")) {
animator->setHidden(!this->isHidden());
} else {
this->setHidden(true);
@@ -812,10 +858,12 @@ void SearchAndReplaceWidget::on_m_quit_button_clicked()
}
void SearchAndReplaceWidget::on_m_advanced_pb_toggled(bool checked) {
- setHideAdvanced(!checked);
+ setHideAdvanced(!checked);
}
-void SearchAndReplaceWidget::on_m_tree_widget_itemDoubleClicked(QTreeWidgetItem *item, int column)
+void SearchAndReplaceWidget::on_m_tree_widget_itemDoubleClicked(
+ QTreeWidgetItem *item,
+ int column)
{
Q_UNUSED(column)
@@ -868,7 +916,9 @@ void SearchAndReplaceWidget::on_m_reload_pb_clicked()
m_root_qtwi->setExpanded(true);
}
-void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
+void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(
+ QTreeWidgetItem *current,
+ QTreeWidgetItem *previous)
{
Q_UNUSED(previous);
@@ -912,7 +962,8 @@ void SearchAndReplaceWidget::on_m_tree_widget_currentItemChanged(QTreeWidgetItem
return;
}
- if (current->checkState(0) == Qt::Checked && !m_category_qtwi.contains(current)) {
+ if (current->checkState(0) == Qt::Checked
+ && !m_category_qtwi.contains(current)) {
ui->m_replace_pb->setEnabled(true);
} else {
ui->m_replace_pb->setDisabled(true);
@@ -944,15 +995,20 @@ void SearchAndReplaceWidget::on_m_previous_pb_clicked()
do
{
- item = previousItem(nullptr, QTreeWidgetItemIterator::NotHidden);
+ item = previousItem(nullptr,
+ QTreeWidgetItemIterator::NotHidden);
if (item) {
ui->m_tree_widget->setCurrentItem(item);
}
else
{
- //There is not a previous selected item, so the current item is m_root_qtwi but we know he must not be selected
- //we user click on the button 'next item'.
- //So we select the first selectable item by calling on_m_next_pb_clicked
+ /* There is not a previous selected item,
+ * so the current item is m_root_qtwi
+ * but we know he must not be selected
+ * we user click on the button 'next item'.
+ * So we select the first selectable item
+ * by calling on_m_next_pb_clicked
+ */
on_m_next_pb_clicked();
return;
}
@@ -976,7 +1032,8 @@ void SearchAndReplaceWidget::on_m_folio_pb_clicked()
text.append(tr(" [édité]"));
}
ui->m_folio_pb->setText(text);
- m_worker.m_titleblock_properties = dialog->titleBlockProperties();
+ m_worker.m_titleblock_properties =
+ dialog->titleBlockProperties();
}
else if (result == QDialogButtonBox::ResetRole)
{
@@ -990,16 +1047,17 @@ void SearchAndReplaceWidget::on_m_folio_pb_clicked()
}
/**
- * @brief SearchAndReplaceWidget::on_m_replace_pb_clicked
- * Replace the current selection
- */
+ @brief SearchAndReplaceWidget::on_m_replace_pb_clicked
+ Replace the current selection
+*/
void SearchAndReplaceWidget::on_m_replace_pb_clicked()
{
QTreeWidgetItem *qtwi = ui->m_tree_widget->currentItem();
if(!qtwi) {
return;
}
- if (!m_category_qtwi.contains(qtwi) && qtwi->checkState(0) == Qt::Checked)
+ if (!m_category_qtwi.contains(qtwi)
+ && qtwi->checkState(0) == Qt::Checked)
{
if (ui->m_folio_pb->text().endsWith(tr(" [édité]")) &&
m_diagram_hash.keys().contains(qtwi))
@@ -1021,7 +1079,8 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
m_text_hash.keys().contains(qtwi))
{
m_worker.m_indi_text = ui->m_replace_le->text();
- QPointer t = m_text_hash.value(qtwi);
+ QPointer t =
+ m_text_hash.value(qtwi);
if (t) {
m_worker.replaceIndiText(t.data());
}
@@ -1046,28 +1105,32 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
if (m_diagram_hash.keys().contains(qtwi))
{
- QPointer d = m_diagram_hash.value(qtwi);
+ QPointer d =
+ m_diagram_hash.value(qtwi);
if (d) {
dl.append(d.data());
}
}
else if (m_element_hash.keys().contains(qtwi))
{
- QPointer e = m_element_hash.value(qtwi);
+ QPointer e =
+ m_element_hash.value(qtwi);
if (e) {
el.append(e.data());
}
}
else if (m_text_hash.keys().contains(qtwi))
{
- QPointer t = m_text_hash.value(qtwi);
+ QPointer t =
+ m_text_hash.value(qtwi);
if (t) {
tl.append(t.data());
}
}
else if (m_conductor_hash.keys().contains(qtwi))
{
- QPointer c = m_conductor_hash.value(qtwi);
+ QPointer c =
+ m_conductor_hash.value(qtwi);
if (c) {
cl.append(c.data());
}
@@ -1082,9 +1145,9 @@ void SearchAndReplaceWidget::on_m_replace_pb_clicked()
}
/**
- * @brief SearchAndReplaceWidget::on_m_replace_all_pb_clicked
- * Replace all checked item
- */
+ @brief SearchAndReplaceWidget::on_m_replace_all_pb_clicked
+ Replace all checked item
+*/
void SearchAndReplaceWidget::on_m_replace_all_pb_clicked()
{
if (ui->m_folio_pb->text().endsWith(tr(" [édité]"))) {
@@ -1102,7 +1165,10 @@ void SearchAndReplaceWidget::on_m_replace_all_pb_clicked()
}
if (ui->m_advanced_replace_pb->text().endsWith(tr(" [édité]"))) {
- m_worker.replaceAdvanced(selectedDiagram(), selectedElement(), selectedText(), selectedConductor());
+ m_worker.replaceAdvanced(selectedDiagram(),
+ selectedElement(),
+ selectedText(),
+ selectedConductor());
}
//Change was made, we reload the panel
@@ -1116,7 +1182,9 @@ void SearchAndReplaceWidget::on_m_replace_all_pb_clicked()
void SearchAndReplaceWidget::on_m_element_pb_clicked()
{
- ReplaceElementDialog *dialog = new ReplaceElementDialog(m_worker.m_element_context, this);
+ ReplaceElementDialog *dialog = new ReplaceElementDialog(
+ m_worker.m_element_context,
+ this);
int result = dialog->exec();
if (result == QDialogButtonBox::AcceptRole)
@@ -1140,10 +1208,10 @@ void SearchAndReplaceWidget::on_m_element_pb_clicked()
}
/**
- * @brief SearchAndReplaceWidget::on_m_mode_cb_currentIndexChanged
- * Update the search when user change mode.
- * @param index
- */
+ @brief SearchAndReplaceWidget::on_m_mode_cb_currentIndexChanged
+ Update the search when user change mode.
+ @param index
+*/
void SearchAndReplaceWidget::on_m_mode_cb_currentIndexChanged(int index)
{
Q_UNUSED(index);
@@ -1151,10 +1219,10 @@ void SearchAndReplaceWidget::on_m_mode_cb_currentIndexChanged(int index)
}
/**
- * @brief SearchAndReplaceWidget::on_m_case_sensitive_cb_stateChanged
- * Update the search when change the case sensitive
- * @param arg1
- */
+ @brief SearchAndReplaceWidget::on_m_case_sensitive_cb_stateChanged
+ Update the search when change the case sensitive
+ @param arg1
+*/
void SearchAndReplaceWidget::on_m_case_sensitive_cb_stateChanged(int arg1)
{
Q_UNUSED(arg1);
@@ -1162,12 +1230,14 @@ void SearchAndReplaceWidget::on_m_case_sensitive_cb_stateChanged(int arg1)
}
/**
- * @brief SearchAndReplaceWidget::on_m_conductor_pb_clicked
- * Open a dialog to edit the condutor properties
- */
+ @brief SearchAndReplaceWidget::on_m_conductor_pb_clicked
+ Open a dialog to edit the condutor properties
+*/
void SearchAndReplaceWidget::on_m_conductor_pb_clicked()
{
- ReplaceConductorDialog *dialog = new ReplaceConductorDialog(m_worker.m_conductor_properties, this);
+ ReplaceConductorDialog *dialog = new ReplaceConductorDialog(
+ m_worker.m_conductor_properties,
+ this);
int result = dialog->exec();
if (result == QDialogButtonBox::AcceptRole)
@@ -1186,17 +1256,20 @@ void SearchAndReplaceWidget::on_m_conductor_pb_clicked()
text.remove(tr(" [édité]"));
}
ui->m_conductor_pb->setText(text);
- m_worker.m_conductor_properties = m_worker.invalidConductorProperties();
+ m_worker.m_conductor_properties =
+ m_worker.invalidConductorProperties();
}
}
/**
- * @brief SearchAndReplaceWidget::on_m_advanced_replace_pb_clicked
- * Open the advanced editor.
- */
+ @brief SearchAndReplaceWidget::on_m_advanced_replace_pb_clicked
+ Open the advanced editor.
+*/
void SearchAndReplaceWidget::on_m_advanced_replace_pb_clicked()
{
- replaceAdvancedDialog *dialog = new replaceAdvancedDialog(m_worker.m_advanced_struct, this);
+ replaceAdvancedDialog *dialog = new replaceAdvancedDialog(
+ m_worker.m_advanced_struct,
+ this);
int result = dialog->exec();
if (result == QDialogButtonBox::AcceptRole)
diff --git a/sources/SearchAndReplace/ui/searchandreplacewidget.h b/sources/SearchAndReplace/ui/searchandreplacewidget.h
index 7a7855c10..8f5448424 100644
--- a/sources/SearchAndReplace/ui/searchandreplacewidget.h
+++ b/sources/SearchAndReplace/ui/searchandreplacewidget.h
@@ -53,13 +53,23 @@ class SearchAndReplaceWidget : public QWidget
void addElement(Element *element);
void search();
- void setVisibleAllParents(QTreeWidgetItem *item, bool expend_parent = true);
- QTreeWidgetItem *nextItem(QTreeWidgetItem *item=nullptr, QTreeWidgetItemIterator::IteratorFlag flags = QTreeWidgetItemIterator::All) const;
- QTreeWidgetItem *previousItem(QTreeWidgetItem *item=nullptr, QTreeWidgetItemIterator::IteratorFlag flags = QTreeWidgetItemIterator::All) const;
+ void setVisibleAllParents(QTreeWidgetItem *item,
+ bool expend_parent = true);
+ QTreeWidgetItem *nextItem(
+ QTreeWidgetItem *item=nullptr,
+ QTreeWidgetItemIterator::IteratorFlag flags
+ = QTreeWidgetItemIterator::All) const;
+ QTreeWidgetItem *previousItem(
+ QTreeWidgetItem *item=nullptr,
+ QTreeWidgetItemIterator::IteratorFlag flags
+ = QTreeWidgetItemIterator::All) const;
void updateNextPreviousButtons();
void itemChanged(QTreeWidgetItem *item, int column);
- void setChildCheckState(QTreeWidgetItem *item, Qt::CheckState check, bool deep = true);
- void updateParentCheckState(QTreeWidgetItem *item, bool all_parents = true);
+ void setChildCheckState(QTreeWidgetItem *item,
+ Qt::CheckState check,
+ bool deep = true);
+ void updateParentCheckState(QTreeWidgetItem *item,
+ bool all_parents = true);
void activateNextChecked();
QList selectedDiagram() const;
QList selectedElement() const;
@@ -74,9 +84,12 @@ class SearchAndReplaceWidget : public QWidget
private slots:
void on_m_quit_button_clicked();
void on_m_advanced_pb_toggled(bool checked);
- void on_m_tree_widget_itemDoubleClicked(QTreeWidgetItem *item, int column);
+ void on_m_tree_widget_itemDoubleClicked(QTreeWidgetItem *item,
+ int column);
void on_m_reload_pb_clicked();
- void on_m_tree_widget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
+ void on_m_tree_widget_currentItemChanged(
+ QTreeWidgetItem *current,
+ QTreeWidgetItem *previous);
void on_m_next_pb_clicked();
void on_m_previous_pb_clicked();
void on_m_folio_pb_clicked();
@@ -104,7 +117,8 @@ class SearchAndReplaceWidget : public QWidget
QList m_qtwi_elmts;
QList m_category_qtwi;
QHash> m_element_hash;
- QHash> m_text_hash;
+ QHash> m_text_hash;
QHash> m_conductor_hash;
QPointer m_highlighted_element;
QPointer m_last_selected;
diff --git a/sources/autoNum/assignvariables.cpp b/sources/autoNum/assignvariables.cpp
index b2962a489..59905dac9 100644
--- a/sources/autoNum/assignvariables.cpp
+++ b/sources/autoNum/assignvariables.cpp
@@ -29,8 +29,8 @@
namespace autonum
{
/**
- * @brief sequentialNumbers::sequentialNumbers
- */
+ @brief sequentialNumbers::sequentialNumbers
+ */
sequentialNumbers::sequentialNumbers()
{}
@@ -46,7 +46,8 @@ namespace autonum
sequentialNumbers::~sequentialNumbers() {}
- sequentialNumbers &sequentialNumbers::operator=(const sequentialNumbers &other)
+ sequentialNumbers &sequentialNumbers::operator=(
+ const sequentialNumbers &other)
{
if (&other == this || other == *this)
return (*this);
@@ -83,37 +84,57 @@ namespace autonum
}
/**
- * @brief sequentialNumbers::toXml
- * export this sequential numbers into a QDomElement.
- * @param document : QDomDocument used to create the QDomElement
- * @param tag_name : the tag name used for the QDomElement.
- * @return A QDomElement, if this sequential have no value, the returned QDomELement is empty
- */
- QDomElement sequentialNumbers::toXml(QDomDocument &document, const QString& tag_name) const
+ @brief sequentialNumbers::toXml
+ export this sequential numbers into a QDomElement.
+ @param document : QDomDocument used to create the QDomElement
+ @param tag_name : the tag name used for the QDomElement.
+ @return A QDomElement, if this sequential have no value,
+ the returned QDomELement is empty
+ */
+ QDomElement sequentialNumbers::toXml(QDomDocument &document,
+ const QString& tag_name) const
{
QDomElement element = document.createElement(tag_name);
if (!unit.isEmpty())
- element.appendChild(QETXML::textToDomElement(document, "unit", unit.join(";")));
+ element.appendChild(QETXML::textToDomElement(
+ document,
+ "unit",
+ unit.join(";")));
if (!unit_folio.isEmpty())
- element.appendChild(QETXML::textToDomElement(document, "unitFolio", unit_folio.join(";")));
+ element.appendChild(QETXML::textToDomElement(
+ document,
+ "unitFolio",
+ unit_folio.join(";")));
if(!ten.isEmpty())
- element.appendChild(QETXML::textToDomElement(document, "ten", ten.join(";")));
+ element.appendChild(QETXML::textToDomElement(
+ document,
+ "ten",
+ ten.join(";")));
if(!ten_folio.isEmpty())
- element.appendChild(QETXML::textToDomElement(document, "tenFolio", ten_folio.join(";")));
+ element.appendChild(QETXML::textToDomElement(
+ document,
+ "tenFolio",
+ ten_folio.join(";")));
if(!hundred.isEmpty())
- element.appendChild(QETXML::textToDomElement(document, "hundred", hundred.join(";")));
+ element.appendChild(QETXML::textToDomElement(
+ document,
+ "hundred",
+ hundred.join(";")));
if(!hundred_folio.isEmpty())
- element.appendChild(QETXML::textToDomElement(document, "hundredFolio", hundred_folio.join(";")));
+ element.appendChild(QETXML::textToDomElement(
+ document,
+ "hundredFolio",
+ hundred_folio.join(";")));
return element;
}
/**
- * @brief sequentialNumbers::fromXml
- * Import sequential values from a QDomElement
- * @param element
- */
+ @brief sequentialNumbers::fromXml
+ Import sequential values from a QDomElement
+ @param element
+ */
void sequentialNumbers::fromXml(const QDomElement &element)
{
if (!element.hasChildNodes())
@@ -152,29 +173,40 @@ namespace autonum
}
/**
- * @brief AssignVariables::formulaToLabel
- * Return the @formula with variable assigned (ready to be displayed)
- * @param formula - the formula to work
- * @param seqStruct - struct where is stocked int values (struct is passed as a reference and modified by this static method)
- * @param diagram - the diagram where occure the formula.
- * @param elmt - parent element (if any) of the formula
- * @return the string with variable assigned.
- */
- QString AssignVariables::formulaToLabel(QString formula, sequentialNumbers &seqStruct, Diagram *diagram, const Element *elmt)
+ @brief AssignVariables::formulaToLabel
+ Return the @formula with variable assigned
+ (ready to be displayed)
+ @param formula - the formula to work
+ @param seqStruct - struct where is stocked int values
+ (struct is passed as a reference
+ and modified by this static method)
+ @param diagram - the diagram where occure the formula.
+ @param elmt - parent element (if any) of the formula
+ @return the string with variable assigned.
+ */
+ QString AssignVariables::formulaToLabel(QString formula,
+ sequentialNumbers &seqStruct,
+ Diagram *diagram,
+ const Element *elmt)
{
- AssignVariables av(std::move(formula), seqStruct, diagram, elmt);
+ AssignVariables av(std::move(formula),
+ seqStruct,
+ diagram,
+ elmt);
seqStruct = av.m_seq_struct;
return av.m_assigned_label;
}
/**
- * @brief AssignVariables::replaceVariable
- * Replace the variables in @formula in form %{my-var} to the corresponding value stored in @dc
- * @param formula
- * @param dc
- * @return
- */
- QString AssignVariables::replaceVariable(const QString &formula, const DiagramContext &dc)
+ @brief AssignVariables::replaceVariable
+ Replace the variables in @formula in form %{my-var}
+ to the corresponding value stored in dc
+ @param formula
+ @param dc
+ @return
+ */
+ QString AssignVariables::replaceVariable(const QString &formula,
+ const DiagramContext &dc)
{
QString str = formula;
str.replace("%{label}", dc.value("label").toString());
@@ -183,13 +215,15 @@ namespace autonum
str.replace("%{description}", dc.value("description").toString());
str.replace("%{designation}", dc.value("designation").toString());
str.replace("%{manufacturer}", dc.value("manufacturer").toString());
- str.replace("%{manufacturer_reference}", dc.value("manufacturer_reference").toString());
+ str.replace("%{manufacturer_reference}",
+ dc.value("manufacturer_reference").toString());
str.replace("%{supplier}", dc.value("supplier").toString());
str.replace("%{quantity}", dc.value("quantity").toString());
str.replace("%{unity}", dc.value("unity").toString());
str.replace("%{auxiliary1}", dc.value("auxiliary1").toString());
str.replace("%{auxiliary2}", dc.value("auxiliary2").toString());
- str.replace("%{machine_manufacturer_reference}", dc.value("machine_manufacturer_reference").toString());
+ str.replace("%{machine_manufacturer_reference}",
+ dc.value("machine_manufacturer_reference").toString());
str.replace("%{location}", dc.value("location").toString());
str.replace("%{function}", dc.value("function").toString());
str.replace("%{void}", QString());
@@ -198,7 +232,10 @@ namespace autonum
}
- AssignVariables::AssignVariables(const QString& formula, const sequentialNumbers& seqStruct , Diagram *diagram, const Element *elmt):
+ AssignVariables::AssignVariables(const QString& formula,
+ const sequentialNumbers& seqStruct,
+ Diagram *diagram,
+ const Element *elmt):
m_diagram(diagram),
m_arg_formula(formula),
m_assigned_label(formula),
@@ -208,14 +245,33 @@ namespace autonum
{
if (m_diagram)
{
- m_assigned_label.replace("%F", m_diagram -> border_and_titleblock.folio());
- m_assigned_label.replace("%f", QString::number(m_diagram->folioIndex()+1));
- m_assigned_label.replace("%id", QString::number(m_diagram->folioIndex()+1));
- m_assigned_label.replace("%total", QString::number(m_diagram->border_and_titleblock.folioTotal()));
- m_assigned_label.replace("%M", m_diagram -> border_and_titleblock.plant());
- m_assigned_label.replace("%LM", m_diagram -> border_and_titleblock.locmach());
+ m_assigned_label.replace("%F",
+ m_diagram
+ -> border_and_titleblock
+ .folio());
+ m_assigned_label.replace("%f",
+ QString::number(
+ m_diagram
+ ->folioIndex()+1));
+ m_assigned_label.replace("%id",
+ QString::number(
+ m_diagram
+ ->folioIndex()+1));
+ m_assigned_label.replace("%total",
+ QString::number(
+ m_diagram
+ ->border_and_titleblock
+ .folioTotal()));
+ m_assigned_label.replace("%M",
+ m_diagram
+ -> border_and_titleblock
+ .plant());
+ m_assigned_label.replace("%LM",
+ m_diagram
+ -> border_and_titleblock
+ .locmach());
- QSettings settings;
+ QSettings settings;
if (m_element)
{
if (settings.value("border-columns_0", true).toBool()){
@@ -297,12 +353,13 @@ namespace autonum
}
/**
- * @brief setSequentialToList
- * Append all sequential of type @type owned by @context in list
- * @param list : list to have value inserted
- * @param context : numerotation context to retrieve value
- * @param type : type of sequential (unit, unitfolio, ten, tenfolio, hundred, hundredfolio)
- */
+ @brief setSequentialToList
+ Append all sequential of type @type owned by @context in list
+ @param list : list to have value inserted
+ @param context : numerotation context to retrieve value
+ @param type : type of sequential
+ (unit, unitfolio, ten, tenfolio, hundred, hundredfolio)
+ */
void setSequentialToList(QStringList &list, NumerotationContext &context, const QString& type)
{
for (int i = 0; i < context.size(); i++)
@@ -321,12 +378,12 @@ namespace autonum
}
/**
- * @brief setFolioSequentialToHash
- * Insert all value of @list in @hash with key @autoNumName
- * @param list : list to get values from
- * @param hash : hash to have values inserted
- * @param autoNumName : name to use as key of hash
- */
+ @brief setFolioSequentialToHash
+ Insert all value of @list in @hash with key @autoNumName
+ @param list : list to get values from
+ @param hash : hash to have values inserted
+ @param autoNumName : name to use as key of hash
+ */
void setFolioSequentialToHash(QStringList &list, QHash &hash, const QString& autoNumName)
{
if (hash.isEmpty() || !hash.contains(autoNumName))
@@ -355,15 +412,20 @@ namespace autonum
}
/**
- * @brief setSequential
- * Fill seqStruct
- * @param label : label of sequential to fill (%sequ_, %sequf_, %seqt_, ect....)
- * @param seqStruct : struct to fill
- * @param context : numerotation context use to know the current sequential num.
- * @param diagram : diagram where the sequential occur, notably use when label is folio type (%sequf_, %seqtf_, %seqhf_),
- * to keep up to date the current sequential of folio.
- * @param hashKey : the hash key used to store the sequential for folio type.
- */
+ @brief setSequential
+ Fill seqStruct
+ @param label : label of sequential to fill
+ (%sequ_, %sequf_, %seqt_, ect....)
+ @param seqStruct : struct to fill
+ @param context : numerotation context use
+ to know the current sequential num.
+ @param diagram : diagram where the sequential occur,
+ notably use when label is folio type
+ (%sequf_, %seqtf_, %seqhf_),
+ to keep up to date the current sequential of folio.
+ @param hashKey :
+ the hash key used to store the sequential for folio type.
+ */
void setSequential(const QString& label, sequentialNumbers &seqStruct, NumerotationContext &context, Diagram *diagram, const QString& hashKey)
{
if (!context.isEmpty())
@@ -399,10 +461,10 @@ namespace autonum
}
/**
- * @brief numerotationContextToFormula
- * @param nc
- * @return the numerotation context, converted to formula
- */
+ @brief numerotationContextToFormula
+ @param nc
+ @return the numerotation context, converted to formula
+ */
QString numerotationContextToFormula(const NumerotationContext &nc)
{
QString type;
@@ -476,11 +538,13 @@ namespace autonum
}
/**
- * @brief elementPrefixForLocation
- * @param location
- * @return the prefix for an element represented by location, prefix can be null.
- * Search for a prefix only if @location represent an element embedded in a project
- */
+ @brief elementPrefixForLocation
+ @param location
+ @return the prefix for an element represented by location,
+ prefix can be null.
+ Search for a prefix only if @location represent
+ an element embedded in a project
+ */
QString elementPrefixForLocation(const ElementsLocation &location)
{
if (!location.isProject())
diff --git a/sources/autoNum/assignvariables.h b/sources/autoNum/assignvariables.h
index c695148d1..ee99c4dae 100644
--- a/sources/autoNum/assignvariables.h
+++ b/sources/autoNum/assignvariables.h
@@ -55,10 +55,10 @@ namespace autonum
};
/**
- * @brief The AssignVariables class
- * This class assign variable of a formula string.
- * Return the final string used to be displayed from a formula string.
- */
+ @brief The AssignVariables class
+ This class assign variable of a formula string.
+ Return the final string used to be displayed from a formula string.
+ */
class AssignVariables
{
public:
diff --git a/sources/autoNum/numerotationcontext.cpp b/sources/autoNum/numerotationcontext.cpp
index 99c302b9a..638e81792 100644
--- a/sources/autoNum/numerotationcontext.cpp
+++ b/sources/autoNum/numerotationcontext.cpp
@@ -21,32 +21,32 @@
#include "qet.h"
/**
- * Constructor
- */
+ Constructor
+*/
NumerotationContext::NumerotationContext(){
}
/**
- * Constructor from xml
- */
+ Constructor from xml
+*/
NumerotationContext::NumerotationContext(QDomElement &e) {
fromXml(e);
}
/**
- * @brief NumerotationContext::clear, clear the content
- */
+ @brief NumerotationContext::clear, clear the content
+*/
void NumerotationContext::clear () {
content_.clear();
}
/**
- * @brief NumerotationContext::addValue, add a new value on the contexte
- * @param type the type of value
- * @param value the value itself
- * @param increase the increase number of value
- * @return true if value is append
- */
+ @brief NumerotationContext::addValue, add a new value on the contexte
+ @param type the type of value
+ @param value the value itself
+ @param increase the increase number of value
+ @return true if value is append
+*/
bool NumerotationContext::addValue(const QString &type, const QVariant &value, const int increase, const int initialvalue) {
if (!keyIsAcceptable(type) && !value.canConvert(QVariant::String)) return false;
if (keyIsNumber(type) && !value.canConvert(QVariant::Int)) return false;
@@ -58,80 +58,80 @@ bool NumerotationContext::addValue(const QString &type, const QVariant &value, c
}
/**
- * @brief NumerotationContext::operator []
- * @return the string at position @i
- */
+ @brief NumerotationContext::operator []
+ @return the string at position @i
+*/
QString NumerotationContext::operator [] (const int &i) const {
return (content_.at(i));
}
/**
- * @brief NumerotationContext::operator << , append other
- */
+ @brief NumerotationContext::operator << , append other
+*/
void NumerotationContext::operator << (const NumerotationContext &other) {
for (int i=0; i 0) return false;
return true;
}
/**
- * @brief NumerotationContext::itemAt
- * @return the content at position @i 1:type 2:value 3:increase
- */
+ @brief NumerotationContext::itemAt
+ @return the content at position @i 1:type 2:value 3:increase
+*/
QStringList NumerotationContext::itemAt(const int i) const {
return (content_.at(i).split("|"));
}
/**
- * @brief validRegExpNum
- * @return all type use to numerotation
- */
+ @brief validRegExpNum
+ @return all type use to numerotation
+*/
QString NumerotationContext::validRegExpNum () const {
return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio|string|idfolio|folio|plant|locmach|elementline|elementcolumn|elementprefix");
}
/**
- * @brief NumerotationContext::validRegExpNumber
- * @return all type represents a number
- */
+ @brief NumerotationContext::validRegExpNumber
+ @return all type represents a number
+*/
QString NumerotationContext::validRegExpNumber() const {
return ("unit|unitfolio|ten|tenfolio|hundred|hundredfolio");
}
/**
- * @brief NumerotationContext::keyIsAcceptable
- * @return true if @type is acceptable
- */
+ @brief NumerotationContext::keyIsAcceptable
+ @return true if @type is acceptable
+*/
bool NumerotationContext::keyIsAcceptable(const QString &type) const {
return (type.contains(QRegExp(validRegExpNum())));
}
/**
- * @brief NumerotationContext::keyIsNumber
- * @return true if @type represent a number
- */
+ @brief NumerotationContext::keyIsNumber
+ @return true if @type represent a number
+*/
bool NumerotationContext::keyIsNumber(const QString &type) const {
return (type.contains(QRegExp(validRegExpNumber())));
}
/**
- * @brief NumerotationContext::toXml
- * Save the numerotation context in a QDomElement under the element name @str
- */
+ @brief NumerotationContext::toXml
+ Save the numerotation context in a QDomElement under the element name @str
+*/
QDomElement NumerotationContext::toXml(QDomDocument &d, const QString& str) {
QDomElement num_auto = d.createElement(str);
for (int i=0; idisconnect();
@@ -48,9 +48,9 @@ AutoNumberingDockWidget::~AutoNumberingDockWidget()
}
/**
- * @brief AutoNumberingDockWidget::clear
- * Remove all combo box values
- */
+ @brief AutoNumberingDockWidget::clear
+ Remove all combo box values
+*/
void AutoNumberingDockWidget::clear()
{
ui->m_conductor_cb->clear();
@@ -67,11 +67,11 @@ void AutoNumberingDockWidget::projectClosed()
}
/**
- * @brief AutoNumberingDockWidget::setProject
- * @param project: project to be setted
- * @param projectview: projectview to be setted
- * assign Project and ProjectView, connect all signals and setContext
- */
+ @brief AutoNumberingDockWidget::setProject
+ @param project: project to be setted
+ @param projectview: projectview to be setted
+ assign Project and ProjectView, connect all signals and setContext
+*/
void AutoNumberingDockWidget::setProject(QETProject *project, ProjectView *projectview)
{
//Disconnect previous project
@@ -133,9 +133,9 @@ void AutoNumberingDockWidget::setProject(QETProject *project, ProjectView *proje
}
/**
- * @brief AutoNumberingDockWidget::setContext
- * Add all itens to comboboxes
- */
+ @brief AutoNumberingDockWidget::setContext
+ Add all itens to comboboxes
+*/
void AutoNumberingDockWidget::setContext() {
this->clear();
@@ -165,9 +165,9 @@ void AutoNumberingDockWidget::setContext() {
}
/**
- * @brief AutoNumberingDockWidget::setConductorActive
- * @param dv: activated diagramview
- */
+ @brief AutoNumberingDockWidget::setConductorActive
+ @param dv: activated diagramview
+*/
void AutoNumberingDockWidget::setConductorActive(DiagramView* dv) {
if (dv!=nullptr) {
QString conductor_autonum = dv->diagram()->conductorsAutonumName();
@@ -177,9 +177,9 @@ void AutoNumberingDockWidget::setConductorActive(DiagramView* dv) {
}
/**
- * @brief AutoNumberingDockWidget::setActive
- * Set current used autonumberings
- */
+ @brief AutoNumberingDockWidget::setActive
+ Set current used autonumberings
+*/
void AutoNumberingDockWidget::setActive() {
if (m_project_view!=nullptr) {
@@ -206,9 +206,9 @@ void AutoNumberingDockWidget::setActive() {
}
/**
- * @brief AutoNumberingDockWidget::conductorAutoNumChanged
- * Add new or remove conductor auto num from combobox
- */
+ @brief AutoNumberingDockWidget::conductorAutoNumChanged
+ Add new or remove conductor auto num from combobox
+*/
void AutoNumberingDockWidget::conductorAutoNumChanged() {
ui->m_conductor_cb->clear();
@@ -222,10 +222,10 @@ void AutoNumberingDockWidget::conductorAutoNumChanged() {
}
/**
- * @brief AutoNumberingDockWidget::on_m_conductor_cb_activated
- * @param unused
- * Set new conductor AutoNum
- */
+ @brief AutoNumberingDockWidget::on_m_conductor_cb_activated
+ @param unused
+ Set new conductor AutoNum
+*/
void AutoNumberingDockWidget::on_m_conductor_cb_activated(int)
{
QString current_autonum = ui->m_conductor_cb->currentText();
@@ -236,9 +236,9 @@ void AutoNumberingDockWidget::on_m_conductor_cb_activated(int)
}
/**
- * @brief AutoNumberingDockWidget::elementAutoNumChanged
- * Add new or remove element auto num from combobox
- */
+ @brief AutoNumberingDockWidget::elementAutoNumChanged
+ Add new or remove element auto num from combobox
+*/
void AutoNumberingDockWidget::elementAutoNumChanged() {
ui->m_element_cb->clear();
@@ -253,10 +253,10 @@ void AutoNumberingDockWidget::elementAutoNumChanged() {
}
/**
- * @brief AutoNumberingDockWidget::on_m_element_cb_activated
- * @param unused
- * Set new element AutoNum
- */
+ @brief AutoNumberingDockWidget::on_m_element_cb_activated
+ @param unused
+ Set new element AutoNum
+*/
void AutoNumberingDockWidget::on_m_element_cb_activated(int)
{
m_project->setCurrrentElementAutonum(ui->m_element_cb->currentText());
@@ -264,9 +264,9 @@ void AutoNumberingDockWidget::on_m_element_cb_activated(int)
}
/**
- * @brief AutoNumberingDockWidget::folioAutoNumChanged
- * Add new or remove folio auto num from combobox
- */
+ @brief AutoNumberingDockWidget::folioAutoNumChanged
+ Add new or remove folio auto num from combobox
+*/
void AutoNumberingDockWidget::folioAutoNumChanged() {
ui->m_folio_cb->clear();
@@ -281,10 +281,10 @@ void AutoNumberingDockWidget::folioAutoNumChanged() {
}
/**
- * @brief AutoNumberingDockWidget::on_m_folio_cb_activated
- * @param unused
- * Set new folio AutoNum
- */
+ @brief AutoNumberingDockWidget::on_m_folio_cb_activated
+ @param unused
+ Set new folio AutoNum
+*/
void AutoNumberingDockWidget::on_m_folio_cb_activated(int) {
QString current_autonum = ui->m_folio_cb->currentText();
TitleBlockProperties ip = m_project -> defaultTitleBlockProperties();
diff --git a/sources/autoNum/ui/folioautonumbering.cpp b/sources/autoNum/ui/folioautonumbering.cpp
index 71a6373c2..0b5c16448 100644
--- a/sources/autoNum/ui/folioautonumbering.cpp
+++ b/sources/autoNum/ui/folioautonumbering.cpp
@@ -23,8 +23,8 @@
#include "qetproject.h"
#include "diagram.h"
/**
- * Constructor
- */
+ Constructor
+*/
FolioAutonumberingW::FolioAutonumberingW(QETProject *project, QWidget *parent) :
QWidget(parent),
project_(project),
@@ -39,56 +39,56 @@ FolioAutonumberingW::FolioAutonumberingW(QETProject *project, QWidget *parent) :
}
/**
- * Destructor
- */
+ Destructor
+*/
FolioAutonumberingW::~FolioAutonumberingW()
{
delete ui;
}
/**
- * @brief FolioAutonumberingW::setContext
- * construct autonums in the comboBox selected in the @autonum_chooser QcomboBox
- */
+ @brief FolioAutonumberingW::setContext
+ construct autonums in the comboBox selected in the @autonum_chooser QcomboBox
+*/
void FolioAutonumberingW::setContext(QList autonums) {
foreach (QString str, autonums) { ui->m_autonums_cb->addItem(str);}
}
/**
- * @brief FolioAutonumberingW::autoNumSelected
- * returns the current autonum selected
- */
+ @brief FolioAutonumberingW::autoNumSelected
+ returns the current autonum selected
+*/
QString FolioAutonumberingW::autoNumSelected(){
return ui->m_autonums_cb->currentText();
}
/**
- * @brief FolioAutonumberingW::fromFolio
- * returns the current "From Folio" index
- */
+ @brief FolioAutonumberingW::fromFolio
+ returns the current "From Folio" index
+*/
int FolioAutonumberingW::fromFolio(){
return ui->m_from_cb->currentIndex()-1;
}
/**
- * @brief FolioAutonumberingW::toFolio
- * returns the current "To Folio" index
- */
+ @brief FolioAutonumberingW::toFolio
+ returns the current "To Folio" index
+*/
int FolioAutonumberingW::toFolio(){
return ui->m_to_cb->currentIndex()+this->fromFolio()+1;
}
/**
- * @brief FolioAutonumberingW::newFoliosNumber
- * returns the number of folios to create
- */
+ @brief FolioAutonumberingW::newFoliosNumber
+ returns the number of folios to create
+*/
int FolioAutonumberingW::newFoliosNumber(){
return ui->m_new_tabs_sb->value();
}
/**
- * @brief FolioAutonumberingW::updateFolioList
- * update Folio List in From and To ComboBox
- */
+ @brief FolioAutonumberingW::updateFolioList
+ update Folio List in From and To ComboBox
+*/
void FolioAutonumberingW::updateFolioList(){
ui -> m_from_cb->clear();
ui -> m_to_cb->clear();
@@ -100,9 +100,9 @@ void FolioAutonumberingW::updateFolioList(){
}
/**
- * @brief FolioAutonumberingW::on_m_create_new_tabs_rb_clicked
+ @brief FolioAutonumberingW::on_m_create_new_tabs_rb_clicked
* Enable New Tabs SpinBox
- */
+*/
void FolioAutonumberingW::on_m_create_new_tabs_rb_clicked() {
ui->m_from_cb->setEnabled(false);
ui->m_to_cb->setEnabled(false);
@@ -112,9 +112,9 @@ void FolioAutonumberingW::on_m_create_new_tabs_rb_clicked() {
}
/**
- * @brief FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked
+ @brief FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked
* Enable From ComboBox, fill From ComboBox
- */
+*/
void FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked() {
ui->m_new_tabs_sb->setEnabled(false);
ui->m_from_cb->setEnabled(true);
@@ -131,18 +131,18 @@ void FolioAutonumberingW::on_m_autonumber_tabs_rb_clicked() {
}
/**
- * @brief FolioAutonumberingW::on_m_new_tabs_sb_valueChanged
+ @brief FolioAutonumberingW::on_m_new_tabs_sb_valueChanged
* Enable Apply if any new folio is to be created
- */
+*/
void FolioAutonumberingW::on_m_new_tabs_sb_valueChanged(int){
if (ui->m_new_tabs_sb->value()>0) applyEnable(true);
else applyEnable(false);
}
/**
- * @brief FolioAutonumberingW::on_m_from_cb_currentIndexChanged
+ @brief FolioAutonumberingW::on_m_from_cb_currentIndexChanged
* Enable To ComboBox
- */
+*/
void FolioAutonumberingW::on_m_from_cb_currentIndexChanged(int){
int index = ui->m_from_cb->currentIndex();
ui->m_to_cb->clear();
@@ -159,9 +159,9 @@ void FolioAutonumberingW::on_m_from_cb_currentIndexChanged(int){
}
/**
- * @brief SelectAutonumW::on_buttonBox_clicked
- * Action on @buttonBox clicked
- */
+ @brief SelectAutonumW::on_buttonBox_clicked
+ Action on @buttonBox clicked
+*/
void FolioAutonumberingW::on_buttonBox_clicked(QAbstractButton *button) {
//transform button to int
int answer = ui -> buttonBox -> buttonRole(button);
@@ -194,9 +194,9 @@ void FolioAutonumberingW::on_buttonBox_clicked(QAbstractButton *button) {
}
/**
- * @brief SelectAutonumW::applyEnable
- * enable/disable the apply button
- */
+ @brief SelectAutonumW::applyEnable
+ enable/disable the apply button
+*/
void FolioAutonumberingW::applyEnable(bool b) {
if (b){
bool valid = true;
diff --git a/sources/autoNum/ui/formulaautonumberingw.cpp b/sources/autoNum/ui/formulaautonumberingw.cpp
index af9264214..5a2ee35b9 100644
--- a/sources/autoNum/ui/formulaautonumberingw.cpp
+++ b/sources/autoNum/ui/formulaautonumberingw.cpp
@@ -23,8 +23,8 @@
#include
/**
- * Constructor
- */
+ Constructor
+*/
FormulaAutonumberingW::FormulaAutonumberingW(QWidget *parent) :
QWidget(parent),
ui(new Ui::FormulaAutonumberingW)
@@ -35,41 +35,41 @@ FormulaAutonumberingW::FormulaAutonumberingW(QWidget *parent) :
}
/**
- * Destructor
- */
+ Destructor
+*/
FormulaAutonumberingW::~FormulaAutonumberingW()
{
delete ui;
}
/**
- * @brief FormulaAutonumberingW::setContext
- * @param formula to be inserted into context
- */
+ @brief FormulaAutonumberingW::setContext
+ @param formula to be inserted into context
+*/
void FormulaAutonumberingW::setContext(const QString& formula) {
ui->m_formula_le->insert(formula);
}
/**
- * @brief FormulaAutonumberingW::clearContext
- * @param clear formula line edit text
- */
+ @brief FormulaAutonumberingW::clearContext
+ @param clear formula line edit text
+*/
void FormulaAutonumberingW::clearContext() {
ui->m_formula_le->clear();
}
/**
- * @brief FormulaAutonumberingW::formula
- * @return formula to be stored into project
- */
+ @brief FormulaAutonumberingW::formula
+ @return formula to be stored into project
+*/
QString FormulaAutonumberingW::formula() {
return ui->m_formula_le->text();
}
/**
- * @brief FormulaAutonumberingW::on_m_formula_le_textChanged
- * Update Apply Button
- */
+ @brief FormulaAutonumberingW::on_m_formula_le_textChanged
+ Update Apply Button
+*/
void FormulaAutonumberingW::on_m_formula_le_textChanged(QString text) {
emit (textChanged(std::move(text)));
}
diff --git a/sources/autoNum/ui/numparteditorw.cpp b/sources/autoNum/ui/numparteditorw.cpp
index f632196bc..bc9aa8f24 100644
--- a/sources/autoNum/ui/numparteditorw.cpp
+++ b/sources/autoNum/ui/numparteditorw.cpp
@@ -20,8 +20,8 @@
#include "ui_numparteditorw.h"
/**
- * Constructor
- */
+ Constructor
+*/
NumPartEditorW::NumPartEditorW(int type, QWidget *parent) :
QWidget(parent),
ui(new Ui::NumPartEditorW),
@@ -34,9 +34,9 @@ NumPartEditorW::NumPartEditorW(int type, QWidget *parent) :
}
/**
- * Constructor
- * Build with value of @context at position i
- */
+ Constructor
+ Build with value of @context at position i
+*/
NumPartEditorW::NumPartEditorW (NumerotationContext &context, int i, int type, QWidget *parent):
QWidget(parent),
ui(new Ui::NumPartEditorW),
@@ -69,8 +69,8 @@ NumPartEditorW::NumPartEditorW (NumerotationContext &context, int i, int type, Q
}
/**
- * Destructor
- */
+ Destructor
+*/
NumPartEditorW::~NumPartEditorW()
{
delete intValidator;
@@ -102,9 +102,9 @@ void NumPartEditorW::setVisibleItems()
}
/**
- * @brief NumPartEditorW::toNumContext
- * @return the display to NumerotationContext
- */
+ @brief NumPartEditorW::toNumContext
+ @return the display to NumerotationContext
+*/
NumerotationContext NumPartEditorW::toNumContext() {
NumerotationContext nc;
QString type_str;
@@ -160,9 +160,9 @@ NumerotationContext NumPartEditorW::toNumContext() {
}
/**
- * @brief NumPartEditorW::isValid
- * @return true if value field isn't empty or if type is folio
- */
+ @brief NumPartEditorW::isValid
+ @return true if value field isn't empty or if type is folio
+*/
bool NumPartEditorW::isValid() {
if (type_ == folio || type_ == idfolio || type_ == elementline || type_ == plant || type_ == locmach ||
type_ == elementcolumn || type_ == elementprefix) {return true;}
@@ -171,9 +171,9 @@ bool NumPartEditorW::isValid() {
}
/**
- * @brief NumPartEditorW::on_type_cb_activated
- * Action when user change the type comboBox
- */
+ @brief NumPartEditorW::on_type_cb_activated
+ Action when user change the type comboBox
+*/
void NumPartEditorW::on_type_cb_activated(int) {
if (ui->type_cb->currentText() == tr("Chiffre 1"))
setType(unit);
@@ -207,27 +207,27 @@ void NumPartEditorW::on_type_cb_activated(int) {
}
/**
- * @brief NumPartEditorW::on_value_field_textChanged
- * emit changed when @value_field text changed
- */
+ @brief NumPartEditorW::on_value_field_textChanged
+ emit changed when @value_field text changed
+*/
void NumPartEditorW::on_value_field_textEdited() {
emit changed();
}
/**
- * @brief NumPartEditorW::on_increase_spinBox_valueChanged
- * emit changed when @increase_spinBox value changed
- */
+ @brief NumPartEditorW::on_increase_spinBox_valueChanged
+ emit changed when @increase_spinBox value changed
+*/
void NumPartEditorW::on_increase_spinBox_valueChanged(int) {
if (!ui -> value_field -> text().isEmpty()) emit changed();
}
/**
- * @brief NumPartEditorW::setType
- * Set good behavior by type @t
- * @param t, type used
- * @param fnum, force the behavior of numeric type
- */
+ @brief NumPartEditorW::setType
+ Set good behavior by type @t
+ @param t, type used
+ @param fnum, force the behavior of numeric type
+*/
void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) {
setCurrentIndex(t);
@@ -285,10 +285,10 @@ void NumPartEditorW::setType(NumPartEditorW::type t, bool fnum) {
}
/**
- * @brief NumPartEditorW::setCurrentIndex
- * Set Current Index of type_cb
- * @param t, type used
- */
+ @brief NumPartEditorW::setCurrentIndex
+ Set Current Index of type_cb
+ @param t, type used
+*/
void NumPartEditorW::setCurrentIndex(NumPartEditorW::type t) {
int i=-1;
if (t == unit)
diff --git a/sources/autoNum/ui/numparteditorw.h b/sources/autoNum/ui/numparteditorw.h
index c3fcdbb37..a191e25cd 100644
--- a/sources/autoNum/ui/numparteditorw.h
+++ b/sources/autoNum/ui/numparteditorw.h
@@ -26,7 +26,7 @@
*This class represent a single part num widget. By this widget, we can define and edit
*how the num auto must work .
*This widget is called by selectautonumw.
- */
+*/
namespace Ui {
class NumPartEditorW;
}
diff --git a/sources/autoNum/ui/selectautonumw.cpp b/sources/autoNum/ui/selectautonumw.cpp
index 54d099436..5f42abb50 100644
--- a/sources/autoNum/ui/selectautonumw.cpp
+++ b/sources/autoNum/ui/selectautonumw.cpp
@@ -25,8 +25,8 @@
#include "assignvariables.h"
/**
- * Constructor
- */
+ Constructor
+*/
SelectAutonumW::SelectAutonumW(int type, QWidget *parent) :
QWidget(parent),
ui(new Ui::SelectAutonumW),
@@ -72,17 +72,17 @@ SelectAutonumW::SelectAutonumW(const NumerotationContext &context, int type, QWi
}
/**
- * Destructor
- */
+ Destructor
+*/
SelectAutonumW::~SelectAutonumW()
{
delete ui;
}
/**
- * @brief SelectAutonumW::setCurrentContext
- * build the context of current diagram selected in the @diagram_chooser QcomboBox
- */
+ @brief SelectAutonumW::setCurrentContext
+ build the context of current diagram selected in the @diagram_chooser QcomboBox
+*/
void SelectAutonumW::setContext(const NumerotationContext &context) {
m_context = context;
@@ -109,9 +109,9 @@ void SelectAutonumW::setContext(const NumerotationContext &context) {
}
/**
- * @brief SelectAutonumW::toNumContext
- * @return the content to @num_part_list to NumerotationContext
- */
+ @brief SelectAutonumW::toNumContext
+ @return the content to @num_part_list to NumerotationContext
+*/
NumerotationContext SelectAutonumW::toNumContext() const {
NumerotationContext nc;
foreach (NumPartEditorW *npew, num_part_list_) nc << npew -> toNumContext();
@@ -119,9 +119,9 @@ NumerotationContext SelectAutonumW::toNumContext() const {
}
/**
- * @brief SelectAutonumW::on_add_button_clicked
+ @brief SelectAutonumW::on_add_button_clicked
* Action on add_button, add a @NumPartEditor
- */
+*/
void SelectAutonumW::on_add_button_clicked()
{
applyEnable(false);
@@ -133,9 +133,9 @@ void SelectAutonumW::on_add_button_clicked()
}
/**
- * @brief SelectAutonumW::on_remove_button_clicked
+ @brief SelectAutonumW::on_remove_button_clicked
* Action on remove button, remove the last @NumPartEditor
- */
+*/
void SelectAutonumW::on_remove_button_clicked() {
//remove if @num_part_list contains more than one item
if (num_part_list_.size() > 1) {
@@ -150,9 +150,9 @@ void SelectAutonumW::on_remove_button_clicked() {
}
/**
- * @brief SelectAutonumW::formula
- * @return autonumbering widget formula
- */
+ @brief SelectAutonumW::formula
+ @return autonumbering widget formula
+*/
QString SelectAutonumW::formula()
{
if (m_edited_type == 0)
@@ -169,9 +169,9 @@ QComboBox *SelectAutonumW::contextComboBox() const
}
/**
- * @brief SelectAutonumW::on_buttonBox_clicked
- * Action on @buttonBox clicked
- */
+ @brief SelectAutonumW::on_buttonBox_clicked
+ Action on @buttonBox clicked
+*/
void SelectAutonumW::on_buttonBox_clicked(QAbstractButton *button) {
//transform button to int
int answer = ui -> buttonBox -> buttonRole(button);
@@ -233,9 +233,9 @@ void SelectAutonumW::on_buttonBox_clicked(QAbstractButton *button) {
}
/**
- * @brief SelectAutonumW::applyEnable
- * enable/disable the apply button
- */
+ @brief SelectAutonumW::applyEnable
+ enable/disable the apply button
+*/
void SelectAutonumW::applyEnable(bool b) {
if (b){
bool valid= true;
@@ -252,9 +252,9 @@ void SelectAutonumW::applyEnable(bool b) {
}
/**
- * @brief SelectAutonumW::contextToFormula
- * Apply formula to ElementAutonumbering Widget
- */
+ @brief SelectAutonumW::contextToFormula
+ Apply formula to ElementAutonumbering Widget
+*/
void SelectAutonumW::contextToFormula()
{
FormulaAutonumberingW* m_faw = nullptr;
@@ -271,9 +271,9 @@ void SelectAutonumW::contextToFormula()
}
/**
- * @brief SelectAutonumW::on_m_next_pb_clicked
- * Increase NumerotationContext
- */
+ @brief SelectAutonumW::on_m_next_pb_clicked
+ Increase NumerotationContext
+*/
void SelectAutonumW::on_m_next_pb_clicked()
{
NumerotationContextCommands ncc (toNumContext());
@@ -282,9 +282,9 @@ void SelectAutonumW::on_m_next_pb_clicked()
}
/**
- * @brief SelectAutonumW::on_m_previous_pb_clicked
- * Decrease NumerotationContext
- */
+ @brief SelectAutonumW::on_m_previous_pb_clicked
+ Decrease NumerotationContext
+*/
void SelectAutonumW::on_m_previous_pb_clicked()
{
NumerotationContextCommands ncc (toNumContext());
diff --git a/sources/bordertitleblock.cpp b/sources/bordertitleblock.cpp
index 8724bbac2..b1000ff09 100644
--- a/sources/bordertitleblock.cpp
+++ b/sources/bordertitleblock.cpp
@@ -605,13 +605,13 @@ void BorderTitleBlock::draw(QPainter *painter)
}
/**
- * @brief BorderTitleBlock::drawDxf
- * @param width
- * @param height
- * @param keep_aspect_ratio
- * @param file_path
- * @param color
- */
+ @brief BorderTitleBlock::drawDxf
+ @param width
+ @param height
+ @param keep_aspect_ratio
+ @param file_path
+ @param color
+*/
void BorderTitleBlock::drawDxf(
int width,
int height,
diff --git a/sources/conductornumexport.cpp b/sources/conductornumexport.cpp
index d2f45a1af..86c65f5b7 100644
--- a/sources/conductornumexport.cpp
+++ b/sources/conductornumexport.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "conductornumexport.h"
#include "diagram.h"
@@ -26,10 +26,10 @@
#include
/**
- * @brief ConductorNumExport::ConductorNumExport
- * @param project : the project to export the conductors num
- * @param parent : parent widget
- */
+ @brief ConductorNumExport::ConductorNumExport
+ @param project : the project to export the conductors num
+ @param parent : parent widget
+*/
ConductorNumExport::ConductorNumExport(QETProject *project, QWidget *parent) :
m_project(project),
m_parent_widget(parent)
@@ -38,10 +38,10 @@ ConductorNumExport::ConductorNumExport(QETProject *project, QWidget *parent) :
}
/**
- * @brief ConductorNumExport::toCsv
- * Export the num of conductors into a csv file.
- * @return true if suceesfully exported.
- */
+ @brief ConductorNumExport::toCsv
+ Export the num of conductors into a csv file.
+ @return true if suceesfully exported.
+*/
bool ConductorNumExport::toCsv()
{
QString name = QObject::tr("numero_de_fileries_") + m_project->title() + ".csv";
@@ -86,9 +86,9 @@ bool ConductorNumExport::toCsv()
}
/**
- * @brief ConductorNumExport::wiresNum
- * @return the wire num formated in csv
- */
+ @brief ConductorNumExport::wiresNum
+ @return the wire num formated in csv
+*/
QString ConductorNumExport::wiresNum() const
{
QString csv;
@@ -106,9 +106,9 @@ QString ConductorNumExport::wiresNum() const
}
/**
- * @brief ConductorNumExport::fillHash
- * @value m_hash
- */
+ @brief ConductorNumExport::fillHash
+ @value m_hash
+*/
void ConductorNumExport::fillHash()
{
//We used this rx to avoid insert num composed only withe white space.
diff --git a/sources/conductornumexport.h b/sources/conductornumexport.h
index c741f8de9..973da3f7b 100644
--- a/sources/conductornumexport.h
+++ b/sources/conductornumexport.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef ConductorNumExport_H
#define ConductorNumExport_H
@@ -24,9 +24,9 @@ class QETProject;
class QWidget;
/**
- * @brief The ConductorNumExport class
- * A class to export the num of conductors into a csv file.
- */
+ @brief The ConductorNumExport class
+ A class to export the num of conductors into a csv file.
+*/
class ConductorNumExport
{
public:
diff --git a/sources/conductorproperties.cpp b/sources/conductorproperties.cpp
index 40bcf4499..2ae95ea70 100644
--- a/sources/conductorproperties.cpp
+++ b/sources/conductorproperties.cpp
@@ -241,10 +241,10 @@ ConductorProperties::~ConductorProperties() {
/**
- * @brief ConductorProperties::toXml
- * Export conductor propertie, in the XML element 'e'
- * @param e the xml element
- */
+ @brief ConductorProperties::toXml
+ Export conductor propertie, in the XML element 'e'
+ @param e the xml element
+*/
void ConductorProperties::toXml(QDomElement &e) const
{
e.setAttribute("type", typeToString(type));
@@ -284,10 +284,10 @@ void ConductorProperties::toXml(QDomElement &e) const
/**
- * @brief ConductorProperties::fromXml
- * Import conductor propertie, from the attribute of the xml element 'e'
- * @param e the xml document
- */
+ @brief ConductorProperties::fromXml
+ Import conductor propertie, from the attribute of the xml element 'e'
+ @param e the xml document
+*/
void ConductorProperties::fromXml(QDomElement &e)
{
// get conductor color
@@ -440,11 +440,11 @@ QString ConductorProperties::typeToString(ConductorType t)
}
/**
- * @brief ConductorProperties::applyForEqualAttributes
- * Test each attribute of properties in the list separatly.
- * For each attributes, if is equal, the attribute is apply to this.
- * @param list
- */
+ @brief ConductorProperties::applyForEqualAttributes
+ Test each attribute of properties in the list separatly.
+ For each attributes, if is equal, the attribute is apply to this.
+ @param list
+*/
void ConductorProperties::applyForEqualAttributes(QList list)
{
const QList clist = std::move(list);
@@ -698,9 +698,9 @@ void ConductorProperties::applyForEqualAttributes(QList lis
}
/**
- * @brief ConductorProperties::defaultProperties
- * @return the default properties stored in the setting file
- */
+ @brief ConductorProperties::defaultProperties
+ @return the default properties stored in the setting file
+*/
ConductorProperties ConductorProperties::defaultProperties()
{
QSettings settings;
@@ -712,10 +712,10 @@ ConductorProperties ConductorProperties::defaultProperties()
}
/**
- * @brief ConductorProperties::operator ==
- * @param other
- * @return true if other == this
- */
+ @brief ConductorProperties::operator ==
+ @param other
+ @return true if other == this
+*/
bool ConductorProperties::operator==(const ConductorProperties &other) const
{
return(
diff --git a/sources/configdialog.cpp b/sources/configdialog.cpp
index 1d5889ccf..3981734b7 100644
--- a/sources/configdialog.cpp
+++ b/sources/configdialog.cpp
@@ -137,10 +137,10 @@ void ConfigDialog::addPage(ConfigPage *page) {
}
/**
- * @brief ConfigDialog::setCurrentPage
- * Set the current index to @index
- * @param index
- */
+ @brief ConfigDialog::setCurrentPage
+ Set the current index to @index
+ @param index
+*/
void ConfigDialog::setCurrentPage(const int index) {
pages_list->setCurrentRow(index);
}
diff --git a/sources/configdialog.h b/sources/configdialog.h
index 6830efeb1..7e004e2fb 100644
--- a/sources/configdialog.h
+++ b/sources/configdialog.h
@@ -25,37 +25,37 @@ class QStackedWidget;
class QDialogButtonBox;
/**
This class represents the configuration dialog for QElectroTech.
- It displays "configuration pages", each page having to provide an icon and
- a title.
+ It displays "configuration pages",
+ each page having to provide an icon and a title.
*/
class ConfigDialog : public QDialog {
Q_OBJECT
// constructors, destructor
public:
- ConfigDialog(QWidget * = nullptr);
- ~ConfigDialog() override;
+ ConfigDialog(QWidget * = nullptr);
+ ~ConfigDialog() override;
private:
- ConfigDialog(const ConfigDialog &);
+ ConfigDialog(const ConfigDialog &);
- public:
- QList pages;
+ public:
+ QList pages;
// methods
public slots:
- void applyConf();
- void addPage(ConfigPage *);
- void setCurrentPage(const int index);
+ void applyConf();
+ void addPage(ConfigPage *);
+ void setCurrentPage(const int index);
private:
- void buildPagesList();
- void addPageToList(ConfigPage *);
+ void buildPagesList();
+ void addPageToList(ConfigPage *);
// attributes
private:
- QListWidget *pages_list;
- QStackedWidget *pages_widget;
- QDialogButtonBox *buttons;
+ QListWidget *pages_list;
+ QStackedWidget *pages_widget;
+ QDialogButtonBox *buttons;
diff --git a/sources/configpages.cpp b/sources/configpages.cpp
index 80626c650..b0b228965 100644
--- a/sources/configpages.cpp
+++ b/sources/configpages.cpp
@@ -33,12 +33,12 @@
#include
/**
- * @brief NewDiagramPage::NewDiagramPage
- * Default constructor
- * @param project, If project, edit the propertie of Project
- * else edit the properties by default of QElectroTech
- * @param parent, parent widget
- */
+ @brief NewDiagramPage::NewDiagramPage
+ Default constructor
+ @param project, If project, edit the propertie of Project
+ else edit the properties by default of QElectroTech
+ @param parent, parent widget
+*/
NewDiagramPage::NewDiagramPage(QETProject *project, QWidget *parent, ProjectPropertiesDialog *ppd) :
ConfigPage (parent),
ppd_ (ppd),
@@ -93,18 +93,18 @@ NewDiagramPage::NewDiagramPage(QETProject *project, QWidget *parent, ProjectProp
}
/**
- * @brief NewDiagramPage::~NewDiagramPage
- */
+ @brief NewDiagramPage::~NewDiagramPage
+*/
NewDiagramPage::~NewDiagramPage() {
disconnect(ipw,SIGNAL(openAutoNumFolioEditor(QString)),this,SLOT(changeToAutoFolioTab()));
}
/**
- * @brief NewDiagramPage::applyConf
- * Apply conf for this page.
- * If there is a project, save in the project,
- * else save to the default conf of QElectroTech
- */
+ @brief NewDiagramPage::applyConf
+ Apply conf for this page.
+ If there is a project, save in the project,
+ else save to the default conf of QElectroTech
+*/
void NewDiagramPage::applyConf() {
if (m_project) { //If project we save to the project
if (m_project -> isReadOnly()) return;
@@ -171,27 +171,27 @@ void NewDiagramPage::applyConf() {
}
/**
- * @brief NewDiagramPage::icon
- * @return icon of this page
- */
+ @brief NewDiagramPage::icon
+ @return icon of this page
+*/
QIcon NewDiagramPage::icon() const {
if (m_project) return(QET::Icons::NewDiagram);
return(QET::Icons::Projects);
}
/**
- * @brief NewDiagramPage::title
- * @return title of this page
- */
+ @brief NewDiagramPage::title
+ @return title of this page
+*/
QString NewDiagramPage::title() const {
if (m_project) return(tr("Nouveau folio", "configuration page title"));
return(tr("Nouveau projet", "configuration page title"));
}
/**
- * @brief NewDiagramPage::changeToAutoFolioTab
- * Set the current tab to Autonum
- */
+ @brief NewDiagramPage::changeToAutoFolioTab
+ Set the current tab to Autonum
+*/
void NewDiagramPage::changeToAutoFolioTab(){
if (m_project){
ppd_->setCurrentPage(ProjectPropertiesDialog::Autonum);
@@ -201,9 +201,9 @@ void NewDiagramPage::changeToAutoFolioTab(){
}
/**
- * @brief NewDiagramPage::setFolioAutonum
- * Set temporary TBP to use in auto folio num
- */
+ @brief NewDiagramPage::setFolioAutonum
+ Set temporary TBP to use in auto folio num
+*/
void NewDiagramPage::setFolioAutonum(QString autoNum){
TitleBlockProperties tbptemp = ipw->propertiesAutoNum(std::move(autoNum));
ipw->setProperties(tbptemp);
@@ -211,17 +211,17 @@ void NewDiagramPage::setFolioAutonum(QString autoNum){
}
/**
- * @brief NewDiagramPage::saveCurrentTbp
- * Save current TBP to retrieve after auto folio num
- */
+ @brief NewDiagramPage::saveCurrentTbp
+ Save current TBP to retrieve after auto folio num
+*/
void NewDiagramPage::saveCurrentTbp(){
savedTbp = ipw->properties();
}
/**
- * @brief NewDiagramPage::loadSavedTbp
- * Retrieve saved auto folio num
- */
+ @brief NewDiagramPage::loadSavedTbp
+ Retrieve saved auto folio num
+*/
void NewDiagramPage::loadSavedTbp(){
ipw->setProperties(savedTbp);
applyConf();
@@ -304,9 +304,9 @@ PrintConfigPage::~PrintConfigPage() {
}
/**
- * @brief PrintConfigPage::applyConf
- * Apply the config of this page
- */
+ @brief PrintConfigPage::applyConf
+ Apply the config of this page
+*/
void PrintConfigPage::applyConf()
{
QString prefix = "print/default";
diff --git a/sources/createdxf.cpp b/sources/createdxf.cpp
index 5e04ed579..861cf77c1 100644
--- a/sources/createdxf.cpp
+++ b/sources/createdxf.cpp
@@ -378,14 +378,14 @@ long Createdxf::RGBcodeTable[255]{
};
/**
- * @brief Createdxf::getcolorCode
- * This function returns the ACI color which is the "nearest" color to
- * the color defined by the red, green and blue (RGB) values passed
- * in argument.
- * @param red
- * @param green
- * @param blue
- */
+ @brief Createdxf::getcolorCode
+ This function returns the ACI color which is the "nearest" color to
+ the color defined by the red, green and blue (RGB) values passed
+ in argument.
+ @param red
+ @param green
+ @param blue
+*/
int Createdxf::getcolorCode (const long red, const long green, const long blue)
{
long acirgb, r,g,b;
@@ -409,12 +409,12 @@ int Createdxf::getcolorCode (const long red, const long green, const long blue)
}
/**
- * @brief Createdxf::drawLine
- * Conveniance function to draw line
- * @param filepath
- * @param line
- * @param colorcode
- */
+ @brief Createdxf::drawLine
+ Conveniance function to draw line
+ @param filepath
+ @param line
+ @param colorcode
+*/
void Createdxf::drawLine(const QString &filepath, const QLineF &line, const int &colorcode) {
drawLine(filepath, line.p1().x() * xScale,
sheetHeight - (line.p1().y() * yScale),
@@ -547,12 +547,12 @@ void Createdxf::drawArcEllipse(const QString &file_path, qreal x, qreal y, qreal
}
/**
- * @brief Createdxf::drawEllipse
- * Conveniance function for draw ellipse
- * @param filepath
- * @param rect
- * @param colorcode
- */
+ @brief Createdxf::drawEllipse
+ Conveniance function for draw ellipse
+ @param filepath
+ @param rect
+ @param colorcode
+*/
void Createdxf::drawEllipse(const QString &filepath, const QRectF &rect, const int &colorcode) {
drawArcEllipse(filepath, rect.topLeft().x() * xScale,
sheetHeight - (rect.topLeft().y() * yScale),
@@ -653,12 +653,12 @@ void Createdxf::drawRectangle (const QString &fileName, double x1, double y1, do
}
/**
- * @brief Createdxf::drawRectangle
- * Conveniance function for draw rectangle
- * @param filepath
- * @param rect
- * @param color
- */
+ @brief Createdxf::drawRectangle
+ Conveniance function for draw rectangle
+ @param filepath
+ @param rect
+ @param color
+*/
void Createdxf::drawRectangle(const QString &filepath, const QRectF &rect, const int &colorcode) {
drawRectangle(filepath, rect.bottomLeft().x() * xScale,
sheetHeight - (rect.bottomLeft().y() * yScale),
diff --git a/sources/createdxf.h b/sources/createdxf.h
index 328090035..60530e9d8 100644
--- a/sources/createdxf.h
+++ b/sources/createdxf.h
@@ -24,38 +24,93 @@
/* This class exports the project to DXF Format */
class Createdxf
-{
- public:
- Createdxf();
- ~Createdxf();
- static void dxfBegin (const QString&);
- static void dxfEnd(const QString&);
- // you can add more functions to create more drawings.
- static void drawCircle(const QString&,double,double,double,int);
- static void drawArc(const QString&,double x,double y,double rad,double startAngle,double endAngle,int color);
- static void drawDonut(QString,double,double,double,int);
+{
+ public:
+ Createdxf();
+ ~Createdxf();
+ static void dxfBegin (const QString&);
+ static void dxfEnd(const QString&);
+ // you can add more functions to create more drawings.
+ static void drawCircle(const QString&,
+ double,
+ double,
+ double,
+ int);
+ static void drawArc(const QString&,
+ double x,
+ double y,
+ double rad,
+ double startAngle,
+ double endAngle,
+ int color);
+ static void drawDonut(QString,double,double,double,int);
- static void drawArcEllipse (const QString &file_path, qreal x, qreal y, qreal w, qreal h, qreal startAngle, qreal spanAngle, qreal hotspot_x, qreal hotspot_y, qreal rotation_angle, const int &colorcode);
+ static void drawArcEllipse (const QString &file_path,
+ qreal x,
+ qreal y,
+ qreal w,
+ qreal h,
+ qreal startAngle,
+ qreal spanAngle,
+ qreal hotspot_x,
+ qreal hotspot_y,
+ qreal rotation_angle,
+ const int &colorcode);
- static void drawEllipse (const QString &filepath, const QRectF &rect, const int &colorcode);
+ static void drawEllipse (const QString &filepath,
+ const QRectF &rect,
+ const int &colorcode);
- static void drawRectangle(const QString &filepath,double,double,double,double,const int &colorcode);
- static void drawRectangle(const QString &filepath, const QRectF &rect, const int &colorcode);
+ static void drawRectangle(const QString &filepath,
+ double,
+ double,
+ double,
+ double,
+ const int &colorcode);
+ static void drawRectangle(const QString &filepath,
+ const QRectF &rect,
+ const int &colorcode);
- static void drawLine(const QString &filapath,double,double,double,double, const int &clorcode);
- static void drawLine(const QString &filepath, const QLineF &line,const int &colorcode);
+ static void drawLine(const QString &filapath,
+ double,
+ double,
+ double,
+ double,
+ const int &clorcode);
+ static void drawLine(const QString &filepath,
+ const QLineF &line,
+ const int &colorcode);
- static void drawText(const QString&,const QString&,double,double,double,double,int);
- static void drawTextAligned(const QString& fileName, const QString& text,double x, double y, double height, double rotation, double oblique,int hAlign, int vAlign, double xAlign, int colour, bool leftAlign = false, float scale = 0);
+ static void drawText(const QString&,
+ const QString&,
+ double,double,
+ double,
+ double,
+ int);
+ static void drawTextAligned(const QString& fileName,
+ const QString& text,
+ double x,
+ double y,
+ double height,
+ double rotation,
+ double oblique,
+ int hAlign,
+ int vAlign,
+ double xAlign,
+ int colour,
+ bool leftAlign = false,
+ float scale = 0);
- static int getcolorCode (const long red, const long green, const long blue);
- static long RGBcodeTable[];
+ static int getcolorCode (const long red,
+ const long green,
+ const long blue);
+ static long RGBcodeTable[];
- static const double sheetWidth;
- static const double sheetHeight;
- static double xScale;
- static double yScale;
+ static const double sheetWidth;
+ static const double sheetHeight;
+ static double xScale;
+ static double yScale;
};
#endif // CREATEDXF_H
diff --git a/sources/dataBase/projectdatabase.cpp b/sources/dataBase/projectdatabase.cpp
index 93e3cea9c..9313a6e43 100644
--- a/sources/dataBase/projectdatabase.cpp
+++ b/sources/dataBase/projectdatabase.cpp
@@ -26,11 +26,11 @@
#include
/**
- * @brief projectDataBase::projectDataBase
- * Default constructor
- * @param project : project from the database work
- * @param parent : parent QObject
- */
+ @brief projectDataBase::projectDataBase
+ Default constructor
+ @param project : project from the database work
+ @param parent : parent QObject
+*/
projectDataBase::projectDataBase(QETProject *project, QObject *parent) :
QObject(parent),
m_project(project)
@@ -46,18 +46,18 @@ projectDataBase::projectDataBase(QETProject *project, const QString &connection_
}
/**
- * @brief projectDataBase::~projectDataBase
- * Destructor
- */
+ @brief projectDataBase::~projectDataBase
+ Destructor
+*/
projectDataBase::~projectDataBase() {
m_data_base.close();
}
/**
- * @brief projectDataBase::updateDB
- * Up to date the content of the data base.
- * Emit the signal dataBaseUpdated
- */
+ @brief projectDataBase::updateDB
+ Up to date the content of the data base.
+ Emit the signal dataBaseUpdated
+*/
void projectDataBase::updateDB()
{
populateDiagramTable();
@@ -68,25 +68,25 @@ void projectDataBase::updateDB()
}
/**
- * @brief projectDataBase::project
- * @return the project of this database
- */
+ @brief projectDataBase::project
+ @return the project of this database
+*/
QETProject *projectDataBase::project() const {
return m_project;
}
/**
- * @brief projectDataBase::newQuery
- * @return a QSqlquery with @query as query and the internal database of this class as database to use.
- */
+ @brief projectDataBase::newQuery
+ @return a QSqlquery with @query as query and the internal database of this class as database to use.
+*/
QSqlQuery projectDataBase::newQuery(const QString &query) {
return QSqlQuery(query, m_data_base);
}
/**
- * @brief projectDataBase::addElement
- * @param element
- */
+ @brief projectDataBase::addElement
+ @param element
+*/
void projectDataBase::addElement(Element *element)
{
m_insert_elements_query.bindValue(":uuid", element->uuid().toString());
@@ -115,9 +115,9 @@ void projectDataBase::addElement(Element *element)
}
/**
- * @brief projectDataBase::removeElement
- * @param element
- */
+ @brief projectDataBase::removeElement
+ @param element
+*/
void projectDataBase::removeElement(Element *element)
{
m_remove_element_query.bindValue(":uuid", element->uuid().toString());
@@ -129,9 +129,9 @@ void projectDataBase::removeElement(Element *element)
}
/**
- * @brief projectDataBase::elementInfoChanged
- * @param element
- */
+ @brief projectDataBase::elementInfoChanged
+ @param element
+*/
void projectDataBase::elementInfoChanged(Element *element)
{
auto hash = elementInfoToString(element);
@@ -186,10 +186,10 @@ void projectDataBase::removeDiagram(Diagram *diagram)
}
/**
- * @brief projectDataBase::createDataBase
- * Create the data base
- * @return : true if the data base was successfully created.
- */
+ @brief projectDataBase::createDataBase
+ Create the data base
+ @return : true if the data base was successfully created.
+*/
bool projectDataBase::createDataBase(const QString &connection_name, const QString &name)
{
@@ -285,8 +285,8 @@ bool projectDataBase::createDataBase(const QString &connection_name, const QStri
}
/**
- * @brief projectDataBase::createElementNomenclatureView
- */
+ @brief projectDataBase::createElementNomenclatureView
+*/
void projectDataBase::createElementNomenclatureView()
{
QString create_view ("CREATE VIEW element_nomenclature_view AS SELECT "
@@ -322,8 +322,8 @@ void projectDataBase::createElementNomenclatureView()
}
/**
- * @brief projectDataBase::createSummaryView
- */
+ @brief projectDataBase::createSummaryView
+*/
void projectDataBase::createSummaryView()
{
QString create_view ("CREATE VIEW project_summary_view AS SELECT "
@@ -360,9 +360,9 @@ void projectDataBase::populateDiagramTable()
}
/**
- * @brief projectDataBase::populateElementTable
- * Populate the element table
- */
+ @brief projectDataBase::populateElementTable
+ Populate the element table
+*/
void projectDataBase::populateElementTable()
{
QSqlQuery query_(m_data_base);
@@ -388,9 +388,9 @@ void projectDataBase::populateElementTable()
}
/**
- * @brief projectDataBase::populateElementsTable
- * Populate the elements table
- */
+ @brief projectDataBase::populateElementsTable
+ Populate the elements table
+*/
void projectDataBase::populateElementInfoTable()
{
QSqlQuery query(m_data_base);
@@ -506,10 +506,10 @@ void projectDataBase::prepareQuery()
}
/**
- * @brief projectDataBase::elementInfoToString
- * @param elmt
- * @return the element information in hash as key for the info name and value as the information value.
- */
+ @brief projectDataBase::elementInfoToString
+ @param elmt
+ @return the element information in hash as key for the info name and value as the information value.
+*/
QHash projectDataBase::elementInfoToString(Element *elmt)
{
QHash hash; //Store the value for each columns
@@ -527,14 +527,14 @@ QHash projectDataBase::elementInfoToString(Element *elmt)
}
/**
- * @brief projectDataBase::exportDb
- * @param parent
- * @param caption
- * @param dir
- * @param filter
- * @param selectedFilter
- * @param options
- */
+ @brief projectDataBase::exportDb
+ @param parent
+ @param caption
+ @param dir
+ @param filter
+ @param selectedFilter
+ @param options
+*/
void projectDataBase::exportDb(projectDataBase *db, QWidget *parent, const QString &caption, const QString &dir)
{
auto caption_ = caption;
diff --git a/sources/dataBase/projectdatabase.h b/sources/dataBase/projectdatabase.h
index bcfca5659..d98d44eff 100644
--- a/sources/dataBase/projectdatabase.h
+++ b/sources/dataBase/projectdatabase.h
@@ -29,12 +29,12 @@ class QETProject;
class Diagram;
/**
- * @brief The projectDataBase class
- * This class wrap a sqlite data base where you can find several thing about
- * the content of a project.
+ @brief The projectDataBase class
+ This class wrap a sqlite data base where you can find several thing about
+ the content of a project.
*
- * NOTE this class is still in developement.
- */
+ @note this class is still in developement.
+*/
class projectDataBase : public QObject
{
Q_OBJECT
diff --git a/sources/dataBase/ui/elementquerywidget.cpp b/sources/dataBase/ui/elementquerywidget.cpp
index c45efa1a2..d766d9172 100644
--- a/sources/dataBase/ui/elementquerywidget.cpp
+++ b/sources/dataBase/ui/elementquerywidget.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "elementquerywidget.h"
#include "ui_elementquerywidget.h"
@@ -22,14 +22,14 @@
#include
/**
- * @brief ElementQueryWidget::ElementQueryWidget
- * @param parent
- */
+ @brief ElementQueryWidget::ElementQueryWidget
+ @param parent
+*/
ElementQueryWidget::ElementQueryWidget(QWidget *parent) :
- QWidget(parent),
- ui(new Ui::ElementQueryWidget)
+ QWidget(parent),
+ ui(new Ui::ElementQueryWidget)
{
- ui->setupUi(this);
+ ui->setupUi(this);
m_export_info.insert("position", tr("Position"));
m_export_info.insert("title", tr("Titre du folio"));
@@ -96,18 +96,18 @@ ElementQueryWidget::ElementQueryWidget(QWidget *parent) :
}
/**
- * @brief ElementQueryWidget::~ElementQueryWidget
- */
+ @brief ElementQueryWidget::~ElementQueryWidget
+*/
ElementQueryWidget::~ElementQueryWidget() {
delete ui;
}
/**
- * @brief ElementQueryWidget::setQuery
- * @param query
- * Set the current query to @query.
- * If it's possible, rebuild the state of the widget from the query
- */
+ @brief ElementQueryWidget::setQuery
+ @param query
+ Set the current query to @query.
+ If it's possible, rebuild the state of the widget from the query
+*/
void ElementQueryWidget::setQuery(const QString &query)
{
if (query.startsWith("SELECT"))
@@ -271,9 +271,9 @@ void ElementQueryWidget::setQuery(const QString &query)
}
/**
- * @brief ElementQueryWidget::queryStr
- * @return The current query
- */
+ @brief ElementQueryWidget::queryStr
+ @return The current query
+*/
QString ElementQueryWidget::queryStr() const
{
//User define is own query
@@ -370,16 +370,16 @@ QString ElementQueryWidget::queryStr() const
}
/**
- * @brief ElementQueryWidget::updateQueryLine
- */
+ @brief ElementQueryWidget::updateQueryLine
+*/
void ElementQueryWidget::updateQueryLine() {
ui->m_sql_query->setText(queryStr());
}
/**
- * @brief ElementQueryWidget::selectedKeys
- * @return the current keys of selected infos to be exported
- */
+ @brief ElementQueryWidget::selectedKeys
+ @return the current keys of selected infos to be exported
+*/
QStringList ElementQueryWidget::selectedKeys() const
{
//Made a string list with the colomns (keys) choosen by the user
@@ -395,8 +395,8 @@ QStringList ElementQueryWidget::selectedKeys() const
}
/**
- * @brief ElementQueryWidget::setUpItems
- */
+ @brief ElementQueryWidget::setUpItems
+*/
void ElementQueryWidget::setUpItems()
{
for(QString key : QETApp::elementInfoKeys())
@@ -419,18 +419,18 @@ void ElementQueryWidget::setUpItems()
}
/**
- * @brief ElementQueryWidget::FilterFor
- * @param key
- * @return the filter associated to key
- */
+ @brief ElementQueryWidget::FilterFor
+ @param key
+ @return the filter associated to key
+*/
QPair ElementQueryWidget::FilterFor(const QString &key) const {
return m_filter.value(key, qMakePair(0, QString()));
}
/**
- * @brief ElementQueryWidget::fillSavedQuery
- * Fill the combobox of saved queries
- */
+ @brief ElementQueryWidget::fillSavedQuery
+ Fill the combobox of saved queries
+*/
void ElementQueryWidget::fillSavedQuery()
{
QFile file(QETApp::configDir() + "/nomenclature.json");
@@ -446,8 +446,8 @@ void ElementQueryWidget::fillSavedQuery()
}
/**
- * @brief ElementQueryWidget::on_m_up_pb_clicked
- */
+ @brief ElementQueryWidget::on_m_up_pb_clicked
+*/
void ElementQueryWidget::on_m_up_pb_clicked()
{
auto row = ui->m_choosen_list->currentRow();
@@ -463,8 +463,8 @@ void ElementQueryWidget::on_m_up_pb_clicked()
}
/**
- * @brief ElementQueryWidget::on_m_add_pb_clicked
- */
+ @brief ElementQueryWidget::on_m_add_pb_clicked
+*/
void ElementQueryWidget::on_m_add_pb_clicked()
{
if (auto *item = ui->m_var_list->takeItem(ui->m_var_list->currentRow())) {
@@ -475,8 +475,8 @@ void ElementQueryWidget::on_m_add_pb_clicked()
}
/**
- * @brief ElementQueryWidget::on_m_remove_pb_clicked
- */
+ @brief ElementQueryWidget::on_m_remove_pb_clicked
+*/
void ElementQueryWidget::on_m_remove_pb_clicked()
{
if (auto *item = ui->m_choosen_list->takeItem(ui->m_choosen_list->currentRow())) {
@@ -487,8 +487,8 @@ void ElementQueryWidget::on_m_remove_pb_clicked()
}
/**
- * @brief ElementQueryWidget::on_m_down_pb_clicked
- */
+ @brief ElementQueryWidget::on_m_down_pb_clicked
+*/
void ElementQueryWidget::on_m_down_pb_clicked()
{
auto row = ui->m_choosen_list->currentRow();
@@ -504,8 +504,8 @@ void ElementQueryWidget::on_m_down_pb_clicked()
}
/**
- * @brief ElementQueryWidget::on_m_edit_sql_query_cb_clicked
- */
+ @brief ElementQueryWidget::on_m_edit_sql_query_cb_clicked
+*/
void ElementQueryWidget::on_m_edit_sql_query_cb_clicked()
{
ui->m_sql_query->setEnabled(ui->m_edit_sql_query_cb->isChecked());
@@ -524,9 +524,9 @@ void ElementQueryWidget::on_m_edit_sql_query_cb_clicked()
}
/**
- * @brief ElementQueryWidget::on_m_filter_le_textEdited
- * @param arg1
- */
+ @brief ElementQueryWidget::on_m_filter_le_textEdited
+ @param arg1
+*/
void ElementQueryWidget::on_m_filter_le_textEdited(const QString &arg1)
{
if (auto item = ui->m_choosen_list->currentItem())
@@ -541,9 +541,9 @@ void ElementQueryWidget::on_m_filter_le_textEdited(const QString &arg1)
}
/**
- * @brief ElementQueryWidget::on_m_filter_type_cb_activated
- * @param index
- */
+ @brief ElementQueryWidget::on_m_filter_type_cb_activated
+ @param index
+*/
void ElementQueryWidget::on_m_filter_type_cb_activated(int index)
{
if (auto item = ui->m_choosen_list->currentItem())
@@ -559,9 +559,9 @@ void ElementQueryWidget::on_m_filter_type_cb_activated(int index)
}
/**
- * @brief ElementQueryWidget::on_m_load_pb_clicked
- * Load a query from nomenclature.json file
- */
+ @brief ElementQueryWidget::on_m_load_pb_clicked
+ Load a query from nomenclature.json file
+*/
void ElementQueryWidget::on_m_load_pb_clicked()
{
auto name = ui->m_conf_cb->currentText();
@@ -589,9 +589,9 @@ void ElementQueryWidget::on_m_load_pb_clicked()
}
/**
- * @brief ElementQueryWidget::on_m_save_current_conf_pb_clicked
- * Save the actual query to nomenclature.json file
- */
+ @brief ElementQueryWidget::on_m_save_current_conf_pb_clicked
+ Save the actual query to nomenclature.json file
+*/
void ElementQueryWidget::on_m_save_current_conf_pb_clicked()
{
QFile file_(QETApp::configDir() + "/nomenclature.json");
@@ -648,9 +648,9 @@ void ElementQueryWidget::on_m_choosen_list_itemDoubleClicked(QListWidgetItem *it
}
/**
- * @brief ElementQueryWidget::reset
- * Clear this widget aka set to initial state
- */
+ @brief ElementQueryWidget::reset
+ Clear this widget aka set to initial state
+*/
void ElementQueryWidget::reset()
{
//Ugly hack to force to remove all selected infos
diff --git a/sources/dataBase/ui/elementquerywidget.h b/sources/dataBase/ui/elementquerywidget.h
index be9be047f..e39c2f8ae 100644
--- a/sources/dataBase/ui/elementquerywidget.h
+++ b/sources/dataBase/ui/elementquerywidget.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef ELEMENTQUERYWIDGET_H
#define ELEMENTQUERYWIDGET_H
@@ -28,13 +28,13 @@ class ElementQueryWidget;
}
/**
- * @brief The ElementQueryWidget class
- * A widget use to edit a sql query for get element information
- * This widget only work to get information from ProjectDataBase
- */
+ @brief The ElementQueryWidget class
+ A widget use to edit a sql query for get element information
+ This widget only work to get information from ProjectDataBase
+*/
class ElementQueryWidget : public QWidget
{
- Q_OBJECT
+ Q_OBJECT
public:
explicit ElementQueryWidget(QWidget *parent = nullptr);
diff --git a/sources/dataBase/ui/summaryquerywidget.cpp b/sources/dataBase/ui/summaryquerywidget.cpp
index 7f84fa804..219743318 100644
--- a/sources/dataBase/ui/summaryquerywidget.cpp
+++ b/sources/dataBase/ui/summaryquerywidget.cpp
@@ -22,14 +22,14 @@
#include
/**
- * @brief SummaryQueryWidget::SummaryQueryWidget
- * @param parent
- */
+ @brief SummaryQueryWidget::SummaryQueryWidget
+ @param parent
+*/
SummaryQueryWidget::SummaryQueryWidget(QWidget *parent) :
- QWidget(parent),
+ QWidget(parent),
ui(new Ui::SummaryQueryWidget)
{
- ui->setupUi(this);
+ ui->setupUi(this);
setUpItems();
fillSavedQuery();
@@ -39,17 +39,17 @@ SummaryQueryWidget::SummaryQueryWidget(QWidget *parent) :
}
/**
- * @brief SummaryQueryWidget::~SummaryQueryWidget
- */
+ @brief SummaryQueryWidget::~SummaryQueryWidget
+*/
SummaryQueryWidget::~SummaryQueryWidget()
{
delete ui;
}
/**
- * @brief SummaryQueryWidget::queryStr
- * @return The current query string
- */
+ @brief SummaryQueryWidget::queryStr
+ @return The current query string
+*/
QString SummaryQueryWidget::queryStr() const
{
//User define is own query
@@ -80,11 +80,11 @@ QString SummaryQueryWidget::queryStr() const
}
/**
- * @brief SummaryQueryWidget::setQuery
- * @param query
- * set the current query to @query.
- * If it's possible, rebuild the state of the widget from the query
- */
+ @brief SummaryQueryWidget::setQuery
+ @param query
+ set the current query to @query.
+ If it's possible, rebuild the state of the widget from the query
+*/
void SummaryQueryWidget::setQuery(const QString &query)
{
if (query.startsWith("SELECT"))
@@ -114,8 +114,8 @@ void SummaryQueryWidget::setQuery(const QString &query)
}
/**
- * @brief SummaryQueryWidget::setUpItems
- */
+ @brief SummaryQueryWidget::setUpItems
+*/
void SummaryQueryWidget::setUpItems()
{
for (auto key : QETApp::diagramInfoKeys())
@@ -133,9 +133,9 @@ void SummaryQueryWidget::setUpItems()
}
/**
- * @brief SummaryQueryWidget::fillSavedQuery
- * Fill the combo box of the saved query
- */
+ @brief SummaryQueryWidget::fillSavedQuery
+ Fill the combo box of the saved query
+*/
void SummaryQueryWidget::fillSavedQuery()
{
QFile file(QETApp::configDir() + "/summary.json");
@@ -151,16 +151,16 @@ void SummaryQueryWidget::fillSavedQuery()
}
/**
- * @brief SummaryQueryWidget::updateQueryLine
- */
+ @brief SummaryQueryWidget::updateQueryLine
+*/
void SummaryQueryWidget::updateQueryLine() {
ui->m_user_query_le->setText(queryStr());
}
/**
- * @brief SummaryQueryWidget::selectedKeys
- * @return
- */
+ @brief SummaryQueryWidget::selectedKeys
+ @return
+*/
QStringList SummaryQueryWidget::selectedKeys() const
{
//Made a string list with the colomns (keys) choosen by the user
@@ -176,9 +176,9 @@ QStringList SummaryQueryWidget::selectedKeys() const
}
/**
- * @brief SummaryQueryWidget::on_m_available_list_itemDoubleClicked
- * @param item
- */
+ @brief SummaryQueryWidget::on_m_available_list_itemDoubleClicked
+ @param item
+*/
void SummaryQueryWidget::on_m_available_list_itemDoubleClicked(QListWidgetItem *item)
{
Q_UNUSED(item)
@@ -186,9 +186,9 @@ void SummaryQueryWidget::on_m_available_list_itemDoubleClicked(QListWidgetItem *
}
/**
- * @brief SummaryQueryWidget::on_m_choosen_list_itemDoubleClicked
- * @param item
- */
+ @brief SummaryQueryWidget::on_m_choosen_list_itemDoubleClicked
+ @param item
+*/
void SummaryQueryWidget::on_m_choosen_list_itemDoubleClicked(QListWidgetItem *item)
{
Q_UNUSED(item)
@@ -196,8 +196,8 @@ void SummaryQueryWidget::on_m_choosen_list_itemDoubleClicked(QListWidgetItem *it
}
/**
- * @brief SummaryQueryWidget::on_m_up_pb_clicked
- */
+ @brief SummaryQueryWidget::on_m_up_pb_clicked
+*/
void SummaryQueryWidget::on_m_up_pb_clicked()
{
auto row = ui->m_choosen_list->currentRow();
@@ -213,8 +213,8 @@ void SummaryQueryWidget::on_m_up_pb_clicked()
}
/**
- * @brief SummaryQueryWidget::on_m_add_pb_clicked
- */
+ @brief SummaryQueryWidget::on_m_add_pb_clicked
+*/
void SummaryQueryWidget::on_m_add_pb_clicked()
{
if (auto *item = ui->m_available_list->takeItem(ui->m_available_list->currentRow())) {
@@ -225,8 +225,8 @@ void SummaryQueryWidget::on_m_add_pb_clicked()
}
/**
- * @brief SummaryQueryWidget::on_m_remove_pb_clicked
- */
+ @brief SummaryQueryWidget::on_m_remove_pb_clicked
+*/
void SummaryQueryWidget::on_m_remove_pb_clicked()
{
if (auto *item = ui->m_choosen_list->takeItem(ui->m_choosen_list->currentRow())) {
@@ -237,8 +237,8 @@ void SummaryQueryWidget::on_m_remove_pb_clicked()
}
/**
- * @brief SummaryQueryWidget::on_m_down_pb_clicked
- */
+ @brief SummaryQueryWidget::on_m_down_pb_clicked
+*/
void SummaryQueryWidget::on_m_down_pb_clicked()
{
auto row = ui->m_choosen_list->currentRow();
@@ -254,8 +254,8 @@ void SummaryQueryWidget::on_m_down_pb_clicked()
}
/**
- * @brief SummaryQueryWidget::on_m_edit_sql_query_cb_clicked
- */
+ @brief SummaryQueryWidget::on_m_edit_sql_query_cb_clicked
+*/
void SummaryQueryWidget::on_m_edit_sql_query_cb_clicked()
{
ui->m_user_query_le->setEnabled(ui->m_edit_sql_query_cb->isChecked());
@@ -273,9 +273,9 @@ void SummaryQueryWidget::on_m_edit_sql_query_cb_clicked()
}
/**
- * @brief SummaryQueryWidget::reset
- * Clear this widget aka set to initial state
- */
+ @brief SummaryQueryWidget::reset
+ Clear this widget aka set to initial state
+*/
void SummaryQueryWidget::reset()
{
//Ugly hack to force to remove all selected infos
@@ -286,8 +286,8 @@ void SummaryQueryWidget::reset()
}
/**
- * @brief SummaryQueryWidget::saveConfig
- */
+ @brief SummaryQueryWidget::saveConfig
+*/
void SummaryQueryWidget::saveConfig()
{
QFile file_(QETApp::configDir() + "/summary.json");
@@ -316,8 +316,8 @@ void SummaryQueryWidget::saveConfig()
}
/**
- * @brief SummaryQueryWidget::loadConfig
- */
+ @brief SummaryQueryWidget::loadConfig
+*/
void SummaryQueryWidget::loadConfig()
{
auto name = ui->m_config_gb->selectedText();
diff --git a/sources/dataBase/ui/summaryquerywidget.h b/sources/dataBase/ui/summaryquerywidget.h
index 96430b9b9..2f7614202 100644
--- a/sources/dataBase/ui/summaryquerywidget.h
+++ b/sources/dataBase/ui/summaryquerywidget.h
@@ -28,7 +28,7 @@ class SummaryQueryWidget;
class SummaryQueryWidget : public QWidget
{
- Q_OBJECT
+ Q_OBJECT
public:
explicit SummaryQueryWidget(QWidget *parent = nullptr);
diff --git a/sources/diagram.cpp b/sources/diagram.cpp
index 86e030cd1..e32f2335e 100644
--- a/sources/diagram.cpp
+++ b/sources/diagram.cpp
@@ -1484,7 +1484,7 @@ bool Diagram::fromXml(QDomElement &document,
* @param folioSeq type
* @param seq type
* @param type of sequential
- */
+*/
void Diagram::folioSequentialsFromXml(const QDomElement &root,
QHash* hash,
@@ -1727,7 +1727,7 @@ void Diagram::updateLabels()
* @param sequential to be treated
* @param type to be treated
* @param Numerotation Context to be manipulated
- */
+*/
void Diagram::insertFolioSeqHash(QHash *hash,
const QString& title,
diff --git a/sources/diagramcontent.cpp b/sources/diagramcontent.cpp
index 002f2c6cd..eb9f1a0c8 100644
--- a/sources/diagramcontent.cpp
+++ b/sources/diagramcontent.cpp
@@ -30,16 +30,16 @@
#include "qetgraphicstableitem.h"
/**
- * @brief DiagramContent::DiagramContent
- */
+ @brief DiagramContent::DiagramContent
+*/
DiagramContent::DiagramContent() {}
/**
- * @brief DiagramContent::DiagramContent
- * Constructor
- * @param diagram : Construct a diagramContent and fill it with the selected item of @diagram
- * @param selected : this diagramcontent get only selected items if true.
- */
+ @brief DiagramContent::DiagramContent
+ Constructor
+ @param diagram : Construct a diagramContent and fill it with the selected item of @diagram
+ @param selected : this diagramcontent get only selected items if true.
+*/
DiagramContent::DiagramContent(Diagram *diagram, bool selected) :
m_selected_items(diagram->selectedItems())
{
@@ -120,12 +120,12 @@ DiagramContent::~DiagramContent()
{}
/**
- * @brief DiagramContent::selectedTexts
- * @return a list of every selected texts (every kind of texts)
- * Note that the returned list of texts, correspond to the selected texts
- * at the moment of the creation of this DiagramContent,
- * with the constructor : DiagramContent::DiagramContent(Diagram *diagram)
- */
+ @brief DiagramContent::selectedTexts
+ @return a list of every selected texts (every kind of texts)
+ Note that the returned list of texts, correspond to the selected texts
+ at the moment of the creation of this DiagramContent,
+ with the constructor : DiagramContent::DiagramContent(Diagram *diagram)
+*/
QList DiagramContent::selectedTexts() const
{
QList selected_texts;
@@ -140,12 +140,12 @@ QList DiagramContent::selectedTexts() const
}
/**
- * @brief DiagramContent::selectedTextsGroup
- * @return a list of selected texts group
- * Note that the returned list of texts group, correspond to the selected texts group
- * at the moment of the creation of this DiagramContent,
- * with the constructor : DiagramContent::DiagramContent(Diagram *diagram)
- */
+ @brief DiagramContent::selectedTextsGroup
+ @return a list of selected texts group
+ Note that the returned list of texts group, correspond to the selected texts group
+ at the moment of the creation of this DiagramContent,
+ with the constructor : DiagramContent::DiagramContent(Diagram *diagram)
+*/
QList DiagramContent::selectedTextsGroup() const
{
QList groups;
@@ -159,10 +159,10 @@ QList DiagramContent::selectedTextsGroup() const
}
/**
- * @brief DiagramContent::conductors
- * @param filter
- * @return Every conductors according to the filter
- */
+ @brief DiagramContent::conductors
+ @param filter
+ @return Every conductors according to the filter
+*/
QList DiagramContent::conductors(int filter) const
{
QList result;
@@ -180,12 +180,12 @@ QList DiagramContent::conductors(int filter) const
}
/**
- * @brief DiagramContent::hasDeletableItems
- * @return true if this diagram content have deletable item
- * The deletable items correspond to the selected items of diagram
- * at the moment of the creation of this DiagramContent,
- * with the constructor : DiagramContent::DiagramContent(Diagram *diagram)
- */
+ @brief DiagramContent::hasDeletableItems
+ @return true if this diagram content have deletable item
+ The deletable items correspond to the selected items of diagram
+ at the moment of the creation of this DiagramContent,
+ with the constructor : DiagramContent::DiagramContent(Diagram *diagram)
+*/
bool DiagramContent::hasDeletableItems() const
{
for(QGraphicsItem *qgi : m_selected_items)
@@ -206,9 +206,9 @@ bool DiagramContent::hasDeletableItems() const
}
/**
- * @brief DiagramContent::hasCopiableItems
- * @return true if this diagram content have copiable items.
- */
+ @brief DiagramContent::hasCopiableItems
+ @return true if this diagram content have copiable items.
+*/
bool DiagramContent::hasCopiableItems() const
{
if(!m_images.isEmpty()) return true;
@@ -220,9 +220,9 @@ bool DiagramContent::hasCopiableItems() const
}
/**
- * @brief DiagramContent::clear
- * Remove all items from the diagram content
- */
+ @brief DiagramContent::clear
+ Remove all items from the diagram content
+*/
void DiagramContent::clear()
{
m_elements.clear();
@@ -239,10 +239,10 @@ void DiagramContent::clear()
}
/**
- * @brief DiagramContent::removeNonMovableItems
- * Remove all non movable item.
- * @return : return the numbers of removed item
- */
+ @brief DiagramContent::removeNonMovableItems
+ Remove all non movable item.
+ @return : return the numbers of removed item
+*/
int DiagramContent::removeNonMovableItems()
{
int count_ = 0;
@@ -333,10 +333,10 @@ DiagramContent &DiagramContent::operator+=(const DiagramContent &other)
}
/**
- * @brief DiagramContent::potentialIsManaged
- * @param conductors a list of conductors at the same potential.
- * @return true, if m_potential_conductors already have a conductor of this potential.
- */
+ @brief DiagramContent::potentialIsManaged
+ @param conductors a list of conductors at the same potential.
+ @return true, if m_potential_conductors already have a conductor of this potential.
+*/
bool DiagramContent::potentialIsManaged(QList conductors)
{
bool b = false;
@@ -351,9 +351,9 @@ bool DiagramContent::potentialIsManaged(QList conductors)
}
/**
- * @brief DiagramContent::hasTextEditing
- * @return true if handle a text currently in editing intercation
- */
+ @brief DiagramContent::hasTextEditing
+ @return true if handle a text currently in editing intercation
+*/
bool DiagramContent::hasTextEditing()
{
for (DiagramTextItem *dti : selectedTexts()) {
@@ -366,10 +366,10 @@ bool DiagramContent::hasTextEditing()
}
/**
- * @brief DiagramContent::items
- * @param filter
- * @return The items of this diagram content according to @filter
- */
+ @brief DiagramContent::items
+ @param filter
+ @return The items of this diagram content according to @filter
+*/
QList DiagramContent::items(int filter) const
{
QList items_list;
@@ -393,10 +393,10 @@ QList DiagramContent::items(int filter) const
}
/**
- * @brief DiagramContent::count
- * @param filter
- * @return The number of items, according to @filter
- */
+ @brief DiagramContent::count
+ @param filter
+ @return The number of items, according to @filter
+*/
int DiagramContent::count(int filter) const
{
int count = 0;
@@ -428,11 +428,11 @@ int DiagramContent::count(int filter) const
}
/**
- * @brief DiagramContent::sentence
- * @param filter
- * @return A string that describe the items of the diagram content according to @filter.
- * Exemple : X elements, Y conductors etc....
- */
+ @brief DiagramContent::sentence
+ @param filter
+ @return A string that describe the items of the diagram content according to @filter.
+ Exemple : X elements, Y conductors etc....
+*/
QString DiagramContent::sentence(int filter) const
{
int elements_count = (filter & Elements) ? m_elements.count() : 0;
@@ -457,11 +457,11 @@ QString DiagramContent::sentence(int filter) const
}
/**
- * @brief operator << Use to debug a diagram content
- * @param d : QDebug to use for display the debug info
- * @param content : content to debug
- * @return
- */
+ @brief operator << Use to debug a diagram content
+ @param d : QDebug to use for display the debug info
+ @param content : content to debug
+ @return
+*/
QDebug &operator<<(QDebug d, DiagramContent &content) {
Q_UNUSED(content)
d << "DiagramContent {" << "\n";
diff --git a/sources/diagramcontext.cpp b/sources/diagramcontext.cpp
index 0afc4e14c..21d2a7fe8 100644
--- a/sources/diagramcontext.cpp
+++ b/sources/diagramcontext.cpp
@@ -21,13 +21,13 @@
#include
/**
- * @brief DiagramContext::add
- * Add all value of @other to this.
- * If a key already exist, the value is replaced.
- * If a key doesn't exist, she will be added.
- * All other keys of this context, which are not present in @other, stay unchanged.
- * @param other
- */
+ @brief DiagramContext::add
+ Add all value of @other to this.
+ If a key already exist, the value is replaced.
+ If a key doesn't exist, she will be added.
+ All other keys of this context, which are not present in @other, stay unchanged.
+ @param other
+*/
void DiagramContext::add(DiagramContext other)
{
for (QString key : other.keys()) {
@@ -36,9 +36,9 @@ void DiagramContext::add(DiagramContext other)
}
/**
- * @brief DiagramContext::remove
- * @param key
- */
+ @brief DiagramContext::remove
+ @param key
+*/
void DiagramContext::remove(const QString &key) {
m_content.remove(key);
}
@@ -117,9 +117,9 @@ int DiagramContext::count() {
}
/**
- * @brief DiagramContext::keyMustShow
- * @return the value pairs with key, if key no found, return false
- */
+ @brief DiagramContext::keyMustShow
+ @return the value pairs with key, if key no found, return false
+*/
bool DiagramContext::keyMustShow(const QString &key) const {
if (m_content_show.contains(key))
return m_content_show[key];
@@ -163,11 +163,11 @@ void DiagramContext::fromXml(const QDomElement &e, const QString &tag_name) {
}
/**
- * @brief DiagramContext::fromXml
- * Read this context properties from the @dom_element, looking for tags named @tag_name
- * @param dom_element : dom element to parse
- * @param tag_name : tag name to find, by default "property"
- */
+ @brief DiagramContext::fromXml
+ Read this context properties from the @dom_element, looking for tags named @tag_name
+ @param dom_element : dom element to parse
+ @param tag_name : tag name to find, by default "property"
+*/
void DiagramContext::fromXml(const pugi::xml_node &dom_element, const QString &tag_name)
{
for(auto node = dom_element.child(tag_name.toStdString().c_str()) ; node ; node = node.next_sibling(tag_name.toStdString().c_str()))
diff --git a/sources/diagramcontext.h b/sources/diagramcontext.h
index 6eeaa1508..f887b0ff6 100644
--- a/sources/diagramcontext.h
+++ b/sources/diagramcontext.h
@@ -51,7 +51,7 @@
* location -> the location assigned to the element
* frozenLabel -> label locked at a given time
*
- */
+*/
class DiagramContext
{
public:
diff --git a/sources/diagramevent/diagrameventaddelement.cpp b/sources/diagramevent/diagrameventaddelement.cpp
index f7417429f..a780ec70e 100644
--- a/sources/diagramevent/diagrameventaddelement.cpp
+++ b/sources/diagramevent/diagrameventaddelement.cpp
@@ -24,12 +24,12 @@
/**
- * @brief DiagramEventAddElement::DiagramEventAddElement
- * Defaut constructor
- * @param location :location of diagram
- * @param diagram : diagram owner of this event
- * @param pos : first pos of item ( optional, by defaut QPointF(0,0) )
- */
+ @brief DiagramEventAddElement::DiagramEventAddElement
+ Defaut constructor
+ @param location :location of diagram
+ @param diagram : diagram owner of this event
+ @param pos : first pos of item ( optional, by defaut QPointF(0,0) )
+*/
DiagramEventAddElement::DiagramEventAddElement(ElementsLocation &location, Diagram *diagram, QPointF pos) :
DiagramEventInterface(diagram),
m_location(location),
@@ -53,10 +53,10 @@ DiagramEventAddElement::DiagramEventAddElement(ElementsLocation &location, Diagr
}
/**
- * @brief DiagramEventAddElement::~DiagramEventAddElement
- * Destructor
- * Enable context menu for each view of diagram
- */
+ @brief DiagramEventAddElement::~DiagramEventAddElement
+ Destructor
+ Enable context menu for each view of diagram
+*/
DiagramEventAddElement::~DiagramEventAddElement()
{
if (m_element)
@@ -69,11 +69,11 @@ DiagramEventAddElement::~DiagramEventAddElement()
}
/**
- * @brief DiagramEventAddElement::mouseMoveEvent
- * Move the element to new pos of mouse
- * the event is always accepted
- * @param event
- */
+ @brief DiagramEventAddElement::mouseMoveEvent
+ Move the element to new pos of mouse
+ the event is always accepted
+ @param event
+*/
void DiagramEventAddElement::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
if (m_element) {
@@ -83,22 +83,22 @@ void DiagramEventAddElement::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief DiagramEventAddElement::mousePressEvent
- * Do nothing, but return true for not transit the event to other thing in diagram.
- * the event is always accepted
- * @param event
- */
+ @brief DiagramEventAddElement::mousePressEvent
+ Do nothing, but return true for not transit the event to other thing in diagram.
+ the event is always accepted
+ @param event
+*/
void DiagramEventAddElement::mousePressEvent(QGraphicsSceneMouseEvent *event) {
event->setAccepted(true);
}
/**
- * @brief DiagramEventAddElement::mouseReleaseEvent
- * Right button finish this event (isRunning = false) and emit finish.
- * Left button add an element to diagram
- * the event is always accepted
- * @param event
- */
+ @brief DiagramEventAddElement::mouseReleaseEvent
+ Right button finish this event (isRunning = false) and emit finish.
+ Left button add an element to diagram
+ the event is always accepted
+ @param event
+*/
void DiagramEventAddElement::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (m_element)
@@ -121,11 +121,11 @@ void DiagramEventAddElement::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief DiagramEventAddElement::mouseDoubleClickEvent
- * If mouse left double clic, finish this event (isRunning = false) and emit finish
- * the event is always accepted
- * @param event
- */
+ @brief DiagramEventAddElement::mouseDoubleClickEvent
+ If mouse left double clic, finish this event (isRunning = false) and emit finish
+ the event is always accepted
+ @param event
+*/
void DiagramEventAddElement::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
{
if (m_element && (event -> button() == Qt::LeftButton))
@@ -141,11 +141,11 @@ void DiagramEventAddElement::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *eve
}
/**
- * @brief DiagramEventAddElement::keyPressEvent
- * Press space key rotate the element to 90° (return true)
- * else call DiagramEventInterface::keyPressEvent(event), and return the value.
- * @param event
- */
+ @brief DiagramEventAddElement::keyPressEvent
+ Press space key rotate the element to 90° (return true)
+ else call DiagramEventInterface::keyPressEvent(event), and return the value.
+ @param event
+*/
void DiagramEventAddElement::keyPressEvent(QKeyEvent *event)
{
if (m_element && event->key() == Qt::Key_Space)
@@ -159,9 +159,9 @@ void DiagramEventAddElement::keyPressEvent(QKeyEvent *event)
}
/**
- * @brief DiagramEventAddElement::init
- * Init this event.
- */
+ @brief DiagramEventAddElement::init
+ Init this event.
+*/
void DiagramEventAddElement::init()
{
foreach(QGraphicsView *view, m_diagram->views())
@@ -169,9 +169,9 @@ void DiagramEventAddElement::init()
}
/**
- * @brief DiagramEventAddElement::buildElement
- * Build the element, if the element is build successfully, we return true, otherwise false
- */
+ @brief DiagramEventAddElement::buildElement
+ Build the element, if the element is build successfully, we return true, otherwise false
+*/
bool DiagramEventAddElement::buildElement()
{
ElementsLocation import_loc = m_diagram->project()->importElement(m_location);
@@ -196,10 +196,10 @@ bool DiagramEventAddElement::buildElement()
}
/**
- * @brief DiagramEventAddElement::addElement
- * Add an element at the current pos en current rotation,
- * if project autoconductor option is enable, and the element can be wired, we do it.
- */
+ @brief DiagramEventAddElement::addElement
+ Add an element at the current pos en current rotation,
+ if project autoconductor option is enable, and the element can be wired, we do it.
+*/
void DiagramEventAddElement::addElement()
{
int state;
@@ -243,7 +243,7 @@ void DiagramEventAddElement::addElement()
if (m_diagram->freezeNewConductors() || m_diagram->project()->isFreezeNewConductors()) {
conductor->setFreezeLabel(true);
}
- }
+ }
m_diagram -> undoStack().push(undo_object);
element->setUpFormula();
diff --git a/sources/diagramevent/diagrameventaddelement.h b/sources/diagramevent/diagrameventaddelement.h
index a23cbf33a..f06387792 100644
--- a/sources/diagramevent/diagrameventaddelement.h
+++ b/sources/diagramevent/diagrameventaddelement.h
@@ -24,10 +24,10 @@
class Element;
/**
- * @brief The DiagramEventAddElement class
- * This diagram event add a new element, for each left click button at the position of click.
- * Space key rotate current element by 90°, right click button finish this event.
- */
+ @brief The DiagramEventAddElement class
+ This diagram event add a new element, for each left click button at the position of click.
+ Space key rotate current element by 90°, right click button finish this event.
+*/
class DiagramEventAddElement : public DiagramEventInterface
{
Q_OBJECT
diff --git a/sources/diagramevent/diagrameventaddimage.cpp b/sources/diagramevent/diagrameventaddimage.cpp
index 47cb67cfe..b17e74628 100644
--- a/sources/diagramevent/diagrameventaddimage.cpp
+++ b/sources/diagramevent/diagrameventaddimage.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "diagrameventaddimage.h"
@@ -22,38 +22,38 @@
#include "diagramcommands.h"
/**
- * @brief DiagramEventAddImage::DiagramEventAddImage
- * Default constructor
- * @param diagram : diagram where operate this event
- */
+ @brief DiagramEventAddImage::DiagramEventAddImage
+ Default constructor
+ @param diagram : diagram where operate this event
+*/
DiagramEventAddImage::DiagramEventAddImage(Diagram *diagram) :
- DiagramEventInterface(diagram),
- m_image (nullptr),
- m_is_added (false)
+ DiagramEventInterface(diagram),
+ m_image (nullptr),
+ m_is_added (false)
{
- openDialog();
+ openDialog();
}
/**
- * @brief DiagramEventAddImage::~DiagramEventAddImage
- */
+ @brief DiagramEventAddImage::~DiagramEventAddImage
+*/
DiagramEventAddImage::~DiagramEventAddImage()
{
- if (m_running || m_abort)
- {
- if (m_is_added) m_diagram->removeItem(m_image);
- delete m_image;
- }
+ if (m_running || m_abort)
+ {
+ if (m_is_added) m_diagram->removeItem(m_image);
+ delete m_image;
+ }
- foreach (QGraphicsView *view, m_diagram->views())
- view->setContextMenuPolicy((Qt::DefaultContextMenu));
+ foreach (QGraphicsView *view, m_diagram->views())
+ view->setContextMenuPolicy((Qt::DefaultContextMenu));
}
/**
- * @brief DiagramEventAddImage::mousePressEvent
- * Action when mouse is pressed
- * @param event : event of mouse pressed
- */
+ @brief DiagramEventAddImage::mousePressEvent
+ Action when mouse is pressed
+ @param event : event of mouse pressed
+*/
void DiagramEventAddImage::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
if (m_image && event -> button() == Qt::LeftButton)
@@ -79,10 +79,10 @@ void DiagramEventAddImage::mousePressEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief DiagramEventAddImage::mouseMoveEvent
- * Action when mouse move
- * @param event : event of mouse move
- */
+ @brief DiagramEventAddImage::mouseMoveEvent
+ Action when mouse move
+ @param event : event of mouse move
+*/
void DiagramEventAddImage::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
if (!m_image || event->buttons() != Qt::NoButton) {
@@ -106,20 +106,20 @@ void DiagramEventAddImage::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief DiagramEventAddImage::mouseDoubleClickEvent
- * This method is only use to overwrite double click.
- * When double click, image propertie dialog isn't open.
- * @param event : event of mouse double click.
- */
+ @brief DiagramEventAddImage::mouseDoubleClickEvent
+ This method is only use to overwrite double click.
+ When double click, image propertie dialog isn't open.
+ @param event : event of mouse double click.
+*/
void DiagramEventAddImage::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) {
event->setAccepted(true);
}
/**
- * @brief DiagramEventAddImage::wheelEvent
- * Action when mouse wheel is rotate
- * @param event: evet of mouse wheel
- */
+ @brief DiagramEventAddImage::wheelEvent
+ Action when mouse wheel is rotate
+ @param event: evet of mouse wheel
+*/
void DiagramEventAddImage::wheelEvent(QGraphicsSceneWheelEvent *event)
{
if (!m_is_added || !m_image || event -> modifiers() != Qt::CTRL) {
@@ -136,9 +136,9 @@ void DiagramEventAddImage::wheelEvent(QGraphicsSceneWheelEvent *event)
}
/**
- * @brief DiagramEventAddImage::isNull
- * @return : true if image can't be loaded, otherwise return false.
- */
+ @brief DiagramEventAddImage::isNull
+ @return : true if image can't be loaded, otherwise return false.
+*/
bool DiagramEventAddImage::isNull() const
{
if (!m_image) return true;
@@ -146,9 +146,9 @@ bool DiagramEventAddImage::isNull() const
}
/**
- * @brief DiagramEventAddImage::openDialog
- * Open dialog for select the image to add.
- */
+ @brief DiagramEventAddImage::openDialog
+ Open dialog for select the image to add.
+*/
void DiagramEventAddImage::openDialog()
{
if (m_diagram -> isReadOnly()) return;
diff --git a/sources/diagramevent/diagrameventaddimage.h b/sources/diagramevent/diagrameventaddimage.h
index c63ff04c1..f48b38a66 100644
--- a/sources/diagramevent/diagrameventaddimage.h
+++ b/sources/diagramevent/diagrameventaddimage.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef DIAGRAMEVENTADDIMAGE_H
#define DIAGRAMEVENTADDIMAGE_H
@@ -24,28 +24,28 @@ class Diagram;
class DiagramImageItem;
/**
- * @brief The DiagramEventAddImage class
- * This diagram event, handle the adding of an image in a diagram.
- */
+ @brief The DiagramEventAddImage class
+ This diagram event, handle the adding of an image in a diagram.
+*/
class DiagramEventAddImage : public DiagramEventInterface
{
- Q_OBJECT
+ Q_OBJECT
- public:
- DiagramEventAddImage(Diagram *diagram);
- ~DiagramEventAddImage() override;
+ public:
+ DiagramEventAddImage(Diagram *diagram);
+ ~DiagramEventAddImage() override;
- void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
- void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
- void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
- void wheelEvent (QGraphicsSceneWheelEvent *event) override;
+ void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
+ void mouseMoveEvent (QGraphicsSceneMouseEvent *event) override;
+ void mouseDoubleClickEvent (QGraphicsSceneMouseEvent *event) override;
+ void wheelEvent (QGraphicsSceneWheelEvent *event) override;
- bool isNull () const;
- private:
- void openDialog();
+ bool isNull () const;
+ private:
+ void openDialog();
- DiagramImageItem *m_image;
- bool m_is_added;
+ DiagramImageItem *m_image;
+ bool m_is_added;
};
#endif // DIAGRAMEVENTADDIMAGE_H
diff --git a/sources/diagramevent/diagrameventaddshape.cpp b/sources/diagramevent/diagrameventaddshape.cpp
index 1256094f5..be9d69f34 100644
--- a/sources/diagramevent/diagrameventaddshape.cpp
+++ b/sources/diagramevent/diagrameventaddshape.cpp
@@ -20,11 +20,11 @@
#include "diagramcommands.h"
/**
- * @brief DiagramEventAddShape::DiagramEventAddShape
- * Default constructor
- * @param diagram : the diagram where this event must operate
- * @param shape_type : the type of shape to draw
- */
+ @brief DiagramEventAddShape::DiagramEventAddShape
+ Default constructor
+ @param diagram : the diagram where this event must operate
+ @param shape_type : the type of shape to draw
+*/
DiagramEventAddShape::DiagramEventAddShape(Diagram *diagram, QetShapeItem::ShapeType shape_type) :
DiagramEventInterface(diagram),
m_shape_type (shape_type),
@@ -37,8 +37,8 @@ DiagramEventAddShape::DiagramEventAddShape(Diagram *diagram, QetShapeItem::Shape
}
/**
- * @brief DiagramEventAddShape::~DiagramEventAddShape
- */
+ @brief DiagramEventAddShape::~DiagramEventAddShape
+*/
DiagramEventAddShape::~DiagramEventAddShape()
{
if ((m_running || m_abort) && m_shape_item)
@@ -54,10 +54,10 @@ DiagramEventAddShape::~DiagramEventAddShape()
}
/**
- * @brief DiagramEventAddShape::mousePressEvent
- * Action when mouse is pressed
- * @param event : event of mouse press
- */
+ @brief DiagramEventAddShape::mousePressEvent
+ Action when mouse is pressed
+ @param event : event of mouse press
+*/
void DiagramEventAddShape::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
if (Q_UNLIKELY(m_diagram->isReadOnly())) {
@@ -107,10 +107,10 @@ void DiagramEventAddShape::mousePressEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief DiagramEventAddShape::mouseMoveEvent
- * Action when mouse move
- * @param event : event of mouse move
- */
+ @brief DiagramEventAddShape::mouseMoveEvent
+ Action when mouse move
+ @param event : event of mouse move
+*/
void DiagramEventAddShape::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
updateHelpCross(event->scenePos());
@@ -128,10 +128,10 @@ void DiagramEventAddShape::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief DiagramEventAddShape::mouseReleaseEvent
- * Action when mouse button is released
- * @param event : event of mouse release
- */
+ @brief DiagramEventAddShape::mouseReleaseEvent
+ Action when mouse button is released
+ @param event : event of mouse release
+*/
void DiagramEventAddShape::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (event->button() == Qt::RightButton)
@@ -170,10 +170,10 @@ void DiagramEventAddShape::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief DiagramEventAddShape::mouseDoubleClickEvent
- * Action when mouse button is double clicked
- * @param event : event of mouse double click
- */
+ @brief DiagramEventAddShape::mouseDoubleClickEvent
+ Action when mouse button is double clicked
+ @param event : event of mouse double click
+*/
void DiagramEventAddShape::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
{
//If current item is a polyline, add it with an undo command
@@ -204,10 +204,10 @@ void DiagramEventAddShape::init()
}
/**
- * @brief DiagramEventAddShape::updateHelpCross
- * Create and update the position of the cross to help user for draw new shape
- * @param p : the center of the cross
- */
+ @brief DiagramEventAddShape::updateHelpCross
+ Create and update the position of the cross to help user for draw new shape
+ @param p : the center of the cross
+*/
void DiagramEventAddShape::updateHelpCross(const QPointF &p)
{
//If line isn't created yet, we create it.
diff --git a/sources/diagramevent/diagrameventaddshape.h b/sources/diagramevent/diagrameventaddshape.h
index cc43eff6c..a079a5909 100644
--- a/sources/diagramevent/diagrameventaddshape.h
+++ b/sources/diagramevent/diagrameventaddshape.h
@@ -22,9 +22,9 @@
#include "qetshapeitem.h"
/**
- * @brief The DiagramEventAddShape class
- * This event manage the creation of a shape.
- */
+ @brief The DiagramEventAddShape class
+ This event manage the creation of a shape.
+*/
class DiagramEventAddShape : public DiagramEventInterface
{
Q_OBJECT
diff --git a/sources/diagramevent/diagrameventaddtext.cpp b/sources/diagramevent/diagrameventaddtext.cpp
index 51b9dee23..0be6ba235 100644
--- a/sources/diagramevent/diagrameventaddtext.cpp
+++ b/sources/diagramevent/diagrameventaddtext.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "diagrameventaddtext.h"
@@ -22,33 +22,37 @@
#include "diagram.h"
/**
- * @brief DiagramEventAddText::DiagramEventAddText
- * Default constructor
- * @param diagram : the diagram where this event must operate
- */
+ @brief DiagramEventAddText::DiagramEventAddText
+ Default constructor
+ @param diagram : the diagram where this event must operate
+*/
DiagramEventAddText::DiagramEventAddText(Diagram *diagram) :
- DiagramEventInterface(diagram)
+ DiagramEventInterface(diagram)
{}
/**
- * @brief DiagramEventAddText::~DiagramEventAddText
- */
+ @brief DiagramEventAddText::~DiagramEventAddText
+*/
DiagramEventAddText::~DiagramEventAddText()
{}
/**
- * @brief DiagramEventAddText::mousePressEvent
- * @param event : event of mouse press event.
- */
+ @brief DiagramEventAddText::mousePressEvent
+ @param event : event of mouse press event.
+*/
void DiagramEventAddText::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
- if (event->button() == Qt::LeftButton)
- {
- IndependentTextItem *text = new IndependentTextItem();
- m_diagram -> undoStack().push(new AddItemCommand(text, m_diagram, event->scenePos()));
- text->setTextInteractionFlags(Qt::TextEditorInteraction);
- text->setFocus(Qt::MouseFocusReason);
- emit finish();
+ if (event->button() == Qt::LeftButton)
+ {
+ IndependentTextItem *text = new IndependentTextItem();
+ m_diagram -> undoStack().push(
+ new AddItemCommand(
+ text,
+ m_diagram,
+ event->scenePos()));
+ text->setTextInteractionFlags(Qt::TextEditorInteraction);
+ text->setFocus(Qt::MouseFocusReason);
+ emit finish();
event->setAccepted(true);
- }
+ }
}
diff --git a/sources/diagramevent/diagrameventaddtext.h b/sources/diagramevent/diagrameventaddtext.h
index 4969ec7be..58d3abdb9 100644
--- a/sources/diagramevent/diagrameventaddtext.h
+++ b/sources/diagramevent/diagrameventaddtext.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef DIAGRAMEVENTADDTEXT_H
#define DIAGRAMEVENTADDTEXT_H
@@ -23,18 +23,18 @@
class Diagram;
/**
- * @brief The DiagramEventAddText class
- * This diagram event handle the creation of a new text in a diagram
- */
+ @brief The DiagramEventAddText class
+ This diagram event handle the creation of a new text in a diagram
+*/
class DiagramEventAddText : public DiagramEventInterface
{
- Q_OBJECT
+ Q_OBJECT
- public:
- DiagramEventAddText(Diagram *diagram);
- ~DiagramEventAddText() override;
+ public:
+ DiagramEventAddText(Diagram *diagram);
+ ~DiagramEventAddText() override;
- void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
+ void mousePressEvent (QGraphicsSceneMouseEvent *event) override;
};
#endif // DIAGRAMEVENTADDTEXT_H
diff --git a/sources/diagramevent/diagrameventinterface.cpp b/sources/diagramevent/diagrameventinterface.cpp
index 4915e36a7..c8dcb4844 100644
--- a/sources/diagramevent/diagrameventinterface.cpp
+++ b/sources/diagramevent/diagrameventinterface.cpp
@@ -52,10 +52,10 @@ void DiagramEventInterface::wheelEvent(QGraphicsSceneWheelEvent *event) {
}
/**
- * @brief DiagramEventInterface::keyPressEvent
- * By default, press escape key abort the curent action
- * @param event
- */
+ @brief DiagramEventInterface::keyPressEvent
+ By default, press escape key abort the curent action
+ @param event
+*/
void DiagramEventInterface::keyPressEvent(QKeyEvent *event)
{
if (event->key() == Qt::Key_Escape)
diff --git a/sources/diagramevent/diagrameventinterface.h b/sources/diagramevent/diagrameventinterface.h
index 4150291a0..28dc638fd 100644
--- a/sources/diagramevent/diagrameventinterface.h
+++ b/sources/diagramevent/diagrameventinterface.h
@@ -26,22 +26,22 @@ class QKeyEvent;
class Diagram;
/**
- * @brief The DiagramEventInterface class
- * isRunning() return true if action is running (do something). By default return false.
+ @brief The DiagramEventInterface class
+ isRunning() return true if action is running (do something). By default return false.
*
- * ##USE DiagramEventInterface##
- * This class is the basic interface for manage event on a diagram.
- * To create a behavior for event diagram, we need to herite this class.
- * This interface work like this :
- * You need to create an interface and call diagram::setEventInterface(pointer_of_your_interface).
- * When a diagram get an event (mouse or key) if they have an event interface,
- * they send the event (with the status accepted to false) to the interface (for exemple mousePressEvent).
- * If the interface do something with this event, you need to set to true the accepted status of the event, then diagram do nothing.
- * When the interface job is done, we need to emit the signal finish(), the diagram use this signal to delete the interface.
- * Be carreful with the destructor, diagram can at any time (even if interface is still running) delete the interface,
- * the bool m_abort is here for that at destruction time.
+ ##USE DiagramEventInterface##
+ This class is the basic interface for manage event on a diagram.
+ To create a behavior for event diagram, we need to herite this class.
+ This interface work like this :
+ You need to create an interface and call diagram::setEventInterface(pointer_of_your_interface).
+ When a diagram get an event (mouse or key) if they have an event interface,
+ they send the event (with the status accepted to false) to the interface (for exemple mousePressEvent).
+ If the interface do something with this event, you need to set to true the accepted status of the event, then diagram do nothing.
+ When the interface job is done, we need to emit the signal finish(), the diagram use this signal to delete the interface.
+ Be carreful with the destructor, diagram can at any time (even if interface is still running) delete the interface,
+ the bool m_abort is here for that at destruction time.
*
- */
+*/
class DiagramEventInterface : public QObject
{
Q_OBJECT
diff --git a/sources/diagramprintdialog.cpp b/sources/diagramprintdialog.cpp
index 33cd0d3e8..9cfa76118 100644
--- a/sources/diagramprintdialog.cpp
+++ b/sources/diagramprintdialog.cpp
@@ -352,26 +352,28 @@ void DiagramPrintDialog::browseFilePrintTypeDialog() {
ou non
@param options Options de rendu
*/
-void DiagramPrintDialog::print(const QList &diagrams, bool fit_page, const ExportProperties& options) {
+void DiagramPrintDialog::print(const QList &diagrams,
+ bool fit_page,
+ const ExportProperties& options) {
//qDebug() << "Demande d'impression de " << diagrams.count() << "schemas.";
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
- #ifdef Q_OS_WIN
- #ifdef QT_DEBUG
- qDebug() << "--";
- qDebug() << "DiagramPrintDialog::print printer_->resolution() before " << printer_->resolution();
- qDebug() << "DiagramPrintDialog::print screennumber " << QApplication::desktop()->screenNumber();
- #endif
+ #ifdef Q_OS_WIN
+ #ifdef QT_DEBUG
+ qDebug() << "--";
+ qDebug() << "DiagramPrintDialog::print printer_->resolution() before " << printer_->resolution();
+ qDebug() << "DiagramPrintDialog::print screennumber " << QApplication::desktop()->screenNumber();
+ #endif
- QScreen *srn = QApplication::screens().at(QApplication::desktop()->screenNumber());
- qreal dotsPerInch = (qreal)srn->logicalDotsPerInch();
- printer_->setResolution(dotsPerInch);
+ QScreen *srn = QApplication::screens().at(QApplication::desktop()->screenNumber());
+ qreal dotsPerInch = (qreal)srn->logicalDotsPerInch();
+ printer_->setResolution(dotsPerInch);
- #ifdef QT_DEBUG
- qDebug() << "DiagramPrintDialog::print dotsPerInch " << dotsPerInch;
- qDebug() << "DiagramPrintDialog::print printer_->resolution() after" << printer_->resolution();
- qDebug() << "--";
- #endif
- #endif
+ #ifdef QT_DEBUG
+ qDebug() << "DiagramPrintDialog::print dotsPerInch " << dotsPerInch;
+ qDebug() << "DiagramPrintDialog::print printer_->resolution() after" << printer_->resolution();
+ qDebug() << "--";
+ #endif
+ #endif
#endif
// QPainter utiliser pour effectuer le rendu
QPainter qp(printer_);
@@ -399,7 +401,11 @@ void DiagramPrintDialog::print(const QList &diagrams, bool fit_page,
@param qp QPainter a utiliser (deja initialise sur printer)
@param printer Imprimante a utiliser
*/
-void DiagramPrintDialog::printDiagram(Diagram *diagram, bool fit_page, const ExportProperties &options, QPainter *qp, QPrinter *printer) {
+void DiagramPrintDialog::printDiagram(Diagram *diagram,
+ bool fit_page,
+ const ExportProperties &options,
+ QPainter *qp,
+ QPrinter *printer) {
//qDebug() << printer -> paperSize() << printer -> paperRect() << diagram -> title();
// l'imprimante utilise-t-elle toute la feuille ?
bool full_page = printer -> fullPage();
diff --git a/sources/diagramschooser.cpp b/sources/diagramschooser.cpp
index 664e0fd1d..66701fe39 100644
--- a/sources/diagramschooser.cpp
+++ b/sources/diagramschooser.cpp
@@ -162,7 +162,7 @@ void DiagramsChooser::updateList() {
foreach(Diagram *diagram, project_ -> diagrams()) {
// titre du schema
QString diagram_title = diagram -> title();
- if (diagram_title.isEmpty()) diagram_title = tr("Folio sans titre");
+ if (diagram_title.isEmpty()) diagram_title = tr("Folio sans titre");
QCheckBox *checkbox = new QCheckBox(diagram_title);
checkbox -> setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum));
diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp
index 8b22dbbed..34a18c771 100644
--- a/sources/diagramview.cpp
+++ b/sources/diagramview.cpp
@@ -198,10 +198,10 @@ void DiagramView::handleElementDrop(QDropEvent *event)
}
/**
- * @brief DiagramView::handleTitleBlockDrop
- * Handle the dropEvent that contain data of a titleblock
- * @param e
- */
+ @brief DiagramView::handleTitleBlockDrop
+ Handle the dropEvent that contain data of a titleblock
+ @param e
+*/
void DiagramView::handleTitleBlockDrop(QDropEvent *e) {
// fetch the title block template location from the drop event
TitleBlockTemplateLocation tbt_loc;
@@ -247,10 +247,10 @@ void DiagramView::handleTitleBlockDrop(QDropEvent *e) {
}
/**
- * @brief DiagramView::handleTextDrop
+ @brief DiagramView::handleTextDrop
*handle the drop of text
- * @param e the QDropEvent describing the current drag'n drop
- */
+ @param e the QDropEvent describing the current drag'n drop
+*/
void DiagramView::handleTextDrop(QDropEvent *e) {
if (m_diagram -> isReadOnly() || (e -> mimeData() -> hasText() == false) ) return;
@@ -284,12 +284,12 @@ void DiagramView::setSelectionMode() {
}
/**
- * @brief DiagramView::zoom
- * Zomm the view.
- * A zoom_factor > 1 zoom in.
- * A zoom_factor < 1 zoom out
- * @param zoom_factor
- */
+ @brief DiagramView::zoom
+ Zomm the view.
+ A zoom_factor > 1 zoom in.
+ A zoom_factor < 1 zoom out
+ @param zoom_factor
+*/
void DiagramView::zoom(const qreal zoom_factor)
{
if (zoom_factor >= 1){
@@ -357,11 +357,11 @@ void DiagramView::copy() {
}
/**
- * @brief DiagramView::paste
- * Import the element stored in the clipboard to the diagram.
- * @param pos : top left corner of the bounding rect of imported elements
- * @param clipboard_mode
- */
+ @brief DiagramView::paste
+ Import the element stored in the clipboard to the diagram.
+ @param pos : top left corner of the bounding rect of imported elements
+ @param clipboard_mode
+*/
void DiagramView::paste(const QPointF &pos, QClipboard::Mode clipboard_mode) {
if (!isInteractive() || m_diagram -> isReadOnly()) return;
@@ -448,9 +448,9 @@ void DiagramView::mousePressEvent(QMouseEvent *e)
}
/**
- * @brief DiagramView::mouseMoveEvent
- * Manage the event move mouse
- */
+ @brief DiagramView::mouseMoveEvent
+ Manage the event move mouse
+*/
void DiagramView::mouseMoveEvent(QMouseEvent *e)
{
if (m_event_interface && m_event_interface->mouseMoveEvent(e)) return;
@@ -509,9 +509,9 @@ void DiagramView::mouseMoveEvent(QMouseEvent *e)
}
/**
- * @brief DiagramView::mouseReleaseEvent
- * Manage event release click mouse
- */
+ @brief DiagramView::mouseReleaseEvent
+ Manage event release click mouse
+*/
void DiagramView::mouseReleaseEvent(QMouseEvent *e)
{
if (m_event_interface && m_event_interface->mouseReleaseEvent(e)) return;
@@ -563,9 +563,9 @@ void DiagramView::mouseReleaseEvent(QMouseEvent *e)
}
/**
- * @brief DiagramView::gestures
- * @return
- */
+ @brief DiagramView::gestures
+ @return
+*/
bool DiagramView::gestures() const
{
QSettings settings;
@@ -606,11 +606,11 @@ void DiagramView::wheelEvent(QWheelEvent *event)
}
/**
- * @brief DiagramView::gestureEvent
- * Use the pinch of the trackpad for zoom
- * @param event
- * @return
- */
+ @brief DiagramView::gestureEvent
+ Use the pinch of the trackpad for zoom
+ @param event
+ @return
+*/
bool DiagramView::gestureEvent(QGestureEvent *event)
{
if (QGesture *gesture = event->gesture(Qt::PinchGesture))
@@ -639,11 +639,11 @@ void DiagramView::focusInEvent(QFocusEvent *e) {
}
/**
- * @brief DiagramView::keyPressEvent
- * Handles "key press" events. Reimplemented here to switch to visualisation
- * mode if needed.
- * @param e
- */
+ @brief DiagramView::keyPressEvent
+ Handles "key press" events. Reimplemented here to switch to visualisation
+ mode if needed.
+ @param e
+*/
void DiagramView::keyPressEvent(QKeyEvent *e)
{
if (m_event_interface && m_event_interface->keyPressEvent(e))
@@ -821,17 +821,17 @@ QString DiagramView::title() const {
}
/**
- * @brief DiagramView::editDiagramProperties
- * Edit the properties of the viewed digram
- */
+ @brief DiagramView::editDiagramProperties
+ Edit the properties of the viewed digram
+*/
void DiagramView::editDiagramProperties() {
DiagramPropertiesDialog::diagramPropertiesDialog(m_diagram, diagramEditor());
}
/**
- * @brief DiagramView::adjustSceneRect
- * Calcul and set the area of the scene visualized by this view
- */
+ @brief DiagramView::adjustSceneRect
+ Calcul and set the area of the scene visualized by this view
+*/
void DiagramView::adjustSceneRect()
{
QRectF scene_rect = m_diagram->sceneRect();
@@ -912,9 +912,9 @@ void DiagramView::applyReadOnly() {
}
/**
- * @brief DiagramView::editSelectedConductorColor
- * Edit the color of the selected conductor; does nothing if multiple conductors are selected
- */
+ @brief DiagramView::editSelectedConductorColor
+ Edit the color of the selected conductor; does nothing if multiple conductors are selected
+*/
void DiagramView::editSelectedConductorColor()
{
//retrieve selected content
@@ -996,14 +996,14 @@ void DiagramView::resetConductors() {
@param e Evenement
*/
/**
- * @brief DiagramView::event
- * Manage the event on this diagram view.
- * -At first activation (QEvent::WindowActivate or QEvent::Show) we zoomFit.
- * -Convert event interpreted to mouse event to gesture event if needed.
- * -send Shortcut to view (by default send to QMenu /QAction)
- * @param e the event.
- * @return
- */
+ @brief DiagramView::event
+ Manage the event on this diagram view.
+ -At first activation (QEvent::WindowActivate or QEvent::Show) we zoomFit.
+ -Convert event interpreted to mouse event to gesture event if needed.
+ -send Shortcut to view (by default send to QMenu /QAction)
+ @param e the event.
+ @return
+*/
bool DiagramView::event(QEvent *e) {
if (Q_UNLIKELY(m_first_activation)) {
if (e -> type() == QEvent::Show) {
@@ -1031,10 +1031,10 @@ bool DiagramView::event(QEvent *e) {
}
/**
- * @brief DiagramView::paintEvent
- * Reimplemented from QGraphicsView
- * @param event
- */
+ @brief DiagramView::paintEvent
+ Reimplemented from QGraphicsView
+ @param event
+*/
void DiagramView::paintEvent(QPaintEvent *event)
{
QGraphicsView::paintEvent(event);
@@ -1113,9 +1113,9 @@ bool DiagramView::selectedItemHasFocus() {
}
/**
- * @brief DiagramView::editSelection
- * Edit the selected item if he can be edited and if only one item is selected
- */
+ @brief DiagramView::editSelection
+ Edit the selected item if he can be edited and if only one item is selected
+*/
void DiagramView::editSelection() {
if (m_diagram -> isReadOnly() || m_diagram -> selectedItems().size() != 1 ) return;
@@ -1133,11 +1133,11 @@ void DiagramView::editSelection() {
}
/**
- * @brief DiagramView::setEventInterface
- * Set an event interface to diagram view.
- * If diagram view already have an event interface, he delete it before.
- * Diagram view take ownership of event interface and delete it when event interface is finish
- */
+ @brief DiagramView::setEventInterface
+ Set an event interface to diagram view.
+ If diagram view already have an event interface, he delete it before.
+ Diagram view take ownership of event interface and delete it when event interface is finish
+*/
void DiagramView::setEventInterface(DVEventInterface *event_interface)
{
if (m_event_interface) delete m_event_interface;
@@ -1146,10 +1146,10 @@ void DiagramView::setEventInterface(DVEventInterface *event_interface)
}
/**
- * @brief DiagramView::contextMenuActions
- * @return a list of actions currently available for a context menu.
- *
- */
+ @brief DiagramView::contextMenuActions
+ @return a list of actions currently available for a context menu.
+
+*/
QList DiagramView::contextMenuActions() const
{
QList list;
@@ -1189,9 +1189,9 @@ QList DiagramView::contextMenuActions() const
}
/**
- * @brief DiagramView::contextMenuEvent
- * @param e
- */
+ @brief DiagramView::contextMenuEvent
+ @param e
+*/
void DiagramView::contextMenuEvent(QContextMenuEvent *e)
{
QGraphicsView::contextMenuEvent(e);
@@ -1237,9 +1237,9 @@ QETDiagramEditor *DiagramView::diagramEditor() const {
}
/**
- * @brief DiagramView::mouseDoubleClickEvent
- * @param e
- */
+ @brief DiagramView::mouseDoubleClickEvent
+ @param e
+*/
void DiagramView::mouseDoubleClickEvent(QMouseEvent *e)
{
if (m_event_interface && m_event_interface -> mouseDoubleClickEvent(e)) return;
diff --git a/sources/dvevent/dveventinterface.cpp b/sources/dvevent/dveventinterface.cpp
index 4d5a84e57..d436db1f5 100644
--- a/sources/dvevent/dveventinterface.cpp
+++ b/sources/dvevent/dveventinterface.cpp
@@ -57,12 +57,12 @@ bool DVEventInterface::wheelEvent(QWheelEvent *event) {
}
/**
- * @brief DVEventInterface::keyPressEvent
- * By default, press escape key abort the curent action.
- * isFinish return true, and emit finish
- * @param event
- * @return
- */
+ @brief DVEventInterface::keyPressEvent
+ By default, press escape key abort the curent action.
+ isFinish return true, and emit finish
+ @param event
+ @return
+*/
bool DVEventInterface::keyPressEvent(QKeyEvent *event)
{
if (event->key() == Qt::Key_Escape)
diff --git a/sources/dvevent/dveventinterface.h b/sources/dvevent/dveventinterface.h
index 7685b120f..2322f004b 100644
--- a/sources/dvevent/dveventinterface.h
+++ b/sources/dvevent/dveventinterface.h
@@ -27,14 +27,18 @@ class DiagramView;
class Diagram;
/**
- * @brief The DVEventInterface class
- * This class is the main interface for manage event of a Diagram View.
- * This do nothing, for create new event behavior, we must to create new class from this.
- * Each method return a bool: True if the methode do something else return false.
- * Each method of DVEventInterface return false;
- * isRunning() return true if action is started but not finish. By default return false.
- * isFinish() return true when the action is finish, or not started. By default return true.
- */
+ @brief The DVEventInterface class
+ This class is the main interface for manage event of a Diagram View.
+ This do nothing, for create new event behavior,
+ we must to create new class from this.
+ Each method return a bool:
+ True if the methode do something else return false.
+ Each method of DVEventInterface return false;
+ isRunning() return true if action is started but not finish.
+ By default return false.
+ isFinish() return true when the action is finish, or not started.
+ By default return true.
+*/
class DVEventInterface : public QObject
{
Q_OBJECT
@@ -54,8 +58,8 @@ class DVEventInterface : public QObject
signals:
/**
- * @brief finish
- * emited when the interface finish is work
+ @brief finish
+ emited when the interface finish is work
*/
void finish();
diff --git a/sources/editor/UndoCommand/pastepartscommand.cpp b/sources/editor/UndoCommand/pastepartscommand.cpp
index a72cfe8c7..3b53ec7f1 100644
--- a/sources/editor/UndoCommand/pastepartscommand.cpp
+++ b/sources/editor/UndoCommand/pastepartscommand.cpp
@@ -20,14 +20,14 @@
#include "partterminal.h"
/**
- * @brief PastePartsCommand::PastePartsCommand
- * @param view : view where this command work
- * @param content_to_paste : content to paste
- * @param parent : parent undo command
+ @brief PastePartsCommand::PastePartsCommand
+ @param view : view where this command work
+ @param content_to_paste : content to paste
+ @param parent : parent undo command
*
- * Note : all terminal stored in @content_to_paste get a new uuid in the constructor of this class to avoid have
- * several terminal of an element with the same uuid.
- */
+ Note : all terminal stored in @content_to_paste get a new uuid in the constructor of this class to avoid have
+ several terminal of an element with the same uuid.
+*/
PastePartsCommand::PastePartsCommand(ElementView *view, const ElementContent &content_to_paste, QUndoCommand *parent) :
ElementEditionCommand(view ? view -> scene() : nullptr, view, parent)
{
@@ -44,16 +44,16 @@ PastePartsCommand::PastePartsCommand(ElementView *view, const ElementContent &co
}
/**
- * @brief PastePartsCommand::~PastePartsCommand
- */
+ @brief PastePartsCommand::~PastePartsCommand
+*/
PastePartsCommand::~PastePartsCommand()
{
m_scene->qgiManager().release(m_pasted_content);
}
/**
- * @brief PastePartsCommand::undo
- */
+ @brief PastePartsCommand::undo
+*/
void PastePartsCommand::undo()
{
m_scene->blockSignals(true);
@@ -72,8 +72,8 @@ void PastePartsCommand::undo()
}
/**
- * @brief PastePartsCommand::redo
- */
+ @brief PastePartsCommand::redo
+*/
void PastePartsCommand::redo()
{
if (m_first_redo) {
@@ -97,13 +97,13 @@ void PastePartsCommand::redo()
}
/**
- * @brief PastePartsCommand::setOffset
- * Describe the offset to use with this undo command
- * @param old_offset_paste_count
- * @param old_start_top_left_corner
- * @param new_offset_paste_count
- * @param new_start_top_left_corner
- */
+ @brief PastePartsCommand::setOffset
+ Describe the offset to use with this undo command
+ @param old_offset_paste_count
+ @param old_start_top_left_corner
+ @param new_offset_paste_count
+ @param new_start_top_left_corner
+*/
void PastePartsCommand::setOffset(int old_offset_paste_count, const QPointF &old_start_top_left_corner, int new_offset_paste_count, const QPointF &new_start_top_left_corner)
{
m_old_offset_paste_count = old_offset_paste_count;
diff --git a/sources/editor/UndoCommand/pastepartscommand.h b/sources/editor/UndoCommand/pastepartscommand.h
index eac997eee..34841f6d1 100644
--- a/sources/editor/UndoCommand/pastepartscommand.h
+++ b/sources/editor/UndoCommand/pastepartscommand.h
@@ -24,9 +24,9 @@
class ElementView;
/**
- * @brief The PastePartsCommand class
- * Undo command for paste element primitive in an element editor
- */
+ @brief The PastePartsCommand class
+ Undo command for paste element primitive in an element editor
+*/
class PastePartsCommand : public ElementEditionCommand
{
public:
diff --git a/sources/editor/arceditor.cpp b/sources/editor/arceditor.cpp
index 4c9a73fbb..87cbcb5dd 100644
--- a/sources/editor/arceditor.cpp
+++ b/sources/editor/arceditor.cpp
@@ -95,12 +95,12 @@ void ArcEditor::disconnectChangeConnections()
}
/**
- * @brief ArcEditor::setPart
- * Specifie to this editor the part to edit.
- * Note that an editor can accept or refuse to edit a part. This editor accept only partArc.
- * @param new_part
- * @return
- */
+ @brief ArcEditor::setPart
+ Specifie to this editor the part to edit.
+ Note that an editor can accept or refuse to edit a part. This editor accept only partArc.
+ @param new_part
+ @return
+*/
bool ArcEditor::setPart(CustomElementPart *new_part)
{
if (!new_part)
@@ -137,9 +137,9 @@ bool ArcEditor::setParts(QList parts)
}
/**
- * @brief ArcEditor::currentPart
- * @return the curent edited part, or 0 if there is no edited part
- */
+ @brief ArcEditor::currentPart
+ @return the curent edited part, or 0 if there is no edited part
+*/
CustomElementPart *ArcEditor::currentPart() const {
return(part);
}
@@ -149,9 +149,9 @@ QList ArcEditor::currentParts() const {
}
/**
- * @brief ArcEditor::updateArcS
- * Update the start angle of the arc according to the edited value.
- */
+ @brief ArcEditor::updateArcS
+ Update the start angle of the arc according to the edited value.
+*/
void ArcEditor::updateArcS()
{
if (m_locked) return;
@@ -175,9 +175,9 @@ void ArcEditor::updateArcS()
}
/**
- * @brief ArcEditor::updateArcA
- * Update the span angle of the arc according to the edited value.
- */
+ @brief ArcEditor::updateArcA
+ Update the span angle of the arc according to the edited value.
+*/
void ArcEditor::updateArcA()
{
if (m_locked) return;
@@ -200,9 +200,9 @@ void ArcEditor::updateArcA()
}
/**
- * @brief ArcEditor::updateArcRect
- * Update the geometrie of the rect that define this arc according the the edited values
- */
+ @brief ArcEditor::updateArcRect
+ Update the geometrie of the rect that define this arc according the the edited values
+*/
void ArcEditor::updateArcRectX()
{
if (m_locked) return;
@@ -300,9 +300,9 @@ void ArcEditor::updateArcRectV()
}
/**
- * @brief ArcEditor::updateForm
- * Update the value of the widgets
- */
+ @brief ArcEditor::updateForm
+ Update the value of the widgets
+*/
void ArcEditor::updateForm()
{
if (!part) return;
@@ -318,11 +318,11 @@ void ArcEditor::updateForm()
}
/**
- * @brief ArcEditor::activeConnections
- * Enable/disable connection between editor widget and slot editingFinished
- * True == enable | false == disable
- * @param active
- */
+ @brief ArcEditor::activeConnections
+ Enable/disable connection between editor widget and slot editingFinished
+ True == enable | false == disable
+ @param active
+*/
void ArcEditor::activeConnections(bool active)
{
if (active)
diff --git a/sources/editor/arceditor.h b/sources/editor/arceditor.h
index aaa79efe2..b5b8d38fc 100644
--- a/sources/editor/arceditor.h
+++ b/sources/editor/arceditor.h
@@ -67,10 +67,11 @@ class ArcEditor : public ElementItemEditor
private:
void activeConnections(bool);
- /*!
- * \brief setUpChangeConnections
- * Setup the connection from the arc(s) to the widget, to update it when the arc(s) are changed (moved ...)
- */
+ /**
+ @brief setUpChangeConnections
+ Setup the connection from the arc(s) to the widget,
+ to update it when the arc(s) are changed (moved ...)
+ */
void setUpChangeConnections();
void disconnectChangeConnections();
};
diff --git a/sources/editor/editorcommands.cpp b/sources/editor/editorcommands.cpp
index 7c4526b79..92dd0a4b4 100644
--- a/sources/editor/editorcommands.cpp
+++ b/sources/editor/editorcommands.cpp
@@ -523,13 +523,13 @@ void ScalePartsCommand::adjustText() {
}
}
/**
- * @brief ChangePropertiesCommand::ChangePropertiesCommand
- * Change the properties of the drawed element
- * @param scene: scene to belong the property
- * @param type: new type of element.
- * @param context: new info about type.
- * @param parent: parent undo
- */
+ @brief ChangePropertiesCommand::ChangePropertiesCommand
+ Change the properties of the drawed element
+ @param scene: scene to belong the property
+ @param type: new type of element.
+ @param context: new info about type.
+ @param parent: parent undo
+*/
ChangePropertiesCommand::ChangePropertiesCommand(ElementScene *scene, const QString& type, const DiagramContext& info, const DiagramContext& elmt_info, QUndoCommand *parent) :
ElementEditionCommand(scene, nullptr, parent)
{
diff --git a/sources/editor/editorcommands.h b/sources/editor/editorcommands.h
index d6174ffbf..07ec7a4c2 100644
--- a/sources/editor/editorcommands.h
+++ b/sources/editor/editorcommands.h
@@ -24,11 +24,11 @@
#include "qgimanager.h"
/**
- * @brief The ElementEditionCommand class
- * ElementEditionCommand is the base class for all commands classes involved in
+ @brief The ElementEditionCommand class
+ ElementEditionCommand is the base class for all commands classes involved in
the edition of an electrical element. It provides commonly required methods
and attributes, such as accessors to the modified scene and view.
- */
+*/
class ElementEditionCommand : public QUndoCommand
{
// constructors, destructor
diff --git a/sources/editor/elementitemeditor.h b/sources/editor/elementitemeditor.h
index d23ed76ee..ca5892d75 100644
--- a/sources/editor/elementitemeditor.h
+++ b/sources/editor/elementitemeditor.h
@@ -54,7 +54,7 @@ class ElementItemEditor : public QWidget
virtual bool setParts(QList ) {return false;}
virtual CustomElementPart *currentPart() const = 0;
- virtual QList currentParts() const = 0;
+ virtual QList currentParts() const = 0;
virtual void updateForm() = 0;
// attributes
diff --git a/sources/editor/elementprimitivedecorator.cpp b/sources/editor/elementprimitivedecorator.cpp
index 612d42ea2..f7c90baed 100644
--- a/sources/editor/elementprimitivedecorator.cpp
+++ b/sources/editor/elementprimitivedecorator.cpp
@@ -472,8 +472,8 @@ QVector ElementPrimitiveDecorator::getResizingsPoints() const
}
/**
- * @brief ElementPrimitiveDecorator::adjusteHandlerPos
- */
+ @brief ElementPrimitiveDecorator::adjusteHandlerPos
+*/
void ElementPrimitiveDecorator::adjusteHandlerPos()
{
QVector points_vector = mapToScene(getResizingsPoints());
@@ -482,10 +482,10 @@ void ElementPrimitiveDecorator::adjusteHandlerPos()
}
/**
- * @brief ElementPrimitiveDecorator::handlerMousePressEvent
- * @param qghi
- * @param event
- */
+ @brief ElementPrimitiveDecorator::handlerMousePressEvent
+ @param qghi
+ @param event
+*/
void ElementPrimitiveDecorator::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(event);
@@ -499,10 +499,10 @@ void ElementPrimitiveDecorator::handlerMousePressEvent(QetGraphicsHandlerItem *q
}
/**
- * @brief ElementPrimitiveDecorator::handlerMouseMoveEvent
- * @param qghi
- * @param event
- */
+ @brief ElementPrimitiveDecorator::handlerMouseMoveEvent
+ @param qghi
+ @param event
+*/
void ElementPrimitiveDecorator::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -554,10 +554,10 @@ void ElementPrimitiveDecorator::handlerMouseMoveEvent(QetGraphicsHandlerItem *qg
}
/**
- * @brief ElementPrimitiveDecorator::handlerMouseReleaseEvent
- * @param qghi
- * @param event
- */
+ @brief ElementPrimitiveDecorator::handlerMouseReleaseEvent
+ @param qghi
+ @param event
+*/
void ElementPrimitiveDecorator::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -585,9 +585,9 @@ void ElementPrimitiveDecorator::handlerMouseReleaseEvent(QetGraphicsHandlerItem
}
/**
- * @brief ElementPrimitiveDecorator::addHandler
- * Add handlers for this item
- */
+ @brief ElementPrimitiveDecorator::addHandler
+ Add handlers for this item
+*/
void ElementPrimitiveDecorator::addHandler()
{
if (m_handler_vector.isEmpty() && scene())
@@ -605,9 +605,9 @@ void ElementPrimitiveDecorator::addHandler()
}
/**
- * @brief ElementPrimitiveDecorator::removeHandler
- * Remove the handlers of this item
- */
+ @brief ElementPrimitiveDecorator::removeHandler
+ Remove the handlers of this item
+*/
void ElementPrimitiveDecorator::removeHandler()
{
if (!m_handler_vector.isEmpty())
@@ -688,11 +688,11 @@ QET::ScalingMethod ElementPrimitiveDecorator::scalingMethod(QGraphicsSceneMouseE
}
/**
- * @brief ElementPrimitiveDecorator::itemChange
- * @param change
- * @param value
- * @return
- */
+ @brief ElementPrimitiveDecorator::itemChange
+ @param change
+ @param value
+ @return
+*/
QVariant ElementPrimitiveDecorator::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
{
if (change == ItemSceneHasChanged)
@@ -718,11 +718,11 @@ QVariant ElementPrimitiveDecorator::itemChange(QGraphicsItem::GraphicsItemChange
}
/**
- * @brief ElementPrimitiveDecorator::sceneEventFilter
- * @param watched
- * @param event
- * @return
- */
+ @brief ElementPrimitiveDecorator::sceneEventFilter
+ @param watched
+ @param event
+ @return
+*/
bool ElementPrimitiveDecorator::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
{
//Watched must be an handler
diff --git a/sources/editor/elementscene.cpp b/sources/editor/elementscene.cpp
index b206ac3ee..9681bd487 100644
--- a/sources/editor/elementscene.cpp
+++ b/sources/editor/elementscene.cpp
@@ -75,7 +75,7 @@ ElementScene::ElementScene(QETElementEditor *editor, QObject *parent) :
/**
@brief ElementScene::~ElementScene
- */
+*/
ElementScene::~ElementScene()
{
//Disconnect to avoid crash, see bug report N° 122.
diff --git a/sources/editor/elementview.cpp b/sources/editor/elementview.cpp
index a8da50452..edae5ae29 100644
--- a/sources/editor/elementview.cpp
+++ b/sources/editor/elementview.cpp
@@ -114,14 +114,14 @@ void ElementView::zoomOut() {
Agrandit le schema avec le trackpad
*/
void ElementView::zoomInSlowly() {
- scale(1.02, 1.02);
+ scale(1.02, 1.02);
}
/**
Retrecit le schema avec le trackpad
*/
void ElementView::zoomOutSlowly() {
- scale(0.98, 0.98);
+ scale(0.98, 0.98);
}
/**
@@ -144,10 +144,10 @@ void ElementView::zoomReset() {
}
/**
- * @brief ElementView::adjustSceneRect
- * Adjust the scenRect, so that he include all primitives of element
- * plus the viewport of the scene with a margin of 1/3 of herself
- */
+ @brief ElementView::adjustSceneRect
+ Adjust the scenRect, so that he include all primitives of element
+ plus the viewport of the scene with a margin of 1/3 of herself
+*/
void ElementView::adjustSceneRect() {
QRectF esgr = m_scene -> elementSceneGeometricRect();
QRectF vpbr = mapToScene(this -> viewport()->rect()).boundingRect();
@@ -156,10 +156,10 @@ void ElementView::adjustSceneRect() {
}
/**
- * @brief ElementView::resetSceneRect
- * reset le sceneRect (zone du schéma visualisée par l'ElementView) afin que
- * celui-ci inclut uniquement les primitives de l'élément dessiné.
- */
+ @brief ElementView::resetSceneRect
+ reset le sceneRect (zone du schéma visualisée par l'ElementView) afin que
+ celui-ci inclut uniquement les primitives de l'élément dessiné.
+*/
void ElementView::resetSceneRect() {
setSceneRect(m_scene -> elementSceneGeometricRect());
}
@@ -366,9 +366,9 @@ void ElementView::mousePressEvent(QMouseEvent *e) {
}
/**
- * @brief ElementView::mouseMoveEvent
- * Manage the event move mouse
- */
+ @brief ElementView::mouseMoveEvent
+ Manage the event move mouse
+*/
void ElementView::mouseMoveEvent(QMouseEvent *e) {
if (e->buttons() == Qt::MidButton)
{
@@ -384,9 +384,9 @@ void ElementView::mouseMoveEvent(QMouseEvent *e) {
}
/**
- * @brief ElementView::mouseReleaseEvent
- * Manage event release click mouse
- */
+ @brief ElementView::mouseReleaseEvent
+ Manage event release click mouse
+*/
void ElementView::mouseReleaseEvent(QMouseEvent *e) {
if (e -> button() == Qt::MidButton) {
setCursor(Qt::ArrowCursor);
@@ -397,9 +397,9 @@ void ElementView::mouseReleaseEvent(QMouseEvent *e) {
}
/**
- * @brief ElementView::gestures
- * @return
- */
+ @brief ElementView::gestures
+ @return
+*/
bool ElementView::gestures() const
{
QSettings settings;
@@ -408,9 +408,9 @@ bool ElementView::gestures() const
/**
- * @brief ElementView::wheelEvent
- * @param e
- */
+ @brief ElementView::wheelEvent
+ @param e
+*/
void ElementView::wheelEvent(QWheelEvent *e) {
//Zoom and scrolling
if ( gestures() ) {
@@ -439,11 +439,11 @@ bool ElementView::event(QEvent *e) {
}
/**
- * Utilise le pincement du trackpad pour zoomer
- * @brief ElementView::gestureEvent
- * @param event
- * @return
- */
+ Utilise le pincement du trackpad pour zoomer
+ @brief ElementView::gestureEvent
+ @param event
+ @return
+*/
bool ElementView::gestureEvent(QGestureEvent *event){
if (QGesture *gesture = event->gesture(Qt::PinchGesture)) {
QPinchGesture *pinch = static_cast(gesture);
diff --git a/sources/editor/ellipseeditor.h b/sources/editor/ellipseeditor.h
index 735561631..6dca2d015 100644
--- a/sources/editor/ellipseeditor.h
+++ b/sources/editor/ellipseeditor.h
@@ -62,10 +62,10 @@ class EllipseEditor : public ElementItemEditor
private:
void activeConnections(bool);
- /*!
- * \brief setUpChangeConnections
- * Setup the connection from the ellipse(s) to the widget, to update it when the ellipse(s) are changed (moved ...)
- */
+ /**
+ @brief setUpChangeConnections
+ Setup the connection from the ellipse(s) to the widget, to update it when the ellipse(s) are changed (moved ...)
+ */
void setUpChangeConnections();
void disconnectChangeConnections();
};
diff --git a/sources/editor/esevent/eseventaddarc.cpp b/sources/editor/esevent/eseventaddarc.cpp
index 214dc1ed4..5f37f4981 100644
--- a/sources/editor/esevent/eseventaddarc.cpp
+++ b/sources/editor/esevent/eseventaddarc.cpp
@@ -23,9 +23,9 @@
#include "eseventaddarc.h"
/**
- * @brief ESEventAddArc::ESEventAddArc
- * @param scene
- */
+ @brief ESEventAddArc::ESEventAddArc
+ @param scene
+*/
ESEventAddArc::ESEventAddArc(ElementScene *scene) :
ESEventInterface(scene),
m_arc(nullptr),
@@ -33,18 +33,18 @@ ESEventAddArc::ESEventAddArc(ElementScene *scene) :
{}
/**
- * @brief ESEventAddArc::~ESEventAddArc
- */
+ @brief ESEventAddArc::~ESEventAddArc
+*/
ESEventAddArc::~ESEventAddArc() {
if (m_running || m_abort)
delete m_arc;
}
/**
- * @brief ESEventAddPolygon::mousePressEvent
- * @param event
- * @return
- */
+ @brief ESEventAddPolygon::mousePressEvent
+ @param event
+ @return
+*/
bool ESEventAddArc::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
if (event -> button() == Qt::LeftButton)
@@ -79,10 +79,10 @@ bool ESEventAddArc::mousePressEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief ESEventAddArc::mouseMoveEvent
- * @param event
- * @return
- */
+ @brief ESEventAddArc::mouseMoveEvent
+ @param event
+ @return
+*/
bool ESEventAddArc::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
updateHelpCross(event -> scenePos());
if (!m_arc) return false;
@@ -94,10 +94,10 @@ bool ESEventAddArc::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddArc::mouseReleaseEvent
- * @param event
- * @return
- */
+ @brief ESEventAddArc::mouseReleaseEvent
+ @param event
+ @return
+*/
bool ESEventAddArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::RightButton) {
if (m_arc) {delete m_arc; m_arc = nullptr;}
@@ -108,10 +108,10 @@ bool ESEventAddArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddArc::keyPressEvent
- * @param event
- * @return
- */
+ @brief ESEventAddArc::keyPressEvent
+ @param event
+ @return
+*/
bool ESEventAddArc::keyPressEvent(QKeyEvent *event) {
if (m_arc && event->key() == Qt::Key_Space) {
m_inverted = m_inverted ? false : true;
@@ -123,9 +123,9 @@ bool ESEventAddArc::keyPressEvent(QKeyEvent *event) {
}
/**
- * @brief ESEventAddArc::updateArc
- * Redraw the arc with curent value
- */
+ @brief ESEventAddArc::updateArc
+ Redraw the arc with curent value
+*/
void ESEventAddArc::updateArc()
{
qreal width = (m_mouse_pos.x() - m_origin.x())*2;
diff --git a/sources/editor/esevent/eseventaddarc.h b/sources/editor/esevent/eseventaddarc.h
index 4418af9d4..382d04016 100644
--- a/sources/editor/esevent/eseventaddarc.h
+++ b/sources/editor/esevent/eseventaddarc.h
@@ -25,9 +25,9 @@ class PartArc;
class QGraphicsSceneMouseEvent;
/**
- * @brief The ESEventAddArc class
- * This ESEvent manage creation of arc in an ElementScene
- */
+ @brief The ESEventAddArc class
+ This ESEvent manage creation of arc in an ElementScene
+*/
class ESEventAddArc : public ESEventInterface
{
public:
diff --git a/sources/editor/esevent/eseventadddynamictextfield.cpp b/sources/editor/esevent/eseventadddynamictextfield.cpp
index b556bf131..9933ce513 100644
--- a/sources/editor/esevent/eseventadddynamictextfield.cpp
+++ b/sources/editor/esevent/eseventadddynamictextfield.cpp
@@ -23,9 +23,9 @@
#include
/**
- * @brief ESEventAddDynamicTextField::ESEventAddDynamicTextField
- * @param scene
- */
+ @brief ESEventAddDynamicTextField::ESEventAddDynamicTextField
+ @param scene
+*/
ESEventAddDynamicTextField::ESEventAddDynamicTextField(ElementScene *scene) :
ESEventInterface(scene)
{
@@ -35,17 +35,17 @@ ESEventAddDynamicTextField::ESEventAddDynamicTextField(ElementScene *scene) :
}
/**
- * @brief ESEventAddDynamicTextField::~ESEventAddDynamicTextField
- */
+ @brief ESEventAddDynamicTextField::~ESEventAddDynamicTextField
+*/
ESEventAddDynamicTextField::~ESEventAddDynamicTextField() {
delete m_text;
}
/**
- * @brief ESEventAddDynamicTextField::mouseMoveEvent
- * @param event
- * @return
- */
+ @brief ESEventAddDynamicTextField::mouseMoveEvent
+ @param event
+ @return
+*/
bool ESEventAddDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
QPointF pos = m_scene->snapToGrid(event->scenePos());
@@ -55,10 +55,10 @@ bool ESEventAddDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief ESEventAddDynamicTextField::mouseReleaseEvent
- * @param event
- * @return
- */
+ @brief ESEventAddDynamicTextField::mouseReleaseEvent
+ @param event
+ @return
+*/
bool ESEventAddDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (event->button() == Qt::LeftButton)
diff --git a/sources/editor/esevent/eseventadddynamictextfield.h b/sources/editor/esevent/eseventadddynamictextfield.h
index 8e322e532..8734f41d8 100644
--- a/sources/editor/esevent/eseventadddynamictextfield.h
+++ b/sources/editor/esevent/eseventadddynamictextfield.h
@@ -25,9 +25,9 @@ class PartDynamicTextField;
class QGraphicsSceneMouseEvent;
/**
- * @brief The ESEventAddDynamicTextField class
- * This ESEvent manage creation of dynamic text field in an ElementScene
- */
+ @brief The ESEventAddDynamicTextField class
+ This ESEvent manage creation of dynamic text field in an ElementScene
+*/
class ESEventAddDynamicTextField : public ESEventInterface
{
public:
diff --git a/sources/editor/esevent/eseventaddellipse.cpp b/sources/editor/esevent/eseventaddellipse.cpp
index 059bed288..4fa910ab0 100644
--- a/sources/editor/esevent/eseventaddellipse.cpp
+++ b/sources/editor/esevent/eseventaddellipse.cpp
@@ -23,17 +23,17 @@
#include "elementscene.h"
/**
- * @brief ESEventAddEllipse::ESEventAddEllipse
- * @param scene
- */
+ @brief ESEventAddEllipse::ESEventAddEllipse
+ @param scene
+*/
ESEventAddEllipse::ESEventAddEllipse(ElementScene *scene) :
ESEventInterface(scene),
m_ellipse(nullptr)
{}
/**
- * @brief ESEventAddEllipse::~ESEventAddEllipse
- */
+ @brief ESEventAddEllipse::~ESEventAddEllipse
+*/
ESEventAddEllipse::~ESEventAddEllipse() {
if (m_running || m_abort){
delete m_ellipse;
@@ -41,10 +41,10 @@ ESEventAddEllipse::~ESEventAddEllipse() {
}
/**
- * @brief ESEventAddEllipse::mousePressEvent
- * @param event
- * @return
- */
+ @brief ESEventAddEllipse::mousePressEvent
+ @param event
+ @return
+*/
bool ESEventAddEllipse::mousePressEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::LeftButton) {
if(!m_running) m_running = true;
@@ -72,10 +72,10 @@ bool ESEventAddEllipse::mousePressEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddRect::mouseMoveEvent
- * @param event
- * @return
- */
+ @brief ESEventAddRect::mouseMoveEvent
+ @param event
+ @return
+*/
bool ESEventAddEllipse::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
updateHelpCross(event -> scenePos());
if (!m_ellipse) return false;
@@ -94,10 +94,10 @@ bool ESEventAddEllipse::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddEllipse::mouseReleaseEvent
- * @param event
- * @return
- */
+ @brief ESEventAddEllipse::mouseReleaseEvent
+ @param event
+ @return
+*/
bool ESEventAddEllipse::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::RightButton) {
if (m_ellipse) {delete m_ellipse; m_ellipse = nullptr;}
diff --git a/sources/editor/esevent/eseventaddellipse.h b/sources/editor/esevent/eseventaddellipse.h
index d9a5a276f..585683652 100644
--- a/sources/editor/esevent/eseventaddellipse.h
+++ b/sources/editor/esevent/eseventaddellipse.h
@@ -26,9 +26,9 @@ class PartEllipse;
class QGraphicsSceneMouseEvent;
/**
- * @brief The ESEventAddEllipse class
- * This ESEvent manage creation of ellpise in an ElementScene
- */
+ @brief The ESEventAddEllipse class
+ This ESEvent manage creation of ellpise in an ElementScene
+*/
class ESEventAddEllipse : public ESEventInterface
{
public:
diff --git a/sources/editor/esevent/eseventaddline.cpp b/sources/editor/esevent/eseventaddline.cpp
index 5dd9d2e63..7c7373775 100644
--- a/sources/editor/esevent/eseventaddline.cpp
+++ b/sources/editor/esevent/eseventaddline.cpp
@@ -25,29 +25,29 @@
#include "editorcommands.h"
/**
- * @brief ESEventAddLine::ESEventAddLine
- * Constructor
- * @param scene : scene where we operate this action
- */
+ @brief ESEventAddLine::ESEventAddLine
+ Constructor
+ @param scene : scene where we operate this action
+*/
ESEventAddLine::ESEventAddLine(ElementScene *scene) :
ESEventInterface (scene),
m_line (nullptr)
{}
/**
- * @brief ESEventAddLine::~ESEventAddLine
- * destructor
- */
+ @brief ESEventAddLine::~ESEventAddLine
+ destructor
+*/
ESEventAddLine::~ESEventAddLine() {
if (m_running || m_abort)
delete m_line;
}
/**
- * @brief ESEventAddLine::mousePressEvent
- * @param event
- * @return
- */
+ @brief ESEventAddLine::mousePressEvent
+ @param event
+ @return
+*/
bool ESEventAddLine::mousePressEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::LeftButton) {
@@ -76,10 +76,10 @@ bool ESEventAddLine::mousePressEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddLine::mouseMoveEvent
- * @param event
- * @return
- */
+ @brief ESEventAddLine::mouseMoveEvent
+ @param event
+ @return
+*/
bool ESEventAddLine::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
updateHelpCross (event -> scenePos());
@@ -92,10 +92,10 @@ bool ESEventAddLine::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief ESEventAddLine::mouseReleaseEvent
- * @param event
- * @return
- */
+ @brief ESEventAddLine::mouseReleaseEvent
+ @param event
+ @return
+*/
bool ESEventAddLine::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::RightButton) {
if (m_line) {delete m_line; m_line = nullptr;}
diff --git a/sources/editor/esevent/eseventaddline.h b/sources/editor/esevent/eseventaddline.h
index f7f122119..00ffe8576 100644
--- a/sources/editor/esevent/eseventaddline.h
+++ b/sources/editor/esevent/eseventaddline.h
@@ -25,9 +25,9 @@ class PartLine;
class QGraphicsSceneMouseEvent;
/**
- * @brief The ESEventAddLine class
- * This ESEvent manage creation of line in a ElementScene
- */
+ @brief The ESEventAddLine class
+ This ESEvent manage creation of line in a ElementScene
+*/
class ESEventAddLine : public ESEventInterface
{
public:
diff --git a/sources/editor/esevent/eseventaddpolygon.cpp b/sources/editor/esevent/eseventaddpolygon.cpp
index 5de96f7a4..07dc78789 100644
--- a/sources/editor/esevent/eseventaddpolygon.cpp
+++ b/sources/editor/esevent/eseventaddpolygon.cpp
@@ -23,27 +23,27 @@
#include "editorcommands.h"
/**
- * @brief ESEventAddPolygon::ESEventAddPolygon
- * @param scene
- */
+ @brief ESEventAddPolygon::ESEventAddPolygon
+ @param scene
+*/
ESEventAddPolygon::ESEventAddPolygon(ElementScene *scene) :
ESEventInterface(scene),
m_polygon(nullptr)
{}
/**
- * @brief ESEventAddPolygon::~ESEventAddPolygon
- */
+ @brief ESEventAddPolygon::~ESEventAddPolygon
+*/
ESEventAddPolygon::~ESEventAddPolygon() {
if (m_running || m_abort)
delete m_polygon;
}
/**
- * @brief ESEventAddPolygon::mousePressEvent
- * @param event
- * @return
- */
+ @brief ESEventAddPolygon::mousePressEvent
+ @param event
+ @return
+*/
bool ESEventAddPolygon::mousePressEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::LeftButton) {
if(!m_running) m_running = true;
@@ -63,10 +63,10 @@ bool ESEventAddPolygon::mousePressEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddPolygon::mouseMoveEvent
- * @param event
- * @return
- */
+ @brief ESEventAddPolygon::mouseMoveEvent
+ @param event
+ @return
+*/
bool ESEventAddPolygon::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
updateHelpCross(event -> scenePos());
if (!m_polygon) return false;
@@ -76,10 +76,10 @@ bool ESEventAddPolygon::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddPolygon::mouseReleaseEvent
- * @param event
- * @return
- */
+ @brief ESEventAddPolygon::mouseReleaseEvent
+ @param event
+ @return
+*/
bool ESEventAddPolygon::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::RightButton) {
if (m_polygon) {
@@ -99,10 +99,10 @@ bool ESEventAddPolygon::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddPolygon::mouseDoubleClickEvent
- * @param event
- * @return
- */
+ @brief ESEventAddPolygon::mouseDoubleClickEvent
+ @param event
+ @return
+*/
bool ESEventAddPolygon::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
{
if (event -> button() == Qt::LeftButton)
diff --git a/sources/editor/esevent/eseventaddpolygon.h b/sources/editor/esevent/eseventaddpolygon.h
index 7b05251e3..b31673acd 100644
--- a/sources/editor/esevent/eseventaddpolygon.h
+++ b/sources/editor/esevent/eseventaddpolygon.h
@@ -25,9 +25,9 @@ class PartPolygon;
class QGraphicsSceneMouseEvent;
/**
- * @brief The ESEventAddPolygon class
- * This ESEvent manage creation of polygon in an ElementScene
- */
+ @brief The ESEventAddPolygon class
+ This ESEvent manage creation of polygon in an ElementScene
+*/
class ESEventAddPolygon : public ESEventInterface
{
public:
diff --git a/sources/editor/esevent/eseventaddrect.cpp b/sources/editor/esevent/eseventaddrect.cpp
index 2ac973a85..0e3386701 100644
--- a/sources/editor/esevent/eseventaddrect.cpp
+++ b/sources/editor/esevent/eseventaddrect.cpp
@@ -23,27 +23,27 @@
#include "editorcommands.h"
/**
- * @brief ESEventAddRect::ESEventAddRect
- * @param scene
- */
+ @brief ESEventAddRect::ESEventAddRect
+ @param scene
+*/
ESEventAddRect::ESEventAddRect(ElementScene *scene) :
ESEventInterface(scene),
m_rect(nullptr)
{}
/**
- * @brief ESEventAddRect::~ESEventAddRect
- */
+ @brief ESEventAddRect::~ESEventAddRect
+*/
ESEventAddRect::~ESEventAddRect() {
if (m_running || m_abort)
delete m_rect;
}
/**
- * @brief ESEventAddRect::mousePressEvent
- * @param event
- * @return
- */
+ @brief ESEventAddRect::mousePressEvent
+ @param event
+ @return
+*/
bool ESEventAddRect::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
if (event -> button() == Qt::LeftButton)
@@ -75,10 +75,10 @@ bool ESEventAddRect::mousePressEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief ESEventAddRect::mouseMoveEvent
- * @param event
- * @return
- */
+ @brief ESEventAddRect::mouseMoveEvent
+ @param event
+ @return
+*/
bool ESEventAddRect::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
updateHelpCross(event -> scenePos());
if (!m_rect) return false;
@@ -89,10 +89,10 @@ bool ESEventAddRect::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddRect::mouseReleaseEvent
- * @param event
- * @return
- */
+ @brief ESEventAddRect::mouseReleaseEvent
+ @param event
+ @return
+*/
bool ESEventAddRect::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::RightButton) {
if (m_rect) {delete m_rect; m_rect = nullptr;}
diff --git a/sources/editor/esevent/eseventaddterminal.cpp b/sources/editor/esevent/eseventaddterminal.cpp
index 55efe3ae4..beac60416 100644
--- a/sources/editor/esevent/eseventaddterminal.cpp
+++ b/sources/editor/esevent/eseventaddterminal.cpp
@@ -23,9 +23,9 @@
#include "eseventaddterminal.h"
/**
- * @brief ESEventAddTerminal::ESEventAddTerminal
- * @param scene
- */
+ @brief ESEventAddTerminal::ESEventAddTerminal
+ @param scene
+*/
ESEventAddTerminal::ESEventAddTerminal(ElementScene *scene) :
ESEventInterface(scene)
{
@@ -35,17 +35,17 @@ ESEventAddTerminal::ESEventAddTerminal(ElementScene *scene) :
}
/**
- * @brief ESEventAddTerminal::~ESEventAddTerminal
- */
+ @brief ESEventAddTerminal::~ESEventAddTerminal
+*/
ESEventAddTerminal::~ESEventAddTerminal() {
delete m_terminal;
}
/**
- * @brief ESEventAddTerminal::mouseMoveEvent
- * @param event
- * @return
- */
+ @brief ESEventAddTerminal::mouseMoveEvent
+ @param event
+ @return
+*/
bool ESEventAddTerminal::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
QPointF pos = m_scene -> snapToGrid(event -> scenePos());
updateHelpCross(pos);
@@ -54,10 +54,10 @@ bool ESEventAddTerminal::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddTerminal::mouseReleaseEvent
- * @param event
- * @return
- */
+ @brief ESEventAddTerminal::mouseReleaseEvent
+ @param event
+ @return
+*/
bool ESEventAddTerminal::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
if (event -> button() == Qt::LeftButton) {
m_scene -> undoStack().push(new AddPartCommand(QObject::tr("Borne"), m_scene, m_terminal));
@@ -80,10 +80,10 @@ bool ESEventAddTerminal::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddTerminal::keyPressEvent
- * @param event
- * @return
- */
+ @brief ESEventAddTerminal::keyPressEvent
+ @param event
+ @return
+*/
bool ESEventAddTerminal::keyPressEvent(QKeyEvent *event) {
if (event -> key() == Qt::Key_Space) {
switch (m_terminal->orientation()) {
diff --git a/sources/editor/esevent/eseventaddterminal.h b/sources/editor/esevent/eseventaddterminal.h
index c3af503ea..edb856181 100644
--- a/sources/editor/esevent/eseventaddterminal.h
+++ b/sources/editor/esevent/eseventaddterminal.h
@@ -25,9 +25,9 @@ class PartTerminal;
class QGraphicsSceneMouseEvent;
/**
- * @brief The ESEventAddTerminal class
- * This ESEvent manage creation of terminal in an ElementScene
- */
+ @brief The ESEventAddTerminal class
+ This ESEvent manage creation of terminal in an ElementScene
+*/
class ESEventAddTerminal : public ESEventInterface
{
public:
diff --git a/sources/editor/esevent/eseventaddtext.cpp b/sources/editor/esevent/eseventaddtext.cpp
index e8a1e6588..041747a1f 100644
--- a/sources/editor/esevent/eseventaddtext.cpp
+++ b/sources/editor/esevent/eseventaddtext.cpp
@@ -23,9 +23,9 @@
#include "elementscene.h"
/**
- * @brief ESEventAddText::ESEventAddText
- * @param scene
- */
+ @brief ESEventAddText::ESEventAddText
+ @param scene
+*/
ESEventAddText::ESEventAddText(ElementScene *scene) :
ESEventInterface(scene)
{
@@ -35,17 +35,17 @@ ESEventAddText::ESEventAddText(ElementScene *scene) :
}
/**
- * @brief ESEventAddText::~ESEventAddText
- */
+ @brief ESEventAddText::~ESEventAddText
+*/
ESEventAddText::~ESEventAddText() {
delete m_text;
}
/**
- * @brief ESEventAddText::mouseMoveEvent
- * @param event
- * @return
- */
+ @brief ESEventAddText::mouseMoveEvent
+ @param event
+ @return
+*/
bool ESEventAddText::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
QPointF pos = m_scene -> snapToGrid(event -> scenePos());
updateHelpCross(pos);
@@ -54,10 +54,10 @@ bool ESEventAddText::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief ESEventAddText::mouseReleaseEvent
- * @param event
- * @return
- */
+ @brief ESEventAddText::mouseReleaseEvent
+ @param event
+ @return
+*/
bool ESEventAddText::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
if (event->button() == Qt::LeftButton) {
m_scene -> undoStack().push(new AddPartCommand(QObject::tr("Texte"), m_scene, m_text));
diff --git a/sources/editor/esevent/eseventaddtext.h b/sources/editor/esevent/eseventaddtext.h
index 4a587693b..2c00423b8 100644
--- a/sources/editor/esevent/eseventaddtext.h
+++ b/sources/editor/esevent/eseventaddtext.h
@@ -25,9 +25,9 @@ class PartText;
class QGraphicsSceneMouseEvent;
/**
- * @brief The ESEventAddText class
- * This ESEvent manage creation of text in an ElementScene
- */
+ @brief The ESEventAddText class
+ This ESEvent manage creation of text in an ElementScene
+*/
class ESEventAddText : public ESEventInterface
{
public:
diff --git a/sources/editor/esevent/eseventinterface.cpp b/sources/editor/esevent/eseventinterface.cpp
index 1a65330d8..d44fa0811 100644
--- a/sources/editor/esevent/eseventinterface.cpp
+++ b/sources/editor/esevent/eseventinterface.cpp
@@ -32,9 +32,9 @@ ESEventInterface::ESEventInterface(ElementScene *scene) :
}
/**
- * @brief ESEventInterface::init
- * Init this event interface
- */
+ @brief ESEventInterface::init
+ Init this event interface
+*/
void ESEventInterface::init()
{
m_scene->setBehavior(ElementScene::Behavior::AddPart);
@@ -42,9 +42,9 @@ void ESEventInterface::init()
}
/**
- * @brief ESEventInterface::~ESEventInterface
- * Destructor
- */
+ @brief ESEventInterface::~ESEventInterface
+ Destructor
+*/
ESEventInterface::~ESEventInterface()
{
delete m_help_horiz;
@@ -80,11 +80,11 @@ bool ESEventInterface::wheelEvent(QGraphicsSceneWheelEvent *event) {
}
/**
- * @brief ESEventInterface::keyPressEvent
- * By default, press escape key abort the curent action
- * @param event
- * @return
- */
+ @brief ESEventInterface::keyPressEvent
+ By default, press escape key abort the curent action
+ @param event
+ @return
+*/
bool ESEventInterface::keyPressEvent(QKeyEvent *event) {
if (event->key() == Qt::Key_Escape) {
m_running = false;
diff --git a/sources/editor/graphicspart/abstractpartellipse.cpp b/sources/editor/graphicspart/abstractpartellipse.cpp
index 2efbad722..32a1920fd 100644
--- a/sources/editor/graphicspart/abstractpartellipse.cpp
+++ b/sources/editor/graphicspart/abstractpartellipse.cpp
@@ -18,11 +18,11 @@
#include "abstractpartellipse.h"
/**
- * @brief AbstractPartEllipse::AbstractPartEllipse
- * Constructor
- * @param editor : QETElementEditor of this part
- * @param parent : parent item
- */
+ @brief AbstractPartEllipse::AbstractPartEllipse
+ Constructor
+ @param editor : QETElementEditor of this part
+ @param parent : parent item
+*/
AbstractPartEllipse::AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem *parent) :
CustomElementGraphicPart(editor, parent),
m_rect (QRectF(0, 0, 0, 0)),
@@ -31,17 +31,17 @@ AbstractPartEllipse::AbstractPartEllipse(QETElementEditor *editor, QGraphicsItem
{}
/**
- * @brief AbstractPartEllipse::~AbstractPartEllipse
- * Destructor
- */
+ @brief AbstractPartEllipse::~AbstractPartEllipse
+ Destructor
+*/
AbstractPartEllipse::~AbstractPartEllipse() {}
/**
- * @brief AbstractPartEllipse::startUserTransformation
- * Start the user-induced transformation, provided this primitive is contained
- * within the initial_selection_rect bounding rectangle.
- * @param initial_selection_rect
- */
+ @brief AbstractPartEllipse::startUserTransformation
+ Start the user-induced transformation, provided this primitive is contained
+ within the initial_selection_rect bounding rectangle.
+ @param initial_selection_rect
+*/
void AbstractPartEllipse::startUserTransformation(const QRectF &initial_selection_rect)
{
Q_UNUSED(initial_selection_rect)
@@ -51,11 +51,11 @@ void AbstractPartEllipse::startUserTransformation(const QRectF &initial_selectio
}
/**
- * @brief AbstractPartEllipse::handleUserTransformation
- * Handle the user-induced transformation from \a initial_selection_rect to \a new_selection_rect
- * @param initial_selection_rect
- * @param new_selection_rect
- */
+ @brief AbstractPartEllipse::handleUserTransformation
+ Handle the user-induced transformation from \a initial_selection_rect to \a new_selection_rect
+ @param initial_selection_rect
+ @param new_selection_rect
+*/
void AbstractPartEllipse::handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect)
{
QList mapped_points = mapPoints(initial_selection_rect, new_selection_rect, saved_points_);
@@ -63,10 +63,10 @@ void AbstractPartEllipse::handleUserTransformation(const QRectF &initial_selecti
}
/**
- * @brief AbstractPartEllipse::boundingRect
- * Bounding rectangle this part can fit into
- * @return
- */
+ @brief AbstractPartEllipse::boundingRect
+ Bounding rectangle this part can fit into
+ @return
+*/
QRectF AbstractPartEllipse::boundingRect() const
{
qreal adjust = (SHADOWS_HEIGHT + penWeight()) / 2;
@@ -79,40 +79,43 @@ QRectF AbstractPartEllipse::boundingRect() const
}
/**
- * @brief AbstractPartEllipse::sceneGeometricRect
- * @return the minimum, margin-less rectangle this part can fit into in scene coordinates.
- * It is different from boundingRect() because it is not supposed
- * to imply any margin, and it is different from shape because it is a regular
- * rectangle, not a complex shape.
- */
+ @brief AbstractPartEllipse::sceneGeometricRect
+ @return the minimum,
+ margin-less rectangle this part can fit into in scene coordinates.
+ It is different from boundingRect() because it is not supposed
+ to imply any margin,
+ and it is different from shape because it is a regular
+ rectangle, not a complex shape.
+*/
QRectF AbstractPartEllipse::sceneGeometricRect() const {
return(mapToScene(rect()).boundingRect());
}
/**
- * @brief AbstractPartEllipse::sceneTopLeft
- * @return return the top left of rectangle, in scene coordinate
- */
+ @brief AbstractPartEllipse::sceneTopLeft
+ @return return the top left of rectangle, in scene coordinate
+*/
QPointF AbstractPartEllipse::sceneTopLeft() const {
return(mapToScene(rect().topLeft()));
}
/**
- * @brief AbstractPartEllipse::rect
- * Returns the item's ellipse geometry as a QRectF.
- */
+ @brief AbstractPartEllipse::rect
+ Returns the item's ellipse geometry as a QRectF.
+*/
QRectF AbstractPartEllipse::rect() const {
return m_rect;
}
/**
- * @brief AbstractPartEllipse::setRect
- * Sets the item's ellipse geometry to rect.
- * The rectangle's left edge defines the left edge of the ellipse,
- * and the rectangle's top edge describes the top of the ellipse
- * The height and width of the rectangle describe the height and width of the ellipse.
- * @param rect
- */
+ @brief AbstractPartEllipse::setRect
+ Sets the item's ellipse geometry to rect.
+ The rectangle's left edge defines the left edge of the ellipse,
+ and the rectangle's top edge describes the top of the ellipse
+ The height and width of the rectangle
+ describe the height and width of the ellipse.
+ @param rect
+*/
void AbstractPartEllipse::setRect(const QRectF &rect)
{
if (rect == m_rect) return;
@@ -123,21 +126,24 @@ void AbstractPartEllipse::setRect(const QRectF &rect)
}
/**
- * @brief AbstractPartEllipse::isUseless
- * @return true if this part is irrelevant and does not deserve to be Retained / registered.
- * An ellipse is relevant when is rect is not null.
- */
+ @brief AbstractPartEllipse::isUseless
+ @return true if this part is irrelevant
+ and does not deserve to be Retained / registered.
+ An ellipse is relevant when is rect is not null.
+*/
bool AbstractPartEllipse::isUseless() const {
return(rect().isNull());
}
/**
- * @brief AbstractPartEllipse::setStartAngle
- * Sets the start angle for an ellipse segment to angle, which is in 16ths of a degree.
- * This angle is used together with spanAngle() for representing an ellipse segment (a pie).
- * By default, the start angle is 0.
- * @param start_angle
- */
+ @brief AbstractPartEllipse::setStartAngle
+ Sets the start angle for an ellipse segment to angle,
+ which is in 16ths of a degree.
+ This angle is used together with spanAngle()
+ for representing an ellipse segment (a pie).
+ By default, the start angle is 0.
+ @param start_angle
+*/
void AbstractPartEllipse::setStartAngle(const int &start_angle)
{
if (m_start_angle == start_angle) return;
@@ -147,12 +153,13 @@ void AbstractPartEllipse::setStartAngle(const int &start_angle)
}
/**
- * @brief AbstractPartEllipse::setSpanAngle
- * Returns the span angle of an ellipse segment in 16ths of a degree.
- * This angle is used together with startAngle() for representing an ellipse segment (a pie).
- * By default, this function returns 5760 (360 * 16, a full ellipse).
- * @param span_angle
- */
+ @brief AbstractPartEllipse::setSpanAngle
+ Returns the span angle of an ellipse segment in 16ths of a degree.
+ This angle is used together with startAngle()
+ for representing an ellipse segment (a pie).
+ By default, this function returns 5760 (360 * 16, a full ellipse).
+ @param span_angle
+*/
void AbstractPartEllipse::setSpanAngle(const int &span_angle)
{
if (m_span_angle == span_angle) return;
diff --git a/sources/editor/graphicspart/abstractpartellipse.h b/sources/editor/graphicspart/abstractpartellipse.h
index 3503cd8b3..c4dd5b136 100644
--- a/sources/editor/graphicspart/abstractpartellipse.h
+++ b/sources/editor/graphicspart/abstractpartellipse.h
@@ -23,15 +23,19 @@
class QetGraphicsHandlerItem;
/**
- * @brief The AbstractPartEllipse class
- * This is the base class for all ellipse based item like ellipse, circle, arc.
- * This class only provide common method for edit the ellipse like rect that contain the ellipse.
- * All coordinates is in item coordinate, except pos(), center(), centerX() and centerY()
- * which are in parent coordinate (or scene if no parent).
- *
- * In several points, this class is a copy of QGraphicsEllipseItem with some change,
- * (the use of Q_PROPERTY) to be easily used with Element editor.
- */
+ @brief The AbstractPartEllipse class
+ This is the base class for all ellipse based item like ellipse,
+ circle, arc.
+ This class only provide common method for edit the ellipse
+ like rect that contain the ellipse.
+ All coordinates is in item coordinate, except pos(),
+ center(), centerX() and centerY()
+ which are in parent coordinate (or scene if no parent).
+
+ In several points,
+ this class is a copy of QGraphicsEllipseItem with some change,
+ (the use of Q_PROPERTY) to be easily used with Element editor.
+*/
class AbstractPartEllipse : public CustomElementGraphicPart
{
Q_OBJECT
diff --git a/sources/editor/graphicspart/customelementgraphicpart.cpp b/sources/editor/graphicspart/customelementgraphicpart.cpp
index d01114d8c..193a7bd5b 100644
--- a/sources/editor/graphicspart/customelementgraphicpart.cpp
+++ b/sources/editor/graphicspart/customelementgraphicpart.cpp
@@ -20,12 +20,12 @@
#include "QPropertyUndoCommand/qpropertyundocommand.h"
/**
- * @brief CustomElementGraphicPart::CustomElementGraphicPart
- * Default constructor.
- * By default, item is selectable, send geometry change (Qt > 4.6),
- * accept mouse left button and accept hover event
- * @param editor QETElement editor that belong this.
- */
+ @brief CustomElementGraphicPart::CustomElementGraphicPart
+ Default constructor.
+ By default, item is selectable, send geometry change (Qt > 4.6),
+ accept mouse left button and accept hover event
+ @param editor QETElement editor that belong this.
+*/
CustomElementGraphicPart::CustomElementGraphicPart(QETElementEditor *editor, QGraphicsItem *parent) :
QGraphicsObject (parent),
CustomElementPart(editor),
@@ -41,18 +41,18 @@ CustomElementGraphicPart::CustomElementGraphicPart(QETElementEditor *editor, QGr
}
/**
- * @brief CustomElementGraphicPart::~CustomElementGraphicPart
- * Destructor
- */
+ @brief CustomElementGraphicPart::~CustomElementGraphicPart
+ Destructor
+*/
CustomElementGraphicPart::~CustomElementGraphicPart() {}
/**
- * @brief CustomElementGraphicPart::drawCross
- * Draw a cross at pos center
- * @param center : center of cross
- * @param painter : painter to use for draw cross,
- * the painter state is restored at end of this method.
- */
+ @brief CustomElementGraphicPart::drawCross
+ Draw a cross at pos center
+ @param center : center of cross
+ @param painter : painter to use for draw cross,
+ the painter state is restored at end of this method.
+*/
void CustomElementGraphicPart::drawCross(const QPointF ¢er, QPainter *painter)
{
painter -> save();
@@ -64,10 +64,10 @@ void CustomElementGraphicPart::drawCross(const QPointF ¢er, QPainter *painte
}
/**
- * @brief CustomElementGraphicPart::setLineStyle
- * Set line style to ls
- * @param ls
- */
+ @brief CustomElementGraphicPart::setLineStyle
+ Set line style to ls
+ @param ls
+*/
void CustomElementGraphicPart::setLineStyle(const LineStyle ls)
{
if (_linestyle == ls) return;
@@ -76,10 +76,10 @@ void CustomElementGraphicPart::setLineStyle(const LineStyle ls)
}
/**
- * @brief CustomElementGraphicPart::setLineWeight
- * Set line weight to lw
- * @param lw
- */
+ @brief CustomElementGraphicPart::setLineWeight
+ Set line weight to lw
+ @param lw
+*/
void CustomElementGraphicPart::setLineWeight(const LineWeight lw)
{
if (_lineweight == lw) return;
@@ -88,9 +88,9 @@ void CustomElementGraphicPart::setLineWeight(const LineWeight lw)
}
/**
- * @brief CustomElementGraphicPart::penWeight
- * @return the weight of pen
- */
+ @brief CustomElementGraphicPart::penWeight
+ @return the weight of pen
+*/
qreal CustomElementGraphicPart::penWeight() const
{
if (_lineweight == NoneWeight || _lineweight == ThinWeight) return 0;
@@ -101,10 +101,10 @@ qreal CustomElementGraphicPart::penWeight() const
}
/**
- * @brief CustomElementGraphicPart::setFilling
- * Set filling to f
- * @param f
- */
+ @brief CustomElementGraphicPart::setFilling
+ Set filling to f
+ @param f
+*/
void CustomElementGraphicPart::setFilling(const Filling f)
{
if (_filling == f) return;
@@ -113,10 +113,10 @@ void CustomElementGraphicPart::setFilling(const Filling f)
}
/**
- * @brief CustomElementGraphicPart::setColor
- * Set color to c
- * @param c
- */
+ @brief CustomElementGraphicPart::setColor
+ Set color to c
+ @param c
+*/
void CustomElementGraphicPart::setColor(const Color c)
{
if (_color == c) return;
@@ -125,10 +125,10 @@ void CustomElementGraphicPart::setColor(const Color c)
}
/**
- * @brief CustomElementGraphicPart::setAntialiased
- * Set antialias to b
- * @param b
- */
+ @brief CustomElementGraphicPart::setAntialiased
+ Set antialias to b
+ @param b
+*/
void CustomElementGraphicPart::setAntialiased(const bool b)
{
if (_antialiased == b) return;
@@ -137,13 +137,13 @@ void CustomElementGraphicPart::setAntialiased(const bool b)
}
/**
- * @brief CustomElementGraphicPart::stylesToXml
- * Write the curent style to xml element.
- * The style are stored like this:
- * name-of-style:value;name-of-style:value
- * Each style separate by ; and name-style/value are separate by :
- * @param qde : QDOmElement used to write the style.
- */
+ @brief CustomElementGraphicPart::stylesToXml
+ Write the curent style to xml element.
+ The style are stored like this:
+ name-of-style:value;name-of-style:value
+ Each style separate by ; and name-style/value are separate by :
+ @param qde : QDOmElement used to write the style.
+*/
void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const
{
QString css_like_styles;
@@ -486,10 +486,10 @@ void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const
/**
- * @brief CustomElementGraphicPart::stylesFromXml
- * Read the style used by this, from a xml element.
- * @param qde : QDomElement used to read the style
- */
+ @brief CustomElementGraphicPart::stylesFromXml
+ Read the style used by this, from a xml element.
+ @param qde : QDomElement used to read the style
+*/
void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
{
resetStyles();
@@ -849,10 +849,10 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
/**
- * @brief CustomElementGraphicPart::resetStyles
- * Reset the curent style to default,
- * same style of default constructor
- */
+ @brief CustomElementGraphicPart::resetStyles
+ Reset the curent style to default,
+ same style of default constructor
+*/
void CustomElementGraphicPart::resetStyles()
{
_linestyle = NormalStyle;
@@ -863,10 +863,10 @@ void CustomElementGraphicPart::resetStyles()
}
/**
- * @brief CustomElementGraphicPart::applyStylesToQPainter
- * Apply the current style to the QPainter
- * @param painter
- */
+ @brief CustomElementGraphicPart::applyStylesToQPainter
+ Apply the current style to the QPainter
+ @param painter
+*/
void CustomElementGraphicPart::applyStylesToQPainter(QPainter &painter) const
{
//Get the pen and brush
@@ -1216,12 +1216,12 @@ void CustomElementGraphicPart::applyStylesToQPainter(QPainter &painter) const
}
/**
- * @brief CustomElementGraphicPart::drawShadowShape
- * Draw a transparent blue shadow arround the shape of this item.
- * The QPainterPathStroker used to draw shadows have a width of SHADOWS_HEIGHT
- * Be carefull if penWeight of this item is to 0 the outline of strock is bigger of 0.5
- * @param painter : painter to use for draw this shadows
- */
+ @brief CustomElementGraphicPart::drawShadowShape
+ Draw a transparent blue shadow arround the shape of this item.
+ The QPainterPathStroker used to draw shadows have a width of SHADOWS_HEIGHT
+ Be carefull if penWeight of this item is to 0 the outline of strock is bigger of 0.5
+ @param painter : painter to use for draw this shadows
+*/
void CustomElementGraphicPart::drawShadowShape(QPainter *painter)
{
//@FIXME if pen weight is 0, the strock outline is SHADOWS_HEIGHT/2 + 0.5
@@ -1240,14 +1240,14 @@ void CustomElementGraphicPart::drawShadowShape(QPainter *painter)
}
/**
- * @brief CustomElementGraphicPart::itemChange
- * Reimplemented from QGraphicsObject.
- * If the item position change call updateCurrentPartEditor()
- * the change is always send to QGraphicsObject
- * @param change
- * @param value
- * @return the returned value of QGraphicsObject::itemChange
- */
+ @brief CustomElementGraphicPart::itemChange
+ Reimplemented from QGraphicsObject.
+ If the item position change call updateCurrentPartEditor()
+ the change is always send to QGraphicsObject
+ @param change
+ @param value
+ @return the returned value of QGraphicsObject::itemChange
+*/
QVariant CustomElementGraphicPart::itemChange(GraphicsItemChange change, const QVariant &value)
{
if (scene())
@@ -1258,11 +1258,11 @@ QVariant CustomElementGraphicPart::itemChange(GraphicsItemChange change, const Q
}
/**
- * @brief CustomElementGraphicPart::hoverEnterEvent
- * Reimplemented from QGraphicsObject.
- * Set m_hovered to true
- * @param event
- */
+ @brief CustomElementGraphicPart::hoverEnterEvent
+ Reimplemented from QGraphicsObject.
+ Set m_hovered to true
+ @param event
+*/
void CustomElementGraphicPart::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
m_hovered = true;
@@ -1270,11 +1270,11 @@ void CustomElementGraphicPart::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
}
/**
- * @brief CustomElementGraphicPart::hoverLeaveEvent
- * Reimplemented from QGraphicsObject.
- * Set m_hovered to false
- * @param event
- */
+ @brief CustomElementGraphicPart::hoverLeaveEvent
+ Reimplemented from QGraphicsObject.
+ Set m_hovered to false
+ @param event
+*/
void CustomElementGraphicPart::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
{
m_hovered = false;
diff --git a/sources/editor/graphicspart/customelementgraphicpart.h b/sources/editor/graphicspart/customelementgraphicpart.h
index 341c245c2..3d683504b 100644
--- a/sources/editor/graphicspart/customelementgraphicpart.h
+++ b/sources/editor/graphicspart/customelementgraphicpart.h
@@ -26,10 +26,12 @@ class QPainter;
/**
- * @brief The CustomElementGraphicPart class
- * This class is the base for all home-made primitive like line, rectangle, ellipse etc....
- * It provides methods and enums to manage style attributes available for primitive (color, pen style, etc...)
- */
+ @brief The CustomElementGraphicPart class
+ This class is the base for all home-made primitive like line,
+ rectangle, ellipse etc....
+ It provides methods and enums to manage style attributes available
+ for primitive (color, pen style, etc...)
+*/
class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPart
{
#define SHADOWS_HEIGHT 4.0
@@ -91,8 +93,8 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
QVariant property (const char *name) const override {return QObject::property(name);}
virtual QPainterPath shadowShape ()const = 0;
- virtual void setHandlerColor(QPointF /*pos*/, const QColor &/*color*/) {}
- virtual void resetAllHandlerColor() {}
+ virtual void setHandlerColor(QPointF /*pos*/, const QColor &/*color*/) {}
+ virtual void resetAllHandlerColor() {}
protected:
void stylesToXml (QDomElement &) const;
@@ -117,7 +119,7 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
Filling _filling ;
Color _color;
bool _antialiased;
- QPointF m_origin_pos;
+ QPointF m_origin_pos;
};
typedef CustomElementGraphicPart CEGP;
diff --git a/sources/editor/graphicspart/partarc.cpp b/sources/editor/graphicspart/partarc.cpp
index a42bff805..344f6a8e0 100644
--- a/sources/editor/graphicspart/partarc.cpp
+++ b/sources/editor/graphicspart/partarc.cpp
@@ -23,11 +23,11 @@
/**
- * @brief PartArc::PartArc
- * Constructor
- * @param editor : QETElementEditor of this part
- * @param parent : parent item
- */
+ @brief PartArc::PartArc
+ Constructor
+ @param editor : QETElementEditor of this part
+ @param parent : parent item
+*/
PartArc::PartArc(QETElementEditor *editor, QGraphicsItem *parent) :
AbstractPartEllipse(editor, parent)
{
@@ -36,9 +36,9 @@ PartArc::PartArc(QETElementEditor *editor, QGraphicsItem *parent) :
}
/**
- * @brief PartArc::~PartArc
- * Destructor
- */
+ @brief PartArc::~PartArc
+ Destructor
+*/
PartArc::~PartArc()
{
if(m_undo_command) delete m_undo_command;
@@ -46,12 +46,12 @@ PartArc::~PartArc()
}
/**
- * @brief PartArc::paint
- * Draw this arc
- * @param painter
- * @param options
- * @param widget
- */
+ @brief PartArc::paint
+ Draw this arc
+ @param painter
+ @param options
+ @param widget
+*/
void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *widget)
{
Q_UNUSED(widget);
@@ -90,11 +90,11 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
}
/**
- * @brief PartArc::toXml
- * Export this arc in xml
- * @param xml_document : Xml document to use for create the xml element.
- * @return : an xml element that describe this arc
- */
+ @brief PartArc::toXml
+ Export this arc in xml
+ @param xml_document : Xml document to use for create the xml element.
+ @return : an xml element that describe this arc
+*/
const QDomElement PartArc::toXml(QDomDocument &xml_document) const {
QDomElement xml_element = xml_document.createElement("arc");
QPointF top_left(sceneTopLeft());
@@ -110,10 +110,10 @@ const QDomElement PartArc::toXml(QDomDocument &xml_document) const {
}
/**
- * @brief PartArc::fromXml
- * Import the properties of this arc from a xml element.
- * @param qde : Xml document to use.
- */
+ @brief PartArc::fromXml
+ Import the properties of this arc from a xml element.
+ @param qde : Xml document to use.
+*/
void PartArc::fromXml(const QDomElement &qde) {
stylesFromXml(qde);
m_rect = QRectF(mapFromScene(qde.attribute("x", "0").toDouble(),
@@ -126,9 +126,9 @@ void PartArc::fromXml(const QDomElement &qde) {
}
/**
- * @brief PartArc::shape
- * @return the shape of this item
- */
+ @brief PartArc::shape
+ @return the shape of this item
+*/
QPainterPath PartArc::shape() const
{
QPainterPath shape;
@@ -155,10 +155,10 @@ QPainterPath PartArc::shadowShape() const
}
/**
- * @brief PartArc::mouseReleaseEvent
- * Handle mouse release event
- * @param event
- */
+ @brief PartArc::mouseReleaseEvent
+ Handle mouse release event
+ @param event
+*/
void PartArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (event->button() == Qt::LeftButton && event->buttonDownPos(Qt::LeftButton) == event->pos())
@@ -168,11 +168,11 @@ void PartArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief PartArc::itemChange
- * @param change
- * @param value
- * @return
- */
+ @brief PartArc::itemChange
+ @param change
+ @param value
+ @return
+*/
QVariant PartArc::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
{
if (change == ItemSelectedHasChanged && scene())
@@ -208,11 +208,11 @@ QVariant PartArc::itemChange(QGraphicsItem::GraphicsItemChange change, const QVa
}
/**
- * @brief PartArc::sceneEventFilter
- * @param watched
- * @param event
- * @return
- */
+ @brief PartArc::sceneEventFilter
+ @param watched
+ @param event
+ @return
+*/
bool PartArc::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
{
//Watched must be an handler
@@ -248,8 +248,8 @@ bool PartArc::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
}
/**
- * @brief PartArc::switchResizeMode
- */
+ @brief PartArc::switchResizeMode
+*/
void PartArc::switchResizeMode()
{
if (m_resize_mode == 1)
@@ -283,8 +283,8 @@ void PartArc::switchResizeMode()
}
/**
- * @brief PartArc::adjusteHandlerPos
- */
+ @brief PartArc::adjusteHandlerPos
+*/
void PartArc::adjusteHandlerPos()
{
if (m_handler_vector.isEmpty())
@@ -307,10 +307,10 @@ void PartArc::adjusteHandlerPos()
}
/**
- * @brief PartArc::handlerMousePressEvent
- * @param qghi
- * @param event
- */
+ @brief PartArc::handlerMousePressEvent
+ @param qghi
+ @param event
+*/
void PartArc::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -346,10 +346,10 @@ void PartArc::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphicsScen
}
/**
- * @brief PartArc::handlerMouseMoveEvent
- * @param qghi
- * @param event
- */
+ @brief PartArc::handlerMouseMoveEvent
+ @param qghi
+ @param event
+*/
void PartArc::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -380,10 +380,10 @@ void PartArc::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsScene
}
/**
- * @brief PartArc::handlerMouseReleaseEvent
- * @param qghi
- * @param event
- */
+ @brief PartArc::handlerMouseReleaseEvent
+ @param qghi
+ @param event
+*/
void PartArc::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -421,9 +421,9 @@ void PartArc::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphicsSc
}
/**
- * @brief PartArc::sceneSelectionChanged
- * When the scene selection change, if there are several primitive selected, we remove the handler of this item
- */
+ @brief PartArc::sceneSelectionChanged
+ When the scene selection change, if there are several primitive selected, we remove the handler of this item
+*/
void PartArc::sceneSelectionChanged()
{
if (this->isSelected() && scene()->selectedItems().size() == 1)
@@ -433,9 +433,9 @@ void PartArc::sceneSelectionChanged()
}
/**
- * @brief PartArc::addHandler
- * Add handlers for this item
- */
+ @brief PartArc::addHandler
+ Add handlers for this item
+*/
void PartArc::addHandler()
{
if (m_handler_vector.isEmpty() && scene())
@@ -464,9 +464,9 @@ void PartArc::addHandler()
}
/**
- * @brief PartArc::removeHandler
- * Remove the handlers of this item
- */
+ @brief PartArc::removeHandler
+ Remove the handlers of this item
+*/
void PartArc::removeHandler()
{
if (!m_handler_vector.isEmpty())
diff --git a/sources/editor/graphicspart/partarc.h b/sources/editor/graphicspart/partarc.h
index b0c8a8816..29a3c93e0 100644
--- a/sources/editor/graphicspart/partarc.h
+++ b/sources/editor/graphicspart/partarc.h
@@ -24,10 +24,10 @@ class QPropertyUndoCommand;
class QetGraphicsHandlerItem;
/**
- * @brief The PartArc class
- * This class represents an elliptical arc primitive which may be used to
- * compose the drawing of an electrical element within the element editor.
- */
+ @brief The PartArc class
+ This class represents an elliptical arc primitive which may be used to
+ compose the drawing of an electrical element within the element editor.
+*/
class PartArc : public AbstractPartEllipse
{
Q_OBJECT
@@ -42,9 +42,9 @@ class PartArc : public AbstractPartEllipse
public:
enum { Type = UserType + 1101 };
/**
- * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartArc.
- * @return the QGraphicsItem type
- */
+ Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartArc.
+ @return the QGraphicsItem type
+ */
int type() const override { return Type; }
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
diff --git a/sources/editor/graphicspart/partdynamictextfield.cpp b/sources/editor/graphicspart/partdynamictextfield.cpp
index ee005048a..285cddbbe 100644
--- a/sources/editor/graphicspart/partdynamictextfield.cpp
+++ b/sources/editor/graphicspart/partdynamictextfield.cpp
@@ -58,22 +58,24 @@ QString PartDynamicTextField::xmlName() const {
}
/**
- * @brief PartDynamicTextField::startUserTransformation
- * @param initial_selection_rect
- * Start the user-induced transformation, provided this primitive is contained
- * within the initial_selection_rect bounding rectangle.
- */
+ @brief PartDynamicTextField::startUserTransformation
+ @param initial_selection_rect
+ Start the user-induced transformation,
+ provided this primitive is contained
+ within the initial_selection_rect bounding rectangle.
+*/
void PartDynamicTextField::startUserTransformation(const QRectF &initial_selection_rect) {
Q_UNUSED(initial_selection_rect)
m_saved_point = pos(); // scene coordinates, no need to mapFromScene()
}
/**
- * @brief PartDynamicTextField::handleUserTransformation
- * @param initial_selection_rect
- * @param new_selection_rect
- * Handle the user-induced transformation from initial_selection_rect to new_selection_rect
- */
+ @brief PartDynamicTextField::handleUserTransformation
+ @param initial_selection_rect
+ @param new_selection_rect
+ Handle the user-induced transformation
+ from initial_selection_rect to new_selection_rect
+*/
void PartDynamicTextField::handleUserTransformation(
const QRectF &initial_selection_rect,
const QRectF &new_selection_rect)
@@ -84,10 +86,10 @@ void PartDynamicTextField::handleUserTransformation(
}
/**
- * @brief PartDynamicTextField::toXml
- * @param document
- * @return
- */
+ @brief PartDynamicTextField::toXml
+ @param document
+ @return
+*/
const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const {
QDomElement root_element = dom_doc.createElement(xmlName());
@@ -147,9 +149,9 @@ const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const {
}
/**
- * @brief PartDynamicTextField::fromXml
- * @param element
- */
+ @brief PartDynamicTextField::fromXml
+ @param element
+*/
void PartDynamicTextField::fromXml(const QDomElement &dom_elmt) {
if (dom_elmt.tagName() != xmlName()) {
qDebug() << "PartDynamicTextField::fromXml : Wrong tagg name";
@@ -215,10 +217,11 @@ void PartDynamicTextField::fromXml(const QDomElement &dom_elmt) {
}
/**
- * @brief PartDynamicTextField::fromTextFieldXml
- * Setup this text from the xml definition of a text field (The xml tagg of a text field is "input");
- * @param dom_element
- */
+ @brief PartDynamicTextField::fromTextFieldXml
+ Setup this text from the xml definition
+ of a text field (The xml tagg of a text field is "input");
+ @param dom_element
+*/
void PartDynamicTextField::fromTextFieldXml(const QDomElement &dom_element)
{
if(dom_element.tagName() != "input")
@@ -254,18 +257,18 @@ void PartDynamicTextField::fromTextFieldXml(const QDomElement &dom_element)
}
/**
- * @brief PartDynamicTextField::textFrom
- * @return what the final text is created from.
- */
+ @brief PartDynamicTextField::textFrom
+ @return what the final text is created from.
+*/
DynamicElementTextItem::TextFrom PartDynamicTextField::textFrom() const {
return m_text_from;
}
/**
- * @brief PartDynamicTextField::setTextFrom
- * Set the final text is created from.
- * @param text_from
- */
+ @brief PartDynamicTextField::setTextFrom
+ Set the final text is created from.
+ @param text_from
+*/
void PartDynamicTextField::setTextFrom(DynamicElementTextItem::TextFrom text_from) {
m_text_from = text_from;
switch (m_text_from) {
@@ -285,18 +288,18 @@ void PartDynamicTextField::setTextFrom(DynamicElementTextItem::TextFrom text_fro
}
/**
- * @brief PartDynamicTextField::text
- * @return the text of this text
- */
+ @brief PartDynamicTextField::text
+ @return the text of this text
+*/
QString PartDynamicTextField::text() const {
return m_text;
}
/**
- * @brief PartDynamicTextField::setText
- * Set the text of this text
- * @param text
- */
+ @brief PartDynamicTextField::setText
+ Set the text of this text
+ @param text
+*/
void PartDynamicTextField::setText(const QString &text) {
m_text = text;
setPlainText(m_text);
@@ -311,18 +314,18 @@ void PartDynamicTextField::setInfoName(const QString &info_name) {
}
/**
- * @brief PartDynamicTextField::infoName
- * @return the info name of this text
- */
+ @brief PartDynamicTextField::infoName
+ @return the info name of this text
+*/
QString PartDynamicTextField::infoName() const{
return m_info_name;
}
/**
- * @brief PartDynamicTextField::setCompositeText
- * Set the composite text of this text item to @text
- * @param text
- */
+ @brief PartDynamicTextField::setCompositeText
+ Set the composite text of this text item to @text
+ @param text
+*/
void PartDynamicTextField::setCompositeText(const QString &text) {
m_composite_text = text;
if(m_text_from == DynamicElementTextItem::CompositeText && elementScene())
@@ -331,26 +334,26 @@ void PartDynamicTextField::setCompositeText(const QString &text) {
}
/**
- * @brief PartDynamicTextField::compositeText
- * @return the composite text of this text
- */
+ @brief PartDynamicTextField::compositeText
+ @return the composite text of this text
+*/
QString PartDynamicTextField::compositeText() const {
return m_composite_text;
}
/**
- * @brief PartDynamicTextField::setColor
- * @param color set text color to color
- */
+ @brief PartDynamicTextField::setColor
+ @param color set text color to color
+*/
void PartDynamicTextField::setColor(const QColor& color) {
setDefaultTextColor(color);
emit colorChanged(color);
}
/**
- * @brief PartDynamicTextField::color
- * @return The color of this text
- */
+ @brief PartDynamicTextField::color
+ @return The color of this text
+*/
QColor PartDynamicTextField::color() const {
return defaultTextColor();
}
@@ -415,9 +418,9 @@ void PartDynamicTextField::setFont(const QFont &font) {
}
/**
- * @brief PartDynamicTextField::mouseMoveEvent
- * @param event
- */
+ @brief PartDynamicTextField::mouseMoveEvent
+ @param event
+*/
void PartDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
if((event -> buttons() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable)) {
QPointF pos = event -> scenePos() + (m_origine_pos - event -> buttonDownScenePos(Qt::LeftButton));
@@ -428,9 +431,9 @@ void PartDynamicTextField::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief PartDynamicTextField::mousePressEvent
- * @param event
- */
+ @brief PartDynamicTextField::mousePressEvent
+ @param event
+*/
void PartDynamicTextField::mousePressEvent(QGraphicsSceneMouseEvent *event) {
if(event -> button() == Qt::LeftButton)
m_origine_pos = this -> pos();
@@ -439,9 +442,9 @@ void PartDynamicTextField::mousePressEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief PartDynamicTextField::mouseReleaseEvent
- * @param event
- */
+ @brief PartDynamicTextField::mouseReleaseEvent
+ @param event
+*/
void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
if((event -> button() & Qt::LeftButton) &&
(flags() & QGraphicsItem::ItemIsMovable) &&
@@ -457,11 +460,11 @@ void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
}
/**
- * @brief PartDynamicTextField::itemChange
- * @param change
- * @param value
- * @return
- */
+ @brief PartDynamicTextField::itemChange
+ @param change
+ @param value
+ @return
+*/
QVariant PartDynamicTextField::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) {
if (change == QGraphicsItem::ItemPositionHasChanged || change == QGraphicsItem::ItemSceneHasChanged) {
updateCurrentPartEditor();
@@ -525,9 +528,10 @@ void PartDynamicTextField::paint(QPainter *painter, const QStyleOptionGraphicsIt
}
/**
- * @brief PartDynamicTextField::elementInfoChanged
- * Used to up to date this text field, when the element information (see elementScene) changed
- */
+ @brief PartDynamicTextField::elementInfoChanged
+ Used to up to date this text field,
+ when the element information (see elementScene) changed
+*/
void PartDynamicTextField::elementInfoChanged() {
if(!elementScene())
return;
diff --git a/sources/editor/graphicspart/partdynamictextfield.h b/sources/editor/graphicspart/partdynamictextfield.h
index 509407e23..2ed40a123 100644
--- a/sources/editor/graphicspart/partdynamictextfield.h
+++ b/sources/editor/graphicspart/partdynamictextfield.h
@@ -23,12 +23,13 @@
#include "dynamicelementtextitem.h"
/**
- * @brief The PartDynamicTextField class
- * This class represents an editable dynamic text field which may be used to compose the
- * drawing of an electrical element within the element editor.
- * The field will remain editable once the element is added onto
- * a diagram
- */
+ @brief The PartDynamicTextField class
+ This class represents an editable dynamic text field
+ which may be used to compose the
+ drawing of an electrical element within the element editor.
+ The field will remain editable once the element is added onto
+ a diagram
+*/
class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
{
Q_OBJECT
diff --git a/sources/editor/graphicspart/partellipse.cpp b/sources/editor/graphicspart/partellipse.cpp
index c6fbdcba4..8e30f2636 100644
--- a/sources/editor/graphicspart/partellipse.cpp
+++ b/sources/editor/graphicspart/partellipse.cpp
@@ -22,20 +22,20 @@
#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h"
/**
- * @brief PartEllipse::PartEllipse
- * Constructor
- * @param editor : QETElementEditor of this part
- * @param parent : parent item
- */
+ @brief PartEllipse::PartEllipse
+ Constructor
+ @param editor : QETElementEditor of this part
+ @param parent : parent item
+*/
PartEllipse::PartEllipse(QETElementEditor *editor, QGraphicsItem *parent) :
AbstractPartEllipse(editor, parent),
m_undo_command(nullptr)
{}
/**
- * @brief PartEllipse::~PartEllipse
- * Destructor
- */
+ @brief PartEllipse::~PartEllipse
+ Destructor
+*/
PartEllipse::~PartEllipse()
{
if(m_undo_command) delete m_undo_command;
@@ -43,12 +43,12 @@ PartEllipse::~PartEllipse()
}
/**
- * @brief PartEllipse::paint
- * Draw this ellpise
- * @param painter
- * @param options
- * @param widget
- */
+ @brief PartEllipse::paint
+ Draw this ellpise
+ @param painter
+ @param options
+ @param widget
+*/
void PartEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *widget)
{
Q_UNUSED(widget);
@@ -71,11 +71,11 @@ void PartEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
}
/**
- * @brief PartEllipse::toXml
- * Export this ellipse in xml
- * @param xml_document : Xml document to use for create the xml element.
- * @return : an xml element that describe this ellipse
- */
+ @brief PartEllipse::toXml
+ Export this ellipse in xml
+ @param xml_document : Xml document to use for create the xml element.
+ @return : an xml element that describe this ellipse
+*/
const QDomElement PartEllipse::toXml(QDomDocument &xml_document) const
{
QDomElement xml_element;
@@ -101,10 +101,10 @@ const QDomElement PartEllipse::toXml(QDomDocument &xml_document) const
}
/**
- * @brief PartEllipse::fromXml
- * Import the properties of this ellipse from a xml element.
- * @param qde : Xml document to use.
- */
+ @brief PartEllipse::fromXml
+ Import the properties of this ellipse from a xml element.
+ @param qde : Xml document to use.
+*/
void PartEllipse::fromXml(const QDomElement &qde)
{
stylesFromXml(qde);
@@ -124,9 +124,9 @@ void PartEllipse::fromXml(const QDomElement &qde)
}
/**
- * @brief PartEllipse::shape
- * @return the shape of this item
- */
+ @brief PartEllipse::shape
+ @return the shape of this item
+*/
QPainterPath PartEllipse::shape() const
{
QPainterPath shape;
@@ -151,10 +151,10 @@ QPainterPath PartEllipse::shadowShape() const
}
/**
- * @brief PartEllipse::mouseReleaseEvent
- * Handle mouse release event
- * @param event
- */
+ @brief PartEllipse::mouseReleaseEvent
+ Handle mouse release event
+ @param event
+*/
void PartEllipse::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (event->button() == Qt::LeftButton && event->buttonDownPos(Qt::LeftButton) == event->pos())
@@ -164,11 +164,11 @@ void PartEllipse::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief PartEllipse::itemChange
- * @param change
- * @param value
- * @return
- */
+ @brief PartEllipse::itemChange
+ @param change
+ @param value
+ @return
+*/
QVariant PartEllipse::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
{
if (change == ItemSelectedHasChanged && scene())
@@ -204,11 +204,11 @@ QVariant PartEllipse::itemChange(QGraphicsItem::GraphicsItemChange change, const
}
/**
- * @brief PartEllipse::sceneEventFilter
- * @param watched
- * @param event
- * @return
- */
+ @brief PartEllipse::sceneEventFilter
+ @param watched
+ @param event
+ @return
+*/
bool PartEllipse::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
{
//Watched must be an handler
@@ -260,8 +260,8 @@ void PartEllipse::switchResizeMode()
}
/**
- * @brief PartEllipse::adjusteHandlerPos
- */
+ @brief PartEllipse::adjusteHandlerPos
+*/
void PartEllipse::adjusteHandlerPos()
{
if (m_handler_vector.isEmpty())
@@ -278,10 +278,10 @@ void PartEllipse::adjusteHandlerPos()
}
/**
- * @brief PartEllipse::handlerMousePressEvent
- * @param qghi
- * @param event
- */
+ @brief PartEllipse::handlerMousePressEvent
+ @param qghi
+ @param event
+*/
void PartEllipse::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -294,10 +294,10 @@ void PartEllipse::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphics
}
/**
- * @brief PartEllipse::handlerMouseMoveEvent
- * @param qghi
- * @param event
- */
+ @brief PartEllipse::handlerMouseMoveEvent
+ @param qghi
+ @param event
+*/
void PartEllipse::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -316,10 +316,10 @@ void PartEllipse::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsS
}
/**
- * @brief PartEllipse::handlerMouseReleaseEvent
- * @param qghi
- * @param event
- */
+ @brief PartEllipse::handlerMouseReleaseEvent
+ @param qghi
+ @param event
+*/
void PartEllipse::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -332,9 +332,9 @@ void PartEllipse::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphi
}
/**
- * @brief PartEllipse::sceneSelectionChanged
- * When the scene selection change, if there are several primitive selected, we remove the handler of this item
- */
+ @brief PartEllipse::sceneSelectionChanged
+ When the scene selection change, if there are several primitive selected, we remove the handler of this item
+*/
void PartEllipse::sceneSelectionChanged()
{
if (this->isSelected() && scene()->selectedItems().size() == 1)
@@ -344,9 +344,9 @@ void PartEllipse::sceneSelectionChanged()
}
/**
- * @brief PartEllipse::addHandler
- * Add handlers for this item
- */
+ @brief PartEllipse::addHandler
+ Add handlers for this item
+*/
void PartEllipse::addHandler()
{
if (m_handler_vector.isEmpty() && scene())
@@ -368,9 +368,9 @@ void PartEllipse::addHandler()
}
/**
- * @brief PartEllipse::removeHandler
- * Remove the handlers of this item
- */
+ @brief PartEllipse::removeHandler
+ Remove the handlers of this item
+*/
void PartEllipse::removeHandler()
{
if (!m_handler_vector.isEmpty())
diff --git a/sources/editor/graphicspart/partellipse.h b/sources/editor/graphicspart/partellipse.h
index b7f42dcf7..477db5111 100644
--- a/sources/editor/graphicspart/partellipse.h
+++ b/sources/editor/graphicspart/partellipse.h
@@ -23,10 +23,10 @@
class QPropertyUndoCommand;
/**
- * @brief The PartEllipse class
- * This class represents an ellipse primitive which may be used to compose the
- * drawing of an electrical element within the element editor.
- */
+ @brief The PartEllipse class
+ This class represents an ellipse primitive which may be used to compose the
+ drawing of an electrical element within the element editor.
+*/
class PartEllipse : public AbstractPartEllipse
{
Q_OBJECT
@@ -43,9 +43,9 @@ class PartEllipse : public AbstractPartEllipse
public:
enum { Type = UserType + 1103 };
/**
- * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartEllipse.
- * @return the QGraphicsItem type
- */
+ Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartEllipse.
+ @return the QGraphicsItem type
+ */
int type() const override { return Type; }
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
diff --git a/sources/editor/graphicspart/partline.cpp b/sources/editor/graphicspart/partline.cpp
index fc6d0746e..c6cd22339 100644
--- a/sources/editor/graphicspart/partline.cpp
+++ b/sources/editor/graphicspart/partline.cpp
@@ -23,11 +23,11 @@
/**
- * @brief PartLine::PartLine
- * Constructor
- * @param editor : QETElementEditor of this part
- * @param parent : parent item
- */
+ @brief PartLine::PartLine
+ Constructor
+ @param editor : QETElementEditor of this part
+ @param parent : parent item
+*/
PartLine::PartLine(QETElementEditor *editor, QGraphicsItem *parent) :
CustomElementGraphicPart(editor, parent),
first_end(Qet::None),
@@ -47,10 +47,10 @@ PartLine::~PartLine()
}
/**
- * @brief PartLine::requiredLengthForEndType
- * @param end_type
- * @return the number of "length" needed to draw a extremity of type Qet::EndType.
- */
+ @brief PartLine::requiredLengthForEndType
+ @param end_type
+ @return the number of "length" needed to draw a extremity of type Qet::EndType.
+*/
uint PartLine::requiredLengthForEndType(const Qet::EndType &end_type)
{
uint length_count_required = 0;
@@ -64,12 +64,12 @@ uint PartLine::requiredLengthForEndType(const Qet::EndType &end_type)
}
/**
- * @brief PartLine::paint
- * Draw this line
- * @param painter
- * @param options
- * @param widget
- */
+ @brief PartLine::paint
+ Draw this line
+ @param painter
+ @param options
+ @param widget
+*/
void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *widget)
{
Q_UNUSED(widget);
@@ -97,11 +97,11 @@ void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
}
/**
- * @brief PartLine::toXml
- * Export this line in xml
- * @param xml_document : Xml document to use for create the xml element.
- * @return an xml element that describe this line
- */
+ @brief PartLine::toXml
+ Export this line in xml
+ @param xml_document : Xml document to use for create the xml element.
+ @return an xml element that describe this line
+*/
const QDomElement PartLine::toXml(QDomDocument &xml_document) const
{
QPointF p1(sceneP1());
@@ -122,10 +122,10 @@ const QDomElement PartLine::toXml(QDomDocument &xml_document) const
}
/**
- * @brief PartLine::fromXml
- * Import the properties of this line from a xml element.
- * @param qde : Xml document to use
- */
+ @brief PartLine::fromXml
+ Import the properties of this line from a xml element.
+ @param qde : Xml document to use
+*/
void PartLine::fromXml(const QDomElement &qde) {
stylesFromXml(qde);
m_line = QLineF(mapFromScene(qde.attribute("x1", "0").toDouble(),
@@ -140,11 +140,11 @@ void PartLine::fromXml(const QDomElement &qde) {
}
/**
- * @brief PartLine::itemChange
- * @param change
- * @param value
- * @return
- */
+ @brief PartLine::itemChange
+ @param change
+ @param value
+ @return
+*/
QVariant PartLine::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
{
if (change == ItemSelectedHasChanged && scene())
@@ -180,11 +180,11 @@ QVariant PartLine::itemChange(QGraphicsItem::GraphicsItemChange change, const QV
}
/**
- * @brief PartLine::sceneEventFilter
- * @param watched
- * @param event
- * @return
- */
+ @brief PartLine::sceneEventFilter
+ @param watched
+ @param event
+ @return
+*/
bool PartLine::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
{
//Watched must be an handler
@@ -220,9 +220,9 @@ bool PartLine::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
}
/**
- * @brief PartLine::adjusteHandlerPos
- * Adjust the position of the handler item
- */
+ @brief PartLine::adjusteHandlerPos
+ Adjust the position of the handler item
+*/
void PartLine::adjusteHandlerPos()
{
if(m_handler_vector.isEmpty())
@@ -240,10 +240,10 @@ void PartLine::adjusteHandlerPos()
}
/**
- * @brief PartLine::handlerMousePressEvent
- * @param qghi
- * @param event
- */
+ @brief PartLine::handlerMousePressEvent
+ @param qghi
+ @param event
+*/
void PartLine::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -256,10 +256,10 @@ void PartLine::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphicsSce
}
/**
- * @brief PartLine::handlerMouseMoveEvent
- * @param qghi
- * @param event
- */
+ @brief PartLine::handlerMouseMoveEvent
+ @param qghi
+ @param event
+*/
void PartLine::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -279,10 +279,10 @@ void PartLine::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsScen
}
/**
- * @brief PartLine::handlerMouseReleaseEvent
- * @param qghi
- * @param event
- */
+ @brief PartLine::handlerMouseReleaseEvent
+ @param qghi
+ @param event
+*/
void PartLine::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -295,9 +295,9 @@ void PartLine::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphicsS
}
/**
- * @brief PartLine::sceneSelectionChanged
- * When the scene selection change, if there are several primitive selected, we remove the handler of this item
- */
+ @brief PartLine::sceneSelectionChanged
+ When the scene selection change, if there are several primitive selected, we remove the handler of this item
+*/
void PartLine::sceneSelectionChanged()
{
if (this->isSelected() && scene()->selectedItems().size() == 1)
@@ -307,9 +307,9 @@ void PartLine::sceneSelectionChanged()
}
/**
- * @brief PartLine::addHandler
- * Add handlers for this item
- */
+ @brief PartLine::addHandler
+ Add handlers for this item
+*/
void PartLine::addHandler()
{
if (m_handler_vector.isEmpty() && scene())
@@ -330,9 +330,9 @@ void PartLine::addHandler()
}
/**
- * @brief PartLine::removeHandler
- * Remove the handlers of this item
- */
+ @brief PartLine::removeHandler
+ Remove the handlers of this item
+*/
void PartLine::removeHandler()
{
if (!m_handler_vector.isEmpty())
@@ -343,25 +343,25 @@ void PartLine::removeHandler()
}
/**
- * @brief PartLine::sceneP1
- * @return the point p1 in scene coordinate
- */
+ @brief PartLine::sceneP1
+ @return the point p1 in scene coordinate
+*/
QPointF PartLine::sceneP1() const {
return(mapToScene(m_line.p1()));
}
/**
- * @brief PartLine::sceneP2
- * @return the point p2 in scen coordinate
- */
+ @brief PartLine::sceneP2
+ @return the point p2 in scen coordinate
+*/
QPointF PartLine::sceneP2() const {
return(mapToScene(m_line.p2()));
}
/**
- * @brief PartLine::shape
- * @return the shape of this item
- */
+ @brief PartLine::shape
+ @return the shape of this item
+*/
QPainterPath PartLine::shape() const
{
QPainterPath shape;
@@ -404,10 +404,10 @@ QPainterPath PartLine::shadowShape() const
}
/**
- * @brief PartLine::fourShapePoints
- * @return a list with the two points that delimite the line
- * + the four points surrounding these two points
- */
+ @brief PartLine::fourShapePoints
+ @return a list with the two points that delimite the line
+ + the four points surrounding these two points
+*/
QList PartLine::fourShapePoints() const
{
const qreal marge = 2.0;
@@ -452,9 +452,9 @@ QList PartLine::fourShapePoints() const
}
/**
- * @brief PartLine::firstEndCircleRect
- * @return the rectangle bordering the entirety of the first extremity
- */
+ @brief PartLine::firstEndCircleRect
+ @return the rectangle bordering the entirety of the first extremity
+*/
QRectF PartLine::firstEndCircleRect() const
{
QList interesting_points = fourEndPoints(m_line.p1(),
@@ -470,9 +470,9 @@ QRectF PartLine::firstEndCircleRect() const
}
/**
- * @brief PartLine::secondEndCircleRect
- * @return the rectangle bordering the entirety of the second extremity
- */
+ @brief PartLine::secondEndCircleRect
+ @return the rectangle bordering the entirety of the second extremity
+*/
QRectF PartLine::secondEndCircleRect() const {
QList interesting_points = fourEndPoints(m_line.p2(),
m_line.p1(),
@@ -487,13 +487,13 @@ QRectF PartLine::secondEndCircleRect() const {
}
/**
- * @brief PartLine::debugPaint
- * Display several composante of the drawing
- * -the bounding rect
- * -special points at each extremity
- * -the quadrature of the circle at each extremity, even if itself is an other type
- * @param painter
- */
+ @brief PartLine::debugPaint
+ Display several composante of the drawing
+ -the bounding rect
+ -special points at each extremity
+ -the quadrature of the circle at each extremity, even if itself is an other type
+ @param painter
+*/
void PartLine::debugPaint(QPainter *painter)
{
painter -> save();
@@ -516,9 +516,9 @@ void PartLine::debugPaint(QPainter *painter)
}
/**
- * @brief PartLine::boundingRect
- * @return the bounding rect of this part
- */
+ @brief PartLine::boundingRect
+ @return the bounding rect of this part
+*/
QRectF PartLine::boundingRect() const
{
QRectF bound;
@@ -539,31 +539,31 @@ QRectF PartLine::boundingRect() const
}
/**
- * @brief PartLine::isUseless
- * @return true if this part is irrelevant and does not deserve to be Retained / registered.
- * A line is relevant when is two point is different
- */
+ @brief PartLine::isUseless
+ @return true if this part is irrelevant and does not deserve to be Retained / registered.
+ A line is relevant when is two point is different
+*/
bool PartLine::isUseless() const {
return(m_line.p1() == m_line.p2());
}
/**
- * @brief PartLine::sceneGeometricRect
- * @return the minimum, margin-less rectangle this part can fit into, in scene
- * coordinates. It is different from boundingRect() because it is not supposed
- * to imply any margin, and it is different from shape because it is a regular
- * rectangle, not a complex shape.
- */
+ @brief PartLine::sceneGeometricRect
+ @return the minimum, margin-less rectangle this part can fit into, in scene
+ coordinates. It is different from boundingRect() because it is not supposed
+ to imply any margin, and it is different from shape because it is a regular
+ rectangle, not a complex shape.
+*/
QRectF PartLine::sceneGeometricRect() const {
return(QRectF(sceneP1(), sceneP2()));
}
/**
- * @brief PartLine::startUserTransformation
- * Start the user-induced transformation, provided this primitive is contained
- * within the \a initial_selection_rect bounding rectangle.
- * @param initial_selection_rect
- */
+ @brief PartLine::startUserTransformation
+ Start the user-induced transformation, provided this primitive is contained
+ within the \a initial_selection_rect bounding rectangle.
+ @param initial_selection_rect
+*/
void PartLine::startUserTransformation(const QRectF &initial_selection_rect)
{
Q_UNUSED(initial_selection_rect)
@@ -572,11 +572,11 @@ void PartLine::startUserTransformation(const QRectF &initial_selection_rect)
}
/**
- * @brief PartLine::handleUserTransformation
- * Handle the user-induced transformation from \a initial_selection_rect to \a new_selection_rect
- * @param initial_selection_rect
- * @param new_selection_rect
- */
+ @brief PartLine::handleUserTransformation
+ Handle the user-induced transformation from \a initial_selection_rect to \a new_selection_rect
+ @param initial_selection_rect
+ @param new_selection_rect
+*/
void PartLine::handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect)
{
QList mapped_points = mapPoints(initial_selection_rect, new_selection_rect, saved_points_);
@@ -585,19 +585,19 @@ void PartLine::handleUserTransformation(const QRectF &initial_selection_rect, co
}
/**
- * @brief PartLine::fourEndPoints
- * Return the four interesting point needed to draw the shape
- * at extremity of line (circle, diamond, arrow, triangle)
- * This points are in order :
+ @brief PartLine::fourEndPoints
+ Return the four interesting point needed to draw the shape
+ at extremity of line (circle, diamond, arrow, triangle)
+ This points are in order :
* O : point on the line, at a distance 'length' of the extremity
* A : point on the line at a 'length' of 2x the extremity length
* B : point at a distance of length O - O is the projection of B on the line
* C : point at a distance of length O - O is the projection of C on the line
- * @param end_point : The concerned extremity
- * @param other_point : other needed point to define the line
- * @param length : length to use between the extremity and the point O
- * @return
- */
+ @param end_point : The concerned extremity
+ @param other_point : other needed point to define the line
+ @param length : length to use between the extremity and the point O
+ @return
+*/
QList PartLine::fourEndPoints(const QPointF &end_point, const QPointF &other_point, const qreal &length)
{
//Vector and length of the line
@@ -665,12 +665,12 @@ void PartLine::setSecondEndLength(const qreal &l)
}
/**
- * @brief PartLine::path
- * @return this line has a QPainterPath.
- * It's notably use when this line have an end type (circle, triangle etc....),
- * because return a QPainterPath with end already draw.
- * Else if there isn't an end type get P1 and P2 of line is better (faster).
- */
+ @brief PartLine::path
+ @return this line has a QPainterPath.
+ It's notably use when this line have an end type (circle, triangle etc....),
+ because return a QPainterPath with end already draw.
+ Else if there isn't an end type get P1 and P2 of line is better (faster).
+*/
QPainterPath PartLine::path() const
{
QPainterPath path;
diff --git a/sources/editor/graphicspart/partline.h b/sources/editor/graphicspart/partline.h
index 9c2d858d7..148599ed1 100644
--- a/sources/editor/graphicspart/partline.h
+++ b/sources/editor/graphicspart/partline.h
@@ -63,9 +63,9 @@ class PartLine : public CustomElementGraphicPart
enum { Type = UserType + 1104 };
/**
- * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartLine.
- * @return the QGraphicsItem type
- */
+ Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartLine.
+ @return the QGraphicsItem type
+ */
int type() const override { return Type; }
void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
QString name() const override { return(QObject::tr("ligne", "element part name")); }
diff --git a/sources/editor/graphicspart/partpolygon.cpp b/sources/editor/graphicspart/partpolygon.cpp
index 4767337ca..86c487532 100644
--- a/sources/editor/graphicspart/partpolygon.cpp
+++ b/sources/editor/graphicspart/partpolygon.cpp
@@ -25,11 +25,11 @@
/**
- * @brief PartPolygon::PartPolygon
- * Constructor
- * @param editor : editor of this item
- * @param parent : parent item
- */
+ @brief PartPolygon::PartPolygon
+ Constructor
+ @param editor : editor of this item
+ @param parent : parent item
+*/
PartPolygon::PartPolygon(QETElementEditor *editor, QGraphicsItem *parent) :
CustomElementGraphicPart(editor, parent),
m_closed(false),
@@ -44,8 +44,8 @@ PartPolygon::PartPolygon(QETElementEditor *editor, QGraphicsItem *parent) :
}
/**
- * @brief PartPolygon::~PartPolygon
- */
+ @brief PartPolygon::~PartPolygon
+*/
PartPolygon::~PartPolygon()
{
if(m_undo_command) delete m_undo_command;
@@ -53,12 +53,12 @@ PartPolygon::~PartPolygon()
}
/**
- * @brief PartPolygon::paint
- * Draw this polygon
- * @param painter
- * @param options
- * @param widget
- */
+ @brief PartPolygon::paint
+ Draw this polygon
+ @param painter
+ @param options
+ @param widget
+*/
void PartPolygon::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *widget)
{
Q_UNUSED(widget);
@@ -78,10 +78,10 @@ void PartPolygon::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
}
/**
- * @brief PartPolygon::fromXml
- * Import the properties of this polygon from a xml element
- * @param qde : Xml document to use
- */
+ @brief PartPolygon::fromXml
+ Import the properties of this polygon from a xml element
+ @param qde : Xml document to use
+*/
void PartPolygon::fromXml(const QDomElement &qde)
{
stylesFromXml(qde);
@@ -108,11 +108,11 @@ void PartPolygon::fromXml(const QDomElement &qde)
}
/**
- * @brief PartPolygon::toXml
- * Export this polygin in xml
- * @param xml_document : Xml document to use for create the xml element
- * @return an xml element that describe this polygon
- */
+ @brief PartPolygon::toXml
+ Export this polygin in xml
+ @param xml_document : Xml document to use for create the xml element
+ @return an xml element that describe this polygon
+*/
const QDomElement PartPolygon::toXml(QDomDocument &xml_document) const
{
QDomElement xml_element = xml_document.createElement("polygon");
@@ -129,10 +129,10 @@ const QDomElement PartPolygon::toXml(QDomDocument &xml_document) const
}
/**
- * @brief PartPolygon::isUseless
- * @return true if this part is irrelevant and does not deserve to be Retained / registered.
- * A polygon is relevant when he have 2 differents points
- */
+ @brief PartPolygon::isUseless
+ @return true if this part is irrelevant and does not deserve to be Retained / registered.
+ A polygon is relevant when he have 2 differents points
+*/
bool PartPolygon::isUseless() const
{
if (m_polygon.count() < 2) return(true);
@@ -144,22 +144,22 @@ bool PartPolygon::isUseless() const
}
/**
- * @brief PartPolygon::sceneGeometricRect
- * @return the minimum, margin-less rectangle this part can fit into, in scene
- * coordinates. It is different from boundingRect() because it is not supposed
- * to imply any margin, and it is different from shape because it is a regular
- * rectangle, not a complex shape.
- */
+ @brief PartPolygon::sceneGeometricRect
+ @return the minimum, margin-less rectangle this part can fit into, in scene
+ coordinates. It is different from boundingRect() because it is not supposed
+ to imply any margin, and it is different from shape because it is a regular
+ rectangle, not a complex shape.
+*/
QRectF PartPolygon::sceneGeometricRect() const {
return(mapToScene(m_polygon.boundingRect()).boundingRect());
}
/**
- * @brief PartPolygon::startUserTransformation
- * Start the user-induced transformation, provided this primitive is contained
- * within the initial_selection_rect bounding rectangle.
- * @param initial_selection_rect
- */
+ @brief PartPolygon::startUserTransformation
+ Start the user-induced transformation, provided this primitive is contained
+ within the initial_selection_rect bounding rectangle.
+ @param initial_selection_rect
+*/
void PartPolygon::startUserTransformation(const QRectF &initial_selection_rect)
{
Q_UNUSED(initial_selection_rect)
@@ -167,11 +167,11 @@ void PartPolygon::startUserTransformation(const QRectF &initial_selection_rect)
}
/**
- * @brief PartPolygon::handleUserTransformation
- * Handle the user-induced transformation from initial_selection_rect to new_selection_rect
- * @param initial_selection_rect
- * @param new_selection_rect
- */
+ @brief PartPolygon::handleUserTransformation
+ Handle the user-induced transformation from initial_selection_rect to new_selection_rect
+ @param initial_selection_rect
+ @param new_selection_rect
+*/
void PartPolygon::handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect)
{
QList mapped_points = mapPoints(initial_selection_rect, new_selection_rect, saved_points_);
@@ -179,29 +179,29 @@ void PartPolygon::handleUserTransformation(const QRectF &initial_selection_rect,
}
/**
- * @brief PartPolygon::preferredScalingMethod
- * This method is called by the decorator when it needs to determine the best
- * way to interactively scale a primitive. It is typically called when only a
- * single primitive is being scaled.
- * @return : This reimplementation systematically returns QET::RoundScaleRatios.
- */
+ @brief PartPolygon::preferredScalingMethod
+ This method is called by the decorator when it needs to determine the best
+ way to interactively scale a primitive. It is typically called when only a
+ single primitive is being scaled.
+ @return : This reimplementation systematically returns QET::RoundScaleRatios.
+*/
QET::ScalingMethod PartPolygon::preferredScalingMethod() const {
return(QET::RoundScaleRatios);
}
/**
- * @brief PartPolygon::polygon
- * @return the item's polygon, or an empty polygon if no polygon has been set.
- */
+ @brief PartPolygon::polygon
+ @return the item's polygon, or an empty polygon if no polygon has been set.
+*/
QPolygonF PartPolygon::polygon() const {
return m_polygon;
}
/**
- * @brief PartPolygon::setPolygon
- * Sets the item's polygon to be the given polygon.
- * @param polygon
- */
+ @brief PartPolygon::setPolygon
+ Sets the item's polygon to be the given polygon.
+ @param polygon
+*/
void PartPolygon::setPolygon(const QPolygonF &polygon)
{
if (m_polygon == polygon) return;
@@ -212,10 +212,10 @@ void PartPolygon::setPolygon(const QPolygonF &polygon)
}
/**
- * @brief PartPolygon::addPoint
- * Add new point to polygon
- * @param point
- */
+ @brief PartPolygon::addPoint
+ Add new point to polygon
+ @param point
+*/
void PartPolygon::addPoint(const QPointF &point)
{
prepareGeometryChange();
@@ -223,10 +223,10 @@ void PartPolygon::addPoint(const QPointF &point)
}
/**
- * @brief PartPolygon::setLastPoint
- * Set the last point of polygon to @point
- * @param point
- */
+ @brief PartPolygon::setLastPoint
+ Set the last point of polygon to @point
+ @param point
+*/
void PartPolygon::setLastPoint(const QPointF &point)
{
if (m_polygon.size())
@@ -237,9 +237,9 @@ void PartPolygon::setLastPoint(const QPointF &point)
}
/**
- * @brief PartPolygon::removeLastPoint
- * Remove the last point of polygon
- */
+ @brief PartPolygon::removeLastPoint
+ Remove the last point of polygon
+*/
void PartPolygon::removeLastPoint()
{
if (m_polygon.size())
@@ -254,15 +254,15 @@ void PartPolygon::setClosed(bool close)
if (m_closed == close) return;
prepareGeometryChange();
m_closed = close;
- emit closedChange();
+ emit closedChange();
}
/**
- * @brief PartPolygon::setHandlerColor
- * Set the handler at pos @pos (in polygon coordinate) to color @color.
- * @param pos
- * @param color
- */
+ @brief PartPolygon::setHandlerColor
+ Set the handler at pos @pos (in polygon coordinate) to color @color.
+ @param pos
+ @param color
+*/
void PartPolygon::setHandlerColor(QPointF pos, const QColor &color)
{
for (QetGraphicsHandlerItem *qghi : m_handler_vector) {
@@ -273,8 +273,8 @@ void PartPolygon::setHandlerColor(QPointF pos, const QColor &color)
}
/**
- * @brief PartPolygon::resetAllHandlerColor
- * Reset the color of every handlers
+ @brief PartPolygon::resetAllHandlerColor
+ Reset the color of every handlers
*/
void PartPolygon::resetAllHandlerColor()
{
@@ -284,11 +284,11 @@ void PartPolygon::resetAllHandlerColor()
}
/**
- * @brief PartPolygon::itemChange
- * @param change
- * @param value
- * @return
- */
+ @brief PartPolygon::itemChange
+ @param change
+ @param value
+ @return
+*/
QVariant PartPolygon::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
{
if (change == ItemSelectedHasChanged && scene())
@@ -324,11 +324,11 @@ QVariant PartPolygon::itemChange(QGraphicsItem::GraphicsItemChange change, const
}
/**
- * @brief PartPolygon::sceneEventFilter
- * @param watched
- * @param event
- * @return
- */
+ @brief PartPolygon::sceneEventFilter
+ @param watched
+ @param event
+ @return
+*/
bool PartPolygon::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
{
//Watched must be an handler
@@ -388,8 +388,8 @@ void PartPolygon::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
}
/**
- * @brief PartPolygon::adjusteHandlerPos
- */
+ @brief PartPolygon::adjusteHandlerPos
+*/
void PartPolygon::adjusteHandlerPos()
{
if(m_handler_vector.isEmpty())
@@ -410,10 +410,10 @@ void PartPolygon::adjusteHandlerPos()
}
/**
- * @brief PartPolygon::handlerMousePressEvent
- * @param qghi
- * @param event
- */
+ @brief PartPolygon::handlerMousePressEvent
+ @param qghi
+ @param event
+*/
void PartPolygon::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -424,10 +424,10 @@ void PartPolygon::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphics
}
/**
- * @brief PartPolygon::handlerMouseMoveEvent
- * @param qghi
- * @param event
- */
+ @brief PartPolygon::handlerMouseMoveEvent
+ @param qghi
+ @param event
+*/
void PartPolygon::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -444,10 +444,10 @@ void PartPolygon::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsS
}
/**
- * @brief PartPolygon::handlerMouseReleaseEvent
- * @param qghi
- * @param event
- */
+ @brief PartPolygon::handlerMouseReleaseEvent
+ @param qghi
+ @param event
+*/
void PartPolygon::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi);
@@ -460,9 +460,9 @@ void PartPolygon::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGraphi
}
/**
- * @brief PartPolygon::sceneSelectionChanged
- * When the scene selection change, if there are several primitive selected, we remove the handler of this item
- */
+ @brief PartPolygon::sceneSelectionChanged
+ When the scene selection change, if there are several primitive selected, we remove the handler of this item
+*/
void PartPolygon::sceneSelectionChanged()
{
if (this->isSelected() && scene()->selectedItems().size() == 1)
@@ -472,9 +472,9 @@ void PartPolygon::sceneSelectionChanged()
}
/**
- * @brief PartPolygon::addHandler
- * Add handlers for this item
- */
+ @brief PartPolygon::addHandler
+ Add handlers for this item
+*/
void PartPolygon::addHandler()
{
if (m_handler_vector.isEmpty() && scene())
@@ -492,9 +492,9 @@ void PartPolygon::addHandler()
}
/**
- * @brief PartPolygon::removeHandler
- * Remove the handlers of this item
- */
+ @brief PartPolygon::removeHandler
+ Remove the handlers of this item
+*/
void PartPolygon::removeHandler()
{
if (!m_handler_vector.isEmpty())
@@ -505,9 +505,9 @@ void PartPolygon::removeHandler()
}
/**
- * @brief PartPolygon::insertPoint
- * Insert a point in this polygone
- */
+ @brief PartPolygon::insertPoint
+ Insert a point in this polygone
+*/
void PartPolygon::insertPoint()
{
QPolygonF new_polygon = QetGraphicsHandlerUtility::polygonForInsertPoint(m_polygon, m_closed, elementScene()->snapToGrid(m_context_menu_pos));
@@ -522,9 +522,9 @@ void PartPolygon::insertPoint()
}
/**
- * @brief PartPolygon::removePoint
- * remove a point on this polygon
- */
+ @brief PartPolygon::removePoint
+ remove a point on this polygon
+*/
void PartPolygon::removePoint()
{
if (m_handler_vector.size() == 2)
@@ -544,7 +544,7 @@ void PartPolygon::removePoint()
if (index > -1 && indexpolygon();
- qDebug() << index;
+ qDebug() << index;
polygon.removeAt(index);
//Wrap the undo for avoid to merge the undo commands when user add several points.
@@ -556,9 +556,9 @@ void PartPolygon::removePoint()
}
/**
- * @brief PartPolygon::shape
- * @return the shape of this item
- */
+ @brief PartPolygon::shape
+ @return the shape of this item
+*/
QPainterPath PartPolygon::shape() const
{
QPainterPath shape;
@@ -589,9 +589,9 @@ QPainterPath PartPolygon::shadowShape() const
}
/**
- * @brief PartPolygon::boundingRect
- * @return the bounding rect of this item
- */
+ @brief PartPolygon::boundingRect
+ @return the bounding rect of this item
+*/
QRectF PartPolygon::boundingRect() const
{
QRectF r = m_polygon.boundingRect();
diff --git a/sources/editor/graphicspart/partpolygon.h b/sources/editor/graphicspart/partpolygon.h
index e10eadff1..4922dc48a 100644
--- a/sources/editor/graphicspart/partpolygon.h
+++ b/sources/editor/graphicspart/partpolygon.h
@@ -26,10 +26,10 @@ class QetGraphicsHandlerItem;
class QAction;
/**
- * @brief The PartPolygon class
- * This class represents a polygon primitive which may be used to compose the
- * drawing of an electrical element within the element editor.
- */
+ @brief The PartPolygon class
+ This class represents a polygon primitive which may be used to compose the
+ drawing of an electrical element within the element editor.
+*/
class PartPolygon : public CustomElementGraphicPart
{
Q_OBJECT
@@ -84,8 +84,8 @@ class PartPolygon : public CustomElementGraphicPart
bool isClosed () const {return m_closed;}
void setClosed (bool close);
- void setHandlerColor(QPointF pos, const QColor &color) final;
- void resetAllHandlerColor() final;
+ void setHandlerColor(QPointF pos, const QColor &color) final;
+ void resetAllHandlerColor() final;
protected:
QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
diff --git a/sources/editor/graphicspart/partrectangle.cpp b/sources/editor/graphicspart/partrectangle.cpp
index 5f17b7252..152bf659f 100644
--- a/sources/editor/graphicspart/partrectangle.cpp
+++ b/sources/editor/graphicspart/partrectangle.cpp
@@ -22,29 +22,29 @@
#include "QetGraphicsItemModeler/qetgraphicshandlerutility.h"
/**
- * @brief PartRectangle::PartRectangle
- * Constructor
- * @param editor the QETElementEditor of this item
- * @param parent parent item
- */
+ @brief PartRectangle::PartRectangle
+ Constructor
+ @param editor the QETElementEditor of this item
+ @param parent parent item
+*/
PartRectangle::PartRectangle(QETElementEditor *editor, QGraphicsItem *parent) :
CustomElementGraphicPart(editor, parent)
{}
/**
- * @brief PartRectangle::~PartRectangle
- */
+ @brief PartRectangle::~PartRectangle
+*/
PartRectangle::~PartRectangle() {
removeHandler();
}
/**
- * @brief PartRectangle::paint
- * Draw this Rectangle
- * @param painter
- * @param options
- * @param widget
- */
+ @brief PartRectangle::paint
+ Draw this Rectangle
+ @param painter
+ @param options
+ @param widget
+*/
void PartRectangle::paint(QPainter *painter, const QStyleOptionGraphicsItem *options, QWidget *widget)
{
Q_UNUSED(widget);
@@ -72,11 +72,11 @@ void PartRectangle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opt
}
/**
- * @brief PartRectangle::toXml
- * Export this rectangle in xml
- * @param xml_document : Xml document to use for create the xml element.
- * @return an xml element that describe this ellipse
- */
+ @brief PartRectangle::toXml
+ Export this rectangle in xml
+ @param xml_document : Xml document to use for create the xml element.
+ @return an xml element that describe this ellipse
+*/
const QDomElement PartRectangle::toXml(QDomDocument &xml_document) const
{
QDomElement xml_element = xml_document.createElement("rect");
@@ -104,10 +104,10 @@ const QDomElement PartRectangle::toXml(QDomDocument &xml_document) const
}
/**
- * @brief PartRectangle::fromXml
- * Import the properties of this rectangle from a xml element.
- * @param qde : Xml document to use.
- */
+ @brief PartRectangle::fromXml
+ Import the properties of this rectangle from a xml element.
+ @param qde : Xml document to use.
+*/
void PartRectangle::fromXml(const QDomElement &qde)
{
stylesFromXml(qde);
@@ -123,18 +123,18 @@ void PartRectangle::fromXml(const QDomElement &qde)
}
/**
- * @brief PartRectangle::rect
- * @return : Returns the item's rectangle.
- */
+ @brief PartRectangle::rect
+ @return : Returns the item's rectangle.
+*/
QRectF PartRectangle::rect() const {
return m_rect;
}
/**
- * @brief PartRectangle::setRect
- * Sets the item's rectangle to be the given rectangle.
- * @param rect
- */
+ @brief PartRectangle::setRect
+ Sets the item's rectangle to be the given rectangle.
+ @param rect
+*/
void PartRectangle::setRect(const QRectF &rect)
{
if (rect == m_rect) return;
@@ -161,28 +161,28 @@ void PartRectangle::setYRadius(qreal Y)
}
/**
- * @brief PartRectangle::sceneGeometricRect
- * @return the minimum, margin-less rectangle this part can fit into, in scene
- * coordinates. It is different from boundingRect() because it is not supposed
- * to imply any margin, and it is different from shape because it is a regular
- * rectangle, not a complex shape.
- */
+ @brief PartRectangle::sceneGeometricRect
+ @return the minimum, margin-less rectangle this part can fit into, in scene
+ coordinates. It is different from boundingRect() because it is not supposed
+ to imply any margin, and it is different from shape because it is a regular
+ rectangle, not a complex shape.
+*/
QRectF PartRectangle::sceneGeometricRect() const {
return(mapToScene(rect()).boundingRect());
}
/**
- * @brief PartRectangle::sceneTopLeft
- * @return the top left of rectangle, in scene coordinate
- */
+ @brief PartRectangle::sceneTopLeft
+ @return the top left of rectangle, in scene coordinate
+*/
QPointF PartRectangle::sceneTopLeft() const {
return(mapToScene(rect().topLeft()));
}
/**
- * @brief PartRectangle::shape
- * @return the shape of this item
- */
+ @brief PartRectangle::shape
+ @return the shape of this item
+*/
QPainterPath PartRectangle::shape() const
{
QPainterPath shape;
@@ -207,9 +207,9 @@ QPainterPath PartRectangle::shadowShape() const
}
/**
- * @brief PartRectangle::boundingRect
- * @return Bounding rectangle this part can fit into
- */
+ @brief PartRectangle::boundingRect
+ @return Bounding rectangle this part can fit into
+*/
QRectF PartRectangle::boundingRect() const
{
qreal adjust = (SHADOWS_HEIGHT + penWeight()) / 2;
@@ -224,20 +224,20 @@ QRectF PartRectangle::boundingRect() const
}
/**
- * @brief PartRectangle::isUseless
- * @return true if this part is irrelevant and does not deserve to be Retained / registered.
- * An rectangle is relevant when he's not null.
- */
+ @brief PartRectangle::isUseless
+ @return true if this part is irrelevant and does not deserve to be Retained / registered.
+ An rectangle is relevant when he's not null.
+*/
bool PartRectangle::isUseless() const {
return(rect().isNull());
}
/**
- * @brief PartRectangle::startUserTransformation
- * Start the user-induced transformation, provided this primitive is contained
- * within the initial_selection_rect bounding rectangle.
- * @param initial_selection_rect
- */
+ @brief PartRectangle::startUserTransformation
+ Start the user-induced transformation, provided this primitive is contained
+ within the initial_selection_rect bounding rectangle.
+ @param initial_selection_rect
+*/
void PartRectangle::startUserTransformation(const QRectF &initial_selection_rect)
{
Q_UNUSED(initial_selection_rect)
@@ -247,11 +247,11 @@ void PartRectangle::startUserTransformation(const QRectF &initial_selection_rect
}
/**
- * @brief PartRectangle::handleUserTransformation
- * Handle the user-induced transformation from \a initial_selection_rect to \a new_selection_rect
- * @param initial_selection_rect
- * @param new_selection_rect
- */
+ @brief PartRectangle::handleUserTransformation
+ Handle the user-induced transformation from \a initial_selection_rect to \a new_selection_rect
+ @param initial_selection_rect
+ @param new_selection_rect
+*/
void PartRectangle::handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect)
{
QList mapped_points = mapPoints(initial_selection_rect, new_selection_rect, saved_points_);
@@ -259,10 +259,10 @@ void PartRectangle::handleUserTransformation(const QRectF &initial_selection_rec
}
/**
- * @brief PartRectangle::mouseReleaseEvent
- * Handle mouse release event
- * @param event
- */
+ @brief PartRectangle::mouseReleaseEvent
+ Handle mouse release event
+ @param event
+*/
void PartRectangle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if (event->button() == Qt::LeftButton && event->buttonDownPos(Qt::LeftButton) == event->pos())
@@ -272,11 +272,11 @@ void PartRectangle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief PartRectangle::itemChange
- * @param change
- * @param value
- * @return
- */
+ @brief PartRectangle::itemChange
+ @param change
+ @param value
+ @return
+*/
QVariant PartRectangle::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
{
if (change == ItemSelectedHasChanged && scene())
@@ -312,11 +312,11 @@ QVariant PartRectangle::itemChange(QGraphicsItem::GraphicsItemChange change, con
}
/**
- * @brief PartRectangle::sceneEventFilter
- * @param watched
- * @param event
- * @return
- */
+ @brief PartRectangle::sceneEventFilter
+ @param watched
+ @param event
+ @return
+*/
bool PartRectangle::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
{
//Watched must be an handler
@@ -352,8 +352,8 @@ bool PartRectangle::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
}
/**
- * @brief PartRectangle::switchResizeMode
- */
+ @brief PartRectangle::switchResizeMode
+*/
void PartRectangle::switchResizeMode()
{
if (m_resize_mode == 1)
@@ -385,8 +385,8 @@ void PartRectangle::switchResizeMode()
}
/**
- * @brief PartRectangle::adjusteHandlerPos
- */
+ @brief PartRectangle::adjusteHandlerPos
+*/
void PartRectangle::adjusteHandlerPos()
{
if (m_handler_vector.isEmpty()) {
@@ -417,10 +417,10 @@ void PartRectangle::adjusteHandlerPos()
}
/**
- * @brief PartRectangle::handlerMousePressEvent
- * @param qghi
- * @param event
- */
+ @brief PartRectangle::handlerMousePressEvent
+ @param qghi
+ @param event
+*/
void PartRectangle::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi)
@@ -435,10 +435,10 @@ void PartRectangle::handlerMousePressEvent(QetGraphicsHandlerItem *qghi, QGraphi
}
/**
- * @brief PartRectangle::handlerMouseMoveEvent
- * @param qghi
- * @param event
- */
+ @brief PartRectangle::handlerMouseMoveEvent
+ @param qghi
+ @param event
+*/
void PartRectangle::handlerMouseMoveEvent(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event)
{
Q_UNUSED(qghi)
@@ -496,9 +496,9 @@ void PartRectangle::handlerMouseReleaseEvent(QetGraphicsHandlerItem *qghi, QGrap
}
/**
- * @brief PartRectangle::sceneSelectionChanged
- * When the scene selection change, if there are several primitive selected, we remove the handler of this item
- */
+ @brief PartRectangle::sceneSelectionChanged
+ When the scene selection change, if there are several primitive selected, we remove the handler of this item
+*/
void PartRectangle::sceneSelectionChanged()
{
if (this->isSelected() && scene()->selectedItems().size() == 1)
@@ -508,9 +508,9 @@ void PartRectangle::sceneSelectionChanged()
}
/**
- * @brief PartRectangle::addHandler
- * Add handlers for this item
- */
+ @brief PartRectangle::addHandler
+ Add handlers for this item
+*/
void PartRectangle::addHandler()
{
if (m_handler_vector.isEmpty() && scene())
@@ -538,9 +538,9 @@ void PartRectangle::addHandler()
}
/**
- * @brief PartRectangle::removeHandler
- * Remove the handlers of this item
- */
+ @brief PartRectangle::removeHandler
+ Remove the handlers of this item
+*/
void PartRectangle::removeHandler()
{
if (!m_handler_vector.isEmpty())
diff --git a/sources/editor/graphicspart/partrectangle.h b/sources/editor/graphicspart/partrectangle.h
index d6d7a6608..4c001fae6 100644
--- a/sources/editor/graphicspart/partrectangle.h
+++ b/sources/editor/graphicspart/partrectangle.h
@@ -23,9 +23,9 @@
class QetGraphicsHandlerItem;
/**
- * This class represents a rectangle primitive which may be used to compose the
- * drawing of an electrical element within the element editor.
- * All coordinates is in item coordinate, except pos()
+ This class represents a rectangle primitive which may be used to compose the
+ drawing of an electrical element within the element editor.
+ All coordinates is in item coordinate, except pos()
*/
class PartRectangle : public CustomElementGraphicPart
{
@@ -52,9 +52,9 @@ class PartRectangle : public CustomElementGraphicPart
public:
enum { Type = UserType + 1109 };
/**
- * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartRectangle.
- * @return the QGraphicsItem type
- */
+ Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartRectangle.
+ @return the QGraphicsItem type
+ */
int type () const override { return Type; }
void paint (QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
QString name () const override { return(QObject::tr("rectangle", "element part name")); }
diff --git a/sources/editor/graphicspart/partterminal.cpp b/sources/editor/graphicspart/partterminal.cpp
index b8586ec64..90bd6ec7b 100644
--- a/sources/editor/graphicspart/partterminal.cpp
+++ b/sources/editor/graphicspart/partterminal.cpp
@@ -25,7 +25,7 @@
@param scene La scene sur laquelle figure cette borne
*/
PartTerminal::PartTerminal(QETElementEditor *editor, QGraphicsItem *parent) :
- CustomElementGraphicPart(editor, parent)
+ CustomElementGraphicPart(editor, parent)
{
d = new TerminalData(this);
d -> m_orientation = Qet::North;
@@ -93,9 +93,9 @@ void PartTerminal::paint(QPainter *p, const QStyleOptionGraphicsItem *options, Q
}
/**
- * @brief PartTerminal::shape
- * @return the shape of this item
- */
+ @brief PartTerminal::shape
+ @return the shape of this item
+*/
QPainterPath PartTerminal::shape() const {
QPainterPath shape;
shape.lineTo(d -> second_point);
@@ -107,9 +107,9 @@ QPainterPath PartTerminal::shape() const {
}
/**
- * @brief PartTerminal::boundingRect
- * @return the bounding rect of this item
- */
+ @brief PartTerminal::boundingRect
+ @return the bounding rect of this item
+*/
QRectF PartTerminal::boundingRect() const {
QRectF br(QPointF(0, 0), d -> second_point);
br = br.normalized();
diff --git a/sources/editor/graphicspart/partterminal.h b/sources/editor/graphicspart/partterminal.h
index 5cff09fe7..49f7beafd 100644
--- a/sources/editor/graphicspart/partterminal.h
+++ b/sources/editor/graphicspart/partterminal.h
@@ -47,9 +47,9 @@ class PartTerminal : public CustomElementGraphicPart {
public:
enum { Type = UserType + 1106 };
/**
- * Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartTerminal.
- * @return the QGraphicsItem type
- */
+ Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a PartTerminal.
+ @return the QGraphicsItem type
+ */
int type() const override { return Type; }
QString name() const override { return d -> m_name; }
QString xmlName() const override { return(QString("terminal")); }
diff --git a/sources/editor/lineeditor.cpp b/sources/editor/lineeditor.cpp
index 90498ae51..ecb9ae939 100644
--- a/sources/editor/lineeditor.cpp
+++ b/sources/editor/lineeditor.cpp
@@ -110,12 +110,12 @@ void LineEditor::disconnectChangeConnections()
}
/**
- * @brief LineEditor::setPart
- * Specifie to this editor the part to edit.
- * Note that an editor can accept or refuse to edit a part. This editor accept only PartLine.
- * @param new_part
- * @return
- */
+ @brief LineEditor::setPart
+ Specifie to this editor the part to edit.
+ Note that an editor can accept or refuse to edit a part. This editor accept only PartLine.
+ @param new_part
+ @return
+*/
bool LineEditor::setPart(CustomElementPart *new_part)
{
if (!new_part)
@@ -164,17 +164,17 @@ QList LineEditor::currentParts() const {
}
/**
- * @brief LineEditor::editedP1
- * @return The edited P1 in item coordinate
- */
+ @brief LineEditor::editedP1
+ @return The edited P1 in item coordinate
+*/
QPointF LineEditor::editedP1() const {
return part -> mapFromScene(x1->value(), y1->value());
}
/**
- * @brief LineEditor::editedP2
- * @return The edited P2 in item coordinate
- */
+ @brief LineEditor::editedP2
+ @return The edited P2 in item coordinate
+*/
QPointF LineEditor::editedP2() const {
return part -> mapFromScene(x2->value(), y2->value());
}
@@ -366,9 +366,9 @@ void LineEditor::lineEditingFinishedY2()
}
/**
- * @brief LineEditor::updateForm
- * Update the value of the widgets
- */
+ @brief LineEditor::updateForm
+ Update the value of the widgets
+*/
void LineEditor::updateForm()
{
if (!part) return;
@@ -387,11 +387,11 @@ void LineEditor::updateForm()
}
/**
- * @brief LineEditor::activeConnections
- * Enable/disable connection between editor widget and slot editingFinished
- * True == enable | false == disable
- * @param active
- */
+ @brief LineEditor::activeConnections
+ Enable/disable connection between editor widget and slot editingFinished
+ True == enable | false == disable
+ @param active
+*/
void LineEditor::activeConnections(bool active)
{
if (active)
diff --git a/sources/editor/lineeditor.h b/sources/editor/lineeditor.h
index e04d01558..9cf24ba05 100644
--- a/sources/editor/lineeditor.h
+++ b/sources/editor/lineeditor.h
@@ -70,10 +70,11 @@ class LineEditor : public ElementItemEditor
private:
void activeConnections(bool);
- /*!
- * \brief setUpChangeConnections
- * Setup the connection from the line(s) to the widget, to update it when the line(s) are changed (moved ...)
- */
+ /**
+ @brief setUpChangeConnections
+ Setup the connection from the line(s) to the widget,
+ to update it when the line(s) are changed (moved ...)
+ */
void setUpChangeConnections();
void disconnectChangeConnections();
};
diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp
index 39cb8c243..3ba4c1094 100644
--- a/sources/editor/qetelementeditor.cpp
+++ b/sources/editor/qetelementeditor.cpp
@@ -106,10 +106,10 @@ QETElementEditor::~QETElementEditor() {
}
/**
- * @brief QETElementEditor::setLocation
- * The new location to edit
- * @param el
- */
+ @brief QETElementEditor::setLocation
+ The new location to edit
+ @param el
+*/
void QETElementEditor::setLocation(const ElementsLocation &el) {
location_ = el;
opened_from_file = false;
@@ -132,9 +132,9 @@ void QETElementEditor::setFileName(const QString &fn) {
}
/**
- * @brief QETElementEditor::setupActions
- * Create action used in Element editor
- */
+ @brief QETElementEditor::setupActions
+ Create action used in Element editor
+*/
void QETElementEditor::setupActions() {
new_element = new QAction(QET::Icons::DocumentNew, tr("&Nouveau"), this);
open = new QAction(QET::Icons::FolderOpen, tr("&Ouvrir"), this);
@@ -260,7 +260,7 @@ void QETElementEditor::setupActions() {
addToolBar(Qt::TopToolBarArea, depth_toolbar);
/*
- * Action related to zoom
+ Action related to zoom
*/
m_zoom_ag = new QActionGroup(this);
@@ -280,7 +280,7 @@ void QETElementEditor::setupActions() {
connect(zoom_reset, SIGNAL(triggered()), m_view, SLOT(zoomReset() ));
/*
- * Action related to primitive creation
+ Action related to primitive creation
*/
connect (m_elmt_scene, SIGNAL(partsAdded()), this, SLOT(UncheckAddPrimitive()));
parts = new QActionGroup(this);
@@ -359,8 +359,8 @@ void QETElementEditor::setupActions() {
}
/**
- * @brief QETElementEditor::setupMenus
- */
+ @brief QETElementEditor::setupMenus
+*/
void QETElementEditor::setupMenus() {
file_menu = new QMenu(tr("&Fichier"), this);
edit_menu = new QMenu(tr("&Édition"), this);
@@ -422,11 +422,11 @@ void QETElementEditor::setupMenus() {
}
/**
- * @brief QETElementEditor::contextMenu
- * Display a context menu, with all available action.
- * @param p, the pos of the menu, in screen coordinate
- * @param actions, a list of actions who can be prepended to the context menu.
- */
+ @brief QETElementEditor::contextMenu
+ Display a context menu, with all available action.
+ @param p, the pos of the menu, in screen coordinate
+ @param actions, a list of actions who can be prepended to the context menu.
+*/
void QETElementEditor::contextMenu(QPoint p, QList actions) {
QMenu menu(this);
menu.addActions(std::move(actions));
@@ -511,8 +511,8 @@ void QETElementEditor::slot_updateTitle() {
}
/**
- * @brief QETElementEditor::setupInterface
- */
+ @brief QETElementEditor::setupInterface
+*/
void QETElementEditor::setupInterface() {
// editeur
m_elmt_scene = new ElementScene(this, this);
@@ -747,10 +747,10 @@ void QETElementEditor::slot_updateInformations() {
}
/**
- * @brief QETElementEditor::checkElement
- * Do several check about element.
- * If error is occurred return false
- */
+ @brief QETElementEditor::checkElement
+ Do several check about element.
+ If error is occurred return false
+*/
bool QETElementEditor::checkElement() {
//List of warning and error
typedef QPair QETWarning;
@@ -897,11 +897,11 @@ void QETElementEditor::fromFile(const QString &filepath) {
}
/**
- * @brief QETElementEditor::toFile
- * Save to file the drawed element.
- * @param fn : path of the file
- * @return : true if succesfully save.
- */
+ @brief QETElementEditor::toFile
+ Save to file the drawed element.
+ @param fn : path of the file
+ @return : true if succesfully save.
+*/
bool QETElementEditor::toFile(const QString &fn) {
m_elmt_scene -> clearEventInterface();
m_elmt_scene -> clearSelection();
@@ -920,11 +920,11 @@ bool QETElementEditor::toFile(const QString &fn) {
}
/**
- * @brief QETElementEditor::toLocation
- * Save the element to Location
- * @param location : location where we must save the current element
- * @return true if succesfully saved
- */
+ @brief QETElementEditor::toLocation
+ Save the element to Location
+ @param location : location where we must save the current element
+ @return true if succesfully saved
+*/
bool QETElementEditor::toLocation(const ElementsLocation &location) {
m_elmt_scene -> clearEventInterface();
m_elmt_scene -> clearSelection();
@@ -1002,73 +1002,73 @@ bool QETElementEditor::isReadOnly() const {
}
/**
- * @brief QETElementEditor::addLine
- * Set line creation interface to scene
- */
+ @brief QETElementEditor::addLine
+ Set line creation interface to scene
+*/
void QETElementEditor::addLine() {
m_elmt_scene -> setEventInterface(new ESEventAddLine(m_elmt_scene));
}
/**
- * @brief QETElementEditor::addRect
- * Set rectangle creation interface to scene
- */
+ @brief QETElementEditor::addRect
+ Set rectangle creation interface to scene
+*/
void QETElementEditor::addRect() {
m_elmt_scene -> setEventInterface(new ESEventAddRect(m_elmt_scene));
}
/**
- * @brief QETElementEditor::addEllipse
- * Set ellipse creation interface to scene
- */
+ @brief QETElementEditor::addEllipse
+ Set ellipse creation interface to scene
+*/
void QETElementEditor::addEllipse() {
m_elmt_scene -> setEventInterface(new ESEventAddEllipse(m_elmt_scene));
}
/**
- * @brief QETElementEditor::addPolygon
- * Set polygon creation interface to scene
- */
+ @brief QETElementEditor::addPolygon
+ Set polygon creation interface to scene
+*/
void QETElementEditor::addPolygon() {
m_elmt_scene -> setEventInterface(new ESEventAddPolygon(m_elmt_scene));
}
/**
- * @brief QETElementEditor::addArc
- * Set arc creation interface to scene
- */
+ @brief QETElementEditor::addArc
+ Set arc creation interface to scene
+*/
void QETElementEditor::addArc() {
m_elmt_scene -> setEventInterface(new ESEventAddArc(m_elmt_scene));
}
/**
- * @brief QETElementEditor::addText
- * Set text creation interface to scene
- */
+ @brief QETElementEditor::addText
+ Set text creation interface to scene
+*/
void QETElementEditor::addText() {
m_elmt_scene -> setEventInterface(new ESEventAddText(m_elmt_scene));
}
/**
- * @brief QETElementEditor::addTerminal
- * Set terminal creation interface to scene
- */
+ @brief QETElementEditor::addTerminal
+ Set terminal creation interface to scene
+*/
void QETElementEditor::addTerminal() {
m_elmt_scene -> setEventInterface(new ESEventAddTerminal(m_elmt_scene));
}
/**
- * @brief QETElementEditor::addDynamicTextField
- * Set dynamic text field creation interface to scene
- */
+ @brief QETElementEditor::addDynamicTextField
+ Set dynamic text field creation interface to scene
+*/
void QETElementEditor::addDynamicTextField() {
m_elmt_scene -> setEventInterface(new ESEventAddDynamicTextField(m_elmt_scene));
}
/**
- * @brief QETElementEditor::UncheckAddPrimitive
- * Uncheck all action related to primitive
- */
+ @brief QETElementEditor::UncheckAddPrimitive
+ Uncheck all action related to primitive
+*/
void QETElementEditor::UncheckAddPrimitive() {
foreach(QAction *action, parts -> actions()) {
action -> setChecked(false);
@@ -1126,8 +1126,8 @@ void QETElementEditor::openRecentFile(const QString &filepath) {
}
/**
- * @brief QETElementEditor::slot_openDxf
- */
+ @brief QETElementEditor::slot_openDxf
+*/
void QETElementEditor::slot_openDxf (){
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
@@ -1170,9 +1170,9 @@ void QETElementEditor::openElement(const QString &filepath) {
}
/**
- * @brief QETElementEditor::slot_reload
- * Reload the element from the file or location
- */
+ @brief QETElementEditor::slot_reload
+ Reload the element from the file or location
+*/
void QETElementEditor::slot_reload() {
//If user already edit the element, ask confirmation to reload
if (!m_elmt_scene -> undoStack().isClean()) {
@@ -1197,11 +1197,11 @@ void QETElementEditor::slot_reload() {
}
/**
- * @brief QETElementEditor::slot_save
- * Save the current editing element.
- * If the filepath or location is unknown, use save_as instead
- * @return true if save with success
- */
+ @brief QETElementEditor::slot_save
+ Save the current editing element.
+ If the filepath or location is unknown, use save_as instead
+ @return true if save with success
+*/
bool QETElementEditor::slot_save() {
// Check element befor writing
if (checkElement()) {
@@ -1236,11 +1236,11 @@ bool QETElementEditor::slot_save() {
}
/**
- * @brief QETElementEditor::slot_saveAs
- * Ask a location to user and save the current edited element
- * to this location
- * @return true if save with success
- */
+ @brief QETElementEditor::slot_saveAs
+ Ask a location to user and save the current edited element
+ to this location
+ @return true if save with success
+*/
bool QETElementEditor::slot_saveAs() {
// Check element befor writing
if (checkElement()) {
@@ -1264,10 +1264,10 @@ bool QETElementEditor::slot_saveAs() {
}
/**
- * @brief QETElementEditor::slot_saveAsFile
- * Ask a file to user and save the current edited element to this file
- * @return true if save with success
- */
+ @brief QETElementEditor::slot_saveAsFile
+ Ask a file to user and save the current edited element to this file
+ @return true if save with success
+*/
bool QETElementEditor::slot_saveAsFile() {
// Check element befor writing
if (checkElement()) {
@@ -1480,9 +1480,9 @@ void QETElementEditor::slot_updateSelectionFromPartsList() {
}
/**
- * @brief QETElementEditor::readSettings
- * Read settings
- */
+ @brief QETElementEditor::readSettings
+ Read settings
+*/
void QETElementEditor::readSettings() {
QSettings settings;
@@ -1503,9 +1503,9 @@ void QETElementEditor::readSettings() {
}
/**
- * @brief QETElementEditor::writeSettings
- * Write the settings
- */
+ @brief QETElementEditor::writeSettings
+ Write the settings
+*/
void QETElementEditor::writeSettings() {
QSettings settings;
settings.setValue("elementeditor/geometry", saveGeometry());
@@ -1547,10 +1547,10 @@ QString QETElementEditor::getOpenElementFileName(QWidget *parent, const QString
}
/**
- * @brief QETElementEditor::fromLocation
- * Location of the element to edit
- * @param location
- */
+ @brief QETElementEditor::fromLocation
+ Location of the element to edit
+ @param location
+*/
void QETElementEditor::fromLocation(const ElementsLocation &location) {
if (!location.isElement()) {
QET::QetMessageBox::critical(this,
@@ -1622,10 +1622,10 @@ void QETElementEditor::pasteFromFile() {
}
/**
- * @brief QETElementEditor::pasteFromElement
- * Ask an element to user, copy the xml definition of the element
- * to the clipboard and call ElementView::PasteInArea
- */
+ @brief QETElementEditor::pasteFromElement
+ Ask an element to user, copy the xml definition of the element
+ to the clipboard and call ElementView::PasteInArea
+*/
void QETElementEditor::pasteFromElement() {
//Ask for a location
ElementsLocation location = ElementDialog::getOpenElementLocation(this);
diff --git a/sources/editor/styleeditor.cpp b/sources/editor/styleeditor.cpp
index 08a41dec9..631179fa6 100644
--- a/sources/editor/styleeditor.cpp
+++ b/sources/editor/styleeditor.cpp
@@ -432,9 +432,9 @@ void StyleEditor::updatePartFilling() {
}
/**
- * @brief StyleEditor::updateForm
- * Update the edition form according to the value of edited part(s)
- */
+ @brief StyleEditor::updateForm
+ Update the edition form according to the value of edited part(s)
+*/
void StyleEditor::updateForm()
{
if (!part && m_part_list.isEmpty()) return;
@@ -471,12 +471,12 @@ void StyleEditor::updateForm()
}
/**
- * @brief StyleEditor::setPart
- * Set the part to edit by this editor.
- * Note : editor can accept or refuse to edit a part
- * @param new_part : part to edit
- * @return true if editor accept to edit this CustomElementPart otherwise false
- */
+ @brief StyleEditor::setPart
+ Set the part to edit by this editor.
+ Note : editor can accept or refuse to edit a part
+ @param new_part : part to edit
+ @return true if editor accept to edit this CustomElementPart otherwise false
+*/
bool StyleEditor::setPart(CustomElementPart *new_part) {
m_part_list.clear();
m_cep_list.clear();
@@ -490,7 +490,7 @@ bool StyleEditor::setPart(CustomElementPart *new_part) {
if (CustomElementGraphicPart *part_graphic = dynamic_cast(new_part))
{
part = part_graphic;
- m_cep_list.append(part_graphic);
+ m_cep_list.append(part_graphic);
updateForm();
return(true);
}
@@ -499,14 +499,14 @@ bool StyleEditor::setPart(CustomElementPart *new_part) {
}
/**
- * @brief StyleEditor::setParts
- * Set several parts to edit by this editor.
- * Note : editor can accept or refuse to edit several parts.
- * @param part_list
- * @return true if every customeElementPart stored in part_list can
- * be edited by this part editor, otherwise return false
- * (see StyleEditor::isStyleEditable)
- */
+ @brief StyleEditor::setParts
+ Set several parts to edit by this editor.
+ Note : editor can accept or refuse to edit several parts.
+ @param part_list
+ @return true if every customeElementPart stored in part_list can
+ be edited by this part editor, otherwise return false
+ (see StyleEditor::isStyleEditable)
+*/
bool StyleEditor::setParts(QList part_list)
{
if (part_list.isEmpty()) return false;
@@ -541,14 +541,15 @@ CustomElementPart *StyleEditor::currentPart() const {
}
QList StyleEditor::currentParts() const {
- return m_cep_list;
+ return m_cep_list;
}
/**
- * @brief StyleEditor::isStyleEditable
- * @param cep_list
- * @return true if all of the content of cep_list can be edited by style editor, else return false.
- */
+ @brief StyleEditor::isStyleEditable
+ @param cep_list
+ @return true if all of the content of cep_list
+ can be edited by style editor, else return false.
+*/
bool StyleEditor::isStyleEditable(QList cep_list)
{
QStringList str;
diff --git a/sources/editor/styleeditor.h b/sources/editor/styleeditor.h
index eba977076..6aa6abdf9 100644
--- a/sources/editor/styleeditor.h
+++ b/sources/editor/styleeditor.h
@@ -53,9 +53,9 @@ class StyleEditor : public ElementItemEditor
// methods
public:
bool setPart(CustomElementPart *) override;
- bool setParts(QList);
+ bool setParts(QList) override;
CustomElementPart *currentPart() const override;
- QList currentParts() const override;
+ QList currentParts() const override;
static bool isStyleEditable (QList cep_list);
diff --git a/sources/editor/ui/dynamictextfieldeditor.cpp b/sources/editor/ui/dynamictextfieldeditor.cpp
index 7b5f5e750..018d58455 100644
--- a/sources/editor/ui/dynamictextfieldeditor.cpp
+++ b/sources/editor/ui/dynamictextfieldeditor.cpp
@@ -53,11 +53,11 @@ DynamicTextFieldEditor::~DynamicTextFieldEditor() {
}
/**
- * @brief DynamicTextFieldEditor::setPart
- * Set @part as current edited part of this widget.
- * @param part
- * @return true if @part can be edited by this widget
- */
+ @brief DynamicTextFieldEditor::setPart
+ Set @part as current edited part of this widget.
+ @param part
+ @return true if @part can be edited by this widget
+*/
bool DynamicTextFieldEditor::setPart(CustomElementPart *part) {
disconnectConnections();
@@ -104,10 +104,10 @@ bool DynamicTextFieldEditor::setParts(QList parts) {
}
/**
- * @brief DynamicTextFieldEditor::currentPart
- * @return The current edited part, note they can return nullptr if
- * there is not a currently edited part.
- */
+ @brief DynamicTextFieldEditor::currentPart
+ @return The current edited part, note they can return nullptr if
+ there is not a currently edited part.
+*/
CustomElementPart *DynamicTextFieldEditor::currentPart() const {
return m_text_field.data();
}
@@ -187,9 +187,9 @@ void DynamicTextFieldEditor::disconnectConnections() {
}
/**
- * @brief DynamicTextFieldEditor::fillInfoComboBox
- * Fill the combo box "element information"
- */
+ @brief DynamicTextFieldEditor::fillInfoComboBox
+ Fill the combo box "element information"
+*/
void DynamicTextFieldEditor::fillInfoComboBox() {
ui -> m_elmt_info_cb -> clear();
diff --git a/sources/editor/ui/dynamictextfieldeditor.h b/sources/editor/ui/dynamictextfieldeditor.h
index a9991283c..2d5630f52 100644
--- a/sources/editor/ui/dynamictextfieldeditor.h
+++ b/sources/editor/ui/dynamictextfieldeditor.h
@@ -26,9 +26,9 @@ namespace Ui {
}
/**
- * @brief The DynamicTextFieldEditor class
- * This class provide a widget used to edit the property of a dynamic text field
- */
+ @brief The DynamicTextFieldEditor class
+ This class provide a widget used to edit the property of a dynamic text field
+*/
class DynamicTextFieldEditor : public ElementItemEditor {
Q_OBJECT
diff --git a/sources/editor/ui/elementpropertieseditorwidget.cpp b/sources/editor/ui/elementpropertieseditorwidget.cpp
index d17bff735..20b366650 100644
--- a/sources/editor/ui/elementpropertieseditorwidget.cpp
+++ b/sources/editor/ui/elementpropertieseditorwidget.cpp
@@ -22,10 +22,10 @@
#include
/**
- * @brief The EditorDelegate class
- * This delegate is only use for disable the edition of the first
- * column of the information tree widget
- */
+ @brief The EditorDelegate class
+ This delegate is only use for disable the edition of the first
+ column of the information tree widget
+*/
class EditorDelegate : public QItemDelegate
{
public:
@@ -44,13 +44,13 @@ class EditorDelegate : public QItemDelegate
};
/**
- * @brief ElementPropertiesEditorWidget::ElementPropertiesEditorWidget
- * Default constructor
- * @param basic_type : QString of the drawed element
- * @param kind_info : DiagramContext to store kindInfo of drawed element
- * @param elmt_info : the information of element (label, manufacturer etc...]
- * @param parent : parent widget
- */
+ @brief ElementPropertiesEditorWidget::ElementPropertiesEditorWidget
+ Default constructor
+ @param basic_type : QString of the drawed element
+ @param kind_info : DiagramContext to store kindInfo of drawed element
+ @param elmt_info : the information of element (label, manufacturer etc...]
+ @param parent : parent widget
+*/
ElementPropertiesEditorWidget::ElementPropertiesEditorWidget(QString &basic_type, DiagramContext &kind_info, DiagramContext &elmt_info, QWidget *parent) :
QDialog(parent),
ui(new Ui::ElementPropertiesEditorWidget),
@@ -64,18 +64,18 @@ ElementPropertiesEditorWidget::ElementPropertiesEditorWidget(QString &basic_type
}
/**
- * @brief ElementPropertiesEditorWidget::~ElementPropertiesEditorWidget
- * Default destructor
- */
+ @brief ElementPropertiesEditorWidget::~ElementPropertiesEditorWidget
+ Default destructor
+*/
ElementPropertiesEditorWidget::~ElementPropertiesEditorWidget()
{
delete ui;
}
/**
- * @brief ElementPropertiesEditorWidget::upDateInterface
- * Update the interface with the curent value
- */
+ @brief ElementPropertiesEditorWidget::upDateInterface
+ Update the interface with the curent value
+*/
void ElementPropertiesEditorWidget::upDateInterface()
{
ui->m_base_type_cb->setCurrentIndex(ui->m_base_type_cb->findData(QVariant(m_basic_type)));
@@ -94,8 +94,8 @@ void ElementPropertiesEditorWidget::upDateInterface()
}
/**
- * @brief ElementPropertiesEditorWidget::setUpInterface
- */
+ @brief ElementPropertiesEditorWidget::setUpInterface
+*/
void ElementPropertiesEditorWidget::setUpInterface()
{
// Type combo box
@@ -147,9 +147,9 @@ void ElementPropertiesEditorWidget::updateTree()
}
/**
- * @brief ElementPropertiesEditorWidget::populateTree
- * Create QTreeWidgetItem of the tree widget and populate it
- */
+ @brief ElementPropertiesEditorWidget::populateTree
+ Create QTreeWidgetItem of the tree widget and populate it
+*/
void ElementPropertiesEditorWidget::populateTree()
{
QStringList keys{"label", "plant", "comment", "description", "designation", "manufacturer", "manufacturer_reference", "supplier", "quantity", "unity", "machine_manufacturer_reference"};
@@ -165,9 +165,9 @@ void ElementPropertiesEditorWidget::populateTree()
}
/**
- * @brief ElementPropertiesEditorWidget::on_m_buttonBox_accepted
- * Action on button accepted : the new information is set
- */
+ @brief ElementPropertiesEditorWidget::on_m_buttonBox_accepted
+ Action on button accepted : the new information is set
+*/
void ElementPropertiesEditorWidget::on_m_buttonBox_accepted()
{
m_basic_type = ui -> m_base_type_cb -> itemData(ui -> m_base_type_cb -> currentIndex()).toString();
@@ -194,9 +194,9 @@ void ElementPropertiesEditorWidget::on_m_buttonBox_accepted()
}
/**
- * @brief ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged
- * @param index : Action when combo-box base type index change
- */
+ @brief ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged
+ @param index : Action when combo-box base type index change
+*/
void ElementPropertiesEditorWidget::on_m_base_type_cb_currentIndexChanged(int index)
{
bool slave = false , master = false;
diff --git a/sources/editor/ui/elementpropertieseditorwidget.h b/sources/editor/ui/elementpropertieseditorwidget.h
index 105c4512d..ca0337ca4 100644
--- a/sources/editor/ui/elementpropertieseditorwidget.h
+++ b/sources/editor/ui/elementpropertieseditorwidget.h
@@ -27,10 +27,10 @@ namespace Ui {
}
/**
- * @brief The ElementPropertiesEditorWidget class
- * This class provide a dialog for edit various property of element, like
- * the type (master, slave, report etc....) and kind info.
- */
+ @brief The ElementPropertiesEditorWidget class
+ This class provide a dialog for edit various property of element, like
+ the type (master, slave, report etc....) and kind info.
+*/
class ElementPropertiesEditorWidget : public QDialog
{
Q_OBJECT
diff --git a/sources/editor/ui/polygoneditor.cpp b/sources/editor/ui/polygoneditor.cpp
index dae6a3d1f..ed60e5c14 100644
--- a/sources/editor/ui/polygoneditor.cpp
+++ b/sources/editor/ui/polygoneditor.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "polygoneditor.h"
#include "ui_polygoneditor.h"
@@ -24,53 +24,67 @@
#include "QPropertyUndoCommand/qpropertyundocommand.h"
/**
- * @brief PolygonEditor::PolygonEditor
- * @param editor
- * @param part
- * @param parent
- */
-PolygonEditor::PolygonEditor(QETElementEditor *editor, PartPolygon *part, QWidget *parent) :
- ElementItemEditor(editor, parent),
- ui(new Ui::PolygonEditor),
- m_part(part)
+ @brief PolygonEditor::PolygonEditor
+ @param editor
+ @param part
+ @param parent
+*/
+PolygonEditor::PolygonEditor(QETElementEditor *editor,
+ PartPolygon *part,
+ QWidget *parent) :
+ ElementItemEditor(editor, parent),
+ ui(new Ui::PolygonEditor),
+ m_part(part)
{
- ui->setupUi(this);
- m_style = new StyleEditor(editor);
- ui->m_main_layout->insertWidget(0, m_style);
- updateForm();
- ui->m_points_list_tree->installEventFilter(this);
- ui->m_points_list_tree->addAction(ui->m_add_point_action);
- ui->m_points_list_tree->addAction(ui->m_remove_point_action);
+ ui->setupUi(this);
+ m_style = new StyleEditor(editor);
+ ui->m_main_layout->insertWidget(0, m_style);
+ updateForm();
+ ui->m_points_list_tree->installEventFilter(this);
+ ui->m_points_list_tree->addAction(ui->m_add_point_action);
+ ui->m_points_list_tree->addAction(ui->m_remove_point_action);
}
/**
- * @brief PolygonEditor::~PolygonEditor
- */
+ @brief PolygonEditor::~PolygonEditor
+*/
PolygonEditor::~PolygonEditor() {
- delete ui;
+ delete ui;
}
void PolygonEditor::setUpChangeConnections()
{
- m_change_connections << connect(m_part, &PartPolygon::polygonChanged, this, &PolygonEditor::updateForm);
- m_change_connections << connect(m_part, &PartPolygon::closedChange, this, &PolygonEditor::updateForm);
- m_change_connections << connect(m_part, &PartPolygon::xChanged, this, &PolygonEditor::updateForm);
- m_change_connections << connect(m_part, &PartPolygon::yChanged, this, &PolygonEditor::updateForm);
+ m_change_connections << connect(m_part,
+ &PartPolygon::polygonChanged,
+ this,
+ &PolygonEditor::updateForm);
+ m_change_connections << connect(m_part,
+ &PartPolygon::closedChange,
+ this,
+ &PolygonEditor::updateForm);
+ m_change_connections << connect(m_part,
+ &PartPolygon::xChanged,
+ this,
+ &PolygonEditor::updateForm);
+ m_change_connections << connect(m_part,
+ &PartPolygon::yChanged,
+ this,
+ &PolygonEditor::updateForm);
}
void PolygonEditor::disconnectChangeConnections()
{
- for (QMetaObject::Connection c : m_change_connections) {
- disconnect(c);
- }
- m_change_connections.clear();
+ for (QMetaObject::Connection c : m_change_connections) {
+ disconnect(c);
+ }
+ m_change_connections.clear();
}
/**
- * @brief PolygonEditor::setPart
- * @param new_part
- * @return
- */
+ @brief PolygonEditor::setPart
+ @param new_part
+ @return
+*/
bool PolygonEditor::setPart(CustomElementPart *new_part)
{
if (!new_part)
@@ -98,47 +112,48 @@ bool PolygonEditor::setPart(CustomElementPart *new_part)
}
/**
- * @brief PolygonEditor::currentPart
- * @return the curent edited part
- */
+ @brief PolygonEditor::currentPart
+ @return the curent edited part
+*/
CustomElementPart *PolygonEditor::currentPart() const {
- return m_part;
+ return m_part;
}
QList PolygonEditor::currentParts() const {
- return m_style->currentParts();
+ return m_style->currentParts();
}
/**
- * @brief PolygonEditor::updateForm
- * Update the widget
- */
+ @brief PolygonEditor::updateForm
+ Update the widget
+*/
void PolygonEditor::updateForm()
{
- if (!m_part) {
- return;
- }
+ if (!m_part) {
+ return;
+ }
- ui->m_points_list_tree->clear();
+ ui->m_points_list_tree->clear();
- for(QPointF point : m_part->polygon())
- {
- point = m_part->mapToScene(point);
- QTreeWidgetItem *qtwi = new QTreeWidgetItem();
- qtwi->setData(0, Qt::EditRole, point.x());
- qtwi->setData(1, Qt::EditRole, point.y());
- qtwi -> setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled);
- ui->m_points_list_tree->addTopLevelItem(qtwi);
- }
- ui->m_close_polygon_cb->setChecked(m_part->isClosed());
- ui->m_remove_point_action->setEnabled(m_part->polygon().size() > 2 ? true : false);
+ for(QPointF point : m_part->polygon())
+ {
+ point = m_part->mapToScene(point);
+ QTreeWidgetItem *qtwi = new QTreeWidgetItem();
+ qtwi->setData(0, Qt::EditRole, point.x());
+ qtwi->setData(1, Qt::EditRole, point.y());
+ qtwi -> setFlags(Qt::ItemIsEditable | Qt::ItemIsEnabled);
+ ui->m_points_list_tree->addTopLevelItem(qtwi);
+ }
+ ui->m_close_polygon_cb->setChecked(m_part->isClosed());
+ ui->m_remove_point_action->setEnabled(m_part->polygon().size()
+ > 2 ? true : false);
}
/**
- * @brief PolygonEditor::pointsFromTree
- * @return the point of polygon from the current value of the tree editor
- * if part coordinate.
- */
+ @brief PolygonEditor::pointsFromTree
+ @return the point of polygon from the current value of the tree editor
+ if part coordinate.
+*/
QVector PolygonEditor::pointsFromTree()
{
QVector points;
@@ -173,8 +188,8 @@ bool PolygonEditor::eventFilter(QObject *watched, QEvent *event)
}
/**
- * @brief PolygonEditor::on_m_close_polygon_cb_stateChanged
- */
+ @brief PolygonEditor::on_m_close_polygon_cb_stateChanged
+*/
void PolygonEditor::on_m_close_polygon_cb_stateChanged(int arg1)
{
Q_UNUSED(arg1);
@@ -185,17 +200,22 @@ void PolygonEditor::on_m_close_polygon_cb_stateChanged(int arg1)
bool close = ui->m_close_polygon_cb->isChecked();
if (close != m_part->isClosed())
{
- QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_part, "closed", m_part->property("closed"), close);
+ QPropertyUndoCommand *undo =
+ new QPropertyUndoCommand(m_part,
+ "closed",
+ m_part->property("closed"),
+ close);
undo->setText(tr("Modifier un polygone"));
undoStack().push(undo);
}
}
/**
- * @brief PolygonEditor::on_m_points_list_tree_itemChanged
- * Update the polygon according to the current value of the tree editor
- */
-void PolygonEditor::on_m_points_list_tree_itemChanged(QTreeWidgetItem *item, int column)
+ @brief PolygonEditor::on_m_points_list_tree_itemChanged
+ Update the polygon according to the current value of the tree editor
+*/
+void PolygonEditor::on_m_points_list_tree_itemChanged(QTreeWidgetItem *item,
+ int column)
{
Q_UNUSED(item);
Q_UNUSED(column);
@@ -207,22 +227,30 @@ void PolygonEditor::on_m_points_list_tree_itemChanged(QTreeWidgetItem *item, int
QPolygonF points = pointsFromTree();
if (points.count() < 2)
{
- QET::QetMessageBox::warning(this, tr("Erreur", "message box title"), tr("Le polygone doit comporter au moins deux points.", "message box content"));
+ QET::QetMessageBox::warning(this,
+ tr("Erreur",
+ "message box title"),
+ tr("Le polygone doit comporter au moins deux points.",
+ "message box content"));
return;
}
if (points != m_part->polygon())
{
- QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_part, "polygon", m_part->property("polygon"), points);
+ QPropertyUndoCommand *undo = new QPropertyUndoCommand(
+ m_part,
+ "polygon",
+ m_part->property("polygon"),
+ points);
undo->setText(tr("Modifier un polygone"));
undoStack().push(undo);
}
}
/**
- * @brief PolygonEditor::on_m_points_list_tree_itemSelectionChanged
- * Used to change the color of the current selected point.
- */
+ @brief PolygonEditor::on_m_points_list_tree_itemSelectionChanged
+ Used to change the color of the current selected point.
+*/
void PolygonEditor::on_m_points_list_tree_itemSelectionChanged()
{
//Prevent when selection change but the widget ins't focused
diff --git a/sources/editor/ui/polygoneditor.h b/sources/editor/ui/polygoneditor.h
index 41ebb85f8..d99125cd9 100644
--- a/sources/editor/ui/polygoneditor.h
+++ b/sources/editor/ui/polygoneditor.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef POLYGONEDITOR_H
#define POLYGONEDITOR_H
@@ -25,7 +25,7 @@ class PartPolygon;
class QTreeWidgetItem;
namespace Ui {
- class PolygonEditor;
+ class PolygonEditor;
}
class PolygonEditor : public ElementItemEditor
@@ -51,10 +51,11 @@ class PolygonEditor : public ElementItemEditor
void on_m_remove_point_action_triggered();
private:
- /*!
- * \brief setUpChangeConnections
- * Setup the connection from the line(s) to the widget, to update it when the line(s) are changed (moved ...)
- */
+ /**
+ @brief setUpChangeConnections
+ Setup the connection from the line(s) to the widget,
+ to update it when the line(s) are changed (moved ...)
+ */
void setUpChangeConnections();
void disconnectChangeConnections();
diff --git a/sources/editor/ui/rectangleeditor.cpp b/sources/editor/ui/rectangleeditor.cpp
index cc8e05c2a..913b1976c 100644
--- a/sources/editor/ui/rectangleeditor.cpp
+++ b/sources/editor/ui/rectangleeditor.cpp
@@ -24,11 +24,11 @@
#include "qeticons.h"
/**
- * @brief RectangleEditor::RectangleEditor
- * @param editor
- * @param rect
- * @param parent
- */
+ @brief RectangleEditor::RectangleEditor
+ @param editor
+ @param rect
+ @param parent
+*/
RectangleEditor::RectangleEditor(QETElementEditor *editor, PartRectangle *rect, QWidget *parent) :
ElementItemEditor(editor, parent),
m_part(rect),
@@ -40,8 +40,8 @@ RectangleEditor::RectangleEditor(QETElementEditor *editor, PartRectangle *rect,
}
/**
- * @brief RectangleEditor::~RectangleEditor
- */
+ @brief RectangleEditor::~RectangleEditor
+*/
RectangleEditor::~RectangleEditor() {
delete ui;
}
@@ -64,10 +64,10 @@ void RectangleEditor::disconnectChangeConnections()
}
/**
- * @brief RectangleEditor::setPart
- * @param part
- * @return
- */
+ @brief RectangleEditor::setPart
+ @param part
+ @return
+*/
bool RectangleEditor::setPart(CustomElementPart *part)
{
if (!part)
@@ -109,9 +109,9 @@ bool RectangleEditor::setParts(QList parts)
}
/**
- * @brief RectangleEditor::currentPart
- * @return
- */
+ @brief RectangleEditor::currentPart
+ @return
+*/
CustomElementPart *RectangleEditor::currentPart() const {
return m_part;
}
@@ -121,16 +121,16 @@ QList RectangleEditor::currentParts() const {
}
/**
- * @brief RectangleEditor::topLeft
- * @return The edited topLeft already mapped to part coordinate
- */
+ @brief RectangleEditor::topLeft
+ @return The edited topLeft already mapped to part coordinate
+*/
QPointF RectangleEditor::editedTopLeft() const {
return m_part->mapFromScene(ui->m_x_sb->value(), ui->m_y_sb->value());
}
/**
- * @brief RectangleEditor::updateForm
- */
+ @brief RectangleEditor::updateForm
+*/
void RectangleEditor::updateForm()
{
if (!m_part) {
@@ -153,10 +153,10 @@ void RectangleEditor::updateForm()
}
/**
- * @brief RectangleEditor::editingFinished
- * Slot called when a editor widget is finish to be edited
- * Update the geometry of the rectangle according to value of editing widget.
- */
+ @brief RectangleEditor::editingFinished
+ Slot called when a editor widget is finish to be edited
+ Update the geometry of the rectangle according to value of editing widget.
+*/
void RectangleEditor::editingFinished()
{
if (m_locked) {
@@ -340,11 +340,11 @@ void RectangleEditor::yRadiusChanged()
/**
- * @brief RectangleEditor::activeConnections
- * Enable/disable connection between editor widget and slot editingFinished
- * True == enable | false == disable
- * @param active
- */
+ @brief RectangleEditor::activeConnections
+ Enable/disable connection between editor widget and slot editingFinished
+ True == enable | false == disable
+ @param active
+*/
void RectangleEditor::activeConnections(bool active)
{
if (active)
diff --git a/sources/editor/ui/rectangleeditor.h b/sources/editor/ui/rectangleeditor.h
index 09e606897..94c7480d1 100644
--- a/sources/editor/ui/rectangleeditor.h
+++ b/sources/editor/ui/rectangleeditor.h
@@ -29,9 +29,9 @@ namespace Ui {
}
/**
- * @brief The RectangleEditor class
- * This class provides a widget to edit rectangles within the element editor.
- */
+ @brief The RectangleEditor class
+ This class provides a widget to edit rectangles within the element editor.
+*/
class RectangleEditor : public ElementItemEditor
{
Q_OBJECT
@@ -58,9 +58,9 @@ class RectangleEditor : public ElementItemEditor
void xRadiusChanged();
void yRadiusChanged();
/*!
- * \brief setUpChangeConnections
- * Setup the connection from the rectangles(s) to the widget, to update it when the rectangles(s) are changed (moved ...)
- */
+ \brief setUpChangeConnections
+ Setup the connection from the rectangles(s) to the widget, to update it when the rectangles(s) are changed (moved ...)
+ */
void setUpChangeConnections();
void disconnectChangeConnections();
diff --git a/sources/editor/ui/texteditor.cpp b/sources/editor/ui/texteditor.cpp
index 0749f6de4..e7a30df70 100644
--- a/sources/editor/ui/texteditor.cpp
+++ b/sources/editor/ui/texteditor.cpp
@@ -22,12 +22,12 @@
#include
/**
- * @brief TextEditor::TextEditor
- * Default constructor
- * @param editor : the element editor who use this editor
- * @param text : the text to edit
- * @param parent : the parent widget
- */
+ @brief TextEditor::TextEditor
+ Default constructor
+ @param editor : the element editor who use this editor
+ @param text : the text to edit
+ @param parent : the parent widget
+*/
TextEditor::TextEditor(QETElementEditor *editor, PartText *text, QWidget *parent) :
ElementItemEditor(editor, parent),
ui(new Ui::TextEditor) {
@@ -40,16 +40,16 @@ TextEditor::TextEditor(QETElementEditor *editor, PartText *text, QWidget *paren
}
/**
- * @brief TextEditor::~TextEditor
- */
+ @brief TextEditor::~TextEditor
+*/
TextEditor::~TextEditor() {
delete ui;
}
/**
- * @brief TextEditor::updateForm
- * Update the gui
- */
+ @brief TextEditor::updateForm
+ Update the gui
+*/
void TextEditor::updateForm()
{
if (m_text.isNull()) {
@@ -94,12 +94,12 @@ void TextEditor::disconnectEditConnection() {
}
/**
- * @brief TextEditor::setPart
- * Set the current text to edit.
- * Set @part to nullptr to clear the current text.
- * @param part : part to edit
- * @return : return if @part is a partext or nullptr, else return false
- */
+ @brief TextEditor::setPart
+ Set the current text to edit.
+ Set @part to nullptr to clear the current text.
+ @param part : part to edit
+ @return : return if @part is a partext or nullptr, else return false
+*/
bool TextEditor::setPart(CustomElementPart *part) {
if (!part) {
m_text = nullptr;
@@ -147,9 +147,9 @@ bool TextEditor::setParts(QList parts) {
}
/**
- * @brief TextEditor::currentPart
- * @return The current part
- */
+ @brief TextEditor::currentPart
+ @return The current part
+*/
CustomElementPart *TextEditor::currentPart() const {
return m_text;
}
@@ -163,10 +163,10 @@ QList TextEditor::currentParts() const {
}
/**
- * @brief TextEditor::setUpEditConnection
- * Setup the connection between the widgets of this editor and the undo command
- * use to apply the change to the edited text.
- */
+ @brief TextEditor::setUpEditConnection
+ Setup the connection between the widgets of this editor and the undo command
+ use to apply the change to the edited text.
+*/
void TextEditor::setUpEditConnection() {
disconnectEditConnection();
@@ -234,8 +234,8 @@ void TextEditor::setUpEditConnection() {
}
/**
- * @brief TextEditor::on_m_font_pb_clicked
- */
+ @brief TextEditor::on_m_font_pb_clicked
+*/
void TextEditor::on_m_font_pb_clicked() {
bool ok;
QFont font_ = QFontDialog::getFont(&ok, m_text -> font(), this);
@@ -259,9 +259,9 @@ void TextEditor::on_m_font_pb_clicked() {
}
/**
- * @brief TextEditor::on_m_color_pb_changed
- * @param newColor
- */
+ @brief TextEditor::on_m_color_pb_changed
+ @param newColor
+*/
void TextEditor::on_m_color_pb_changed(const QColor &newColor) {
for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i];
diff --git a/sources/elementdialog.cpp b/sources/elementdialog.cpp
index d42b0f8c0..777911865 100644
--- a/sources/elementdialog.cpp
+++ b/sources/elementdialog.cpp
@@ -30,10 +30,10 @@
#include "qetmessagebox.h"
/**
- * @brief ElementDialog::ElementDialog
- * @param mode
- * @param parent
- */
+ @brief ElementDialog::ElementDialog
+ @param mode
+ @param parent
+*/
ElementDialog::ElementDialog(uint mode, QWidget *parent) :
QDialog(parent),
m_mode(mode)
@@ -43,9 +43,9 @@ ElementDialog::ElementDialog(uint mode, QWidget *parent) :
}
/**
- * @brief ElementDialog::setUpWidget
- * Build and setup the widgets of this dialog
- */
+ @brief ElementDialog::setUpWidget
+ Build and setup the widgets of this dialog
+*/
void ElementDialog::setUpWidget()
{
setWindowModality(Qt::WindowModal);
@@ -124,9 +124,9 @@ void ElementDialog::setUpWidget()
}
/**
- * @brief ElementDialog::setUpConnection
- * Setup connection of this dialog
- */
+ @brief ElementDialog::setUpConnection
+ Setup connection of this dialog
+*/
void ElementDialog::setUpConnection()
{
connect(m_tree_view, &QTreeView::clicked, this, &ElementDialog::indexClicked);
@@ -137,9 +137,9 @@ void ElementDialog::setUpConnection()
}
/**
- * @brief ElementDialog::indexClicked
- * @param index
- */
+ @brief ElementDialog::indexClicked
+ @param index
+*/
void ElementDialog::indexClicked(const QModelIndex &index)
{
ElementCollectionItem *eci = static_cast (m_model->itemFromIndex(index));
@@ -148,9 +148,9 @@ void ElementDialog::indexClicked(const QModelIndex &index)
}
/**
- * @brief ElementDialog::checkCurrentLocation
- * Update this dialog according to the current selected location and the current mode
- */
+ @brief ElementDialog::checkCurrentLocation
+ Update this dialog according to the current selected location and the current mode
+*/
void ElementDialog::checkCurrentLocation()
{
if (m_mode == OpenElement) {
@@ -236,10 +236,10 @@ void ElementDialog::checkAccept()
}
/**
- * @brief ElementDialog::location
- * @return The selected location or a null location if user has selected nothing
- * or selection isn't compatible with the curent mode
- */
+ @brief ElementDialog::location
+ @return The selected location or a null location if user has selected nothing
+ or selection isn't compatible with the curent mode
+*/
ElementsLocation ElementDialog::location() const
{
if (m_mode == OpenElement)
@@ -272,32 +272,32 @@ ElementsLocation ElementDialog::location() const
}
/**
- * @brief ElementDialog::getOpenElementLocation
- * Display a dialog for open an element through her location
- * @param parentWidget
- * @return The location of the selected element
- */
+ @brief ElementDialog::getOpenElementLocation
+ Display a dialog for open an element through her location
+ @param parentWidget
+ @return The location of the selected element
+*/
ElementsLocation ElementDialog::getOpenElementLocation(QWidget *parentWidget) {
return(ElementDialog::execConfiguredDialog(ElementDialog::OpenElement, parentWidget));
}
/**
- * @brief ElementDialog::getSaveElementLocation
- * Display a dialog that allow to user to select an element (existing or not) who he want to save
- * @param parentWidget
- * @return The location where the element must be save
- */
+ @brief ElementDialog::getSaveElementLocation
+ Display a dialog that allow to user to select an element (existing or not) who he want to save
+ @param parentWidget
+ @return The location where the element must be save
+*/
ElementsLocation ElementDialog::getSaveElementLocation(QWidget *parentWidget) {
return(ElementDialog::execConfiguredDialog(ElementDialog::SaveElement, parentWidget));
}
/**
- * @brief ElementDialog::execConfiguredDialog
- * launch a dialog with the chosen mode
- * @param mode : mode of the dialog
- * @param parentWidget : parent widget of the dialog
- * @return the chosen location
- */
+ @brief ElementDialog::execConfiguredDialog
+ launch a dialog with the chosen mode
+ @param mode : mode of the dialog
+ @param parentWidget : parent widget of the dialog
+ @return the chosen location
+*/
ElementsLocation ElementDialog::execConfiguredDialog(int mode, QWidget *parentWidget)
{
ElementDialog *element_dialog = new ElementDialog(mode, parentWidget);
diff --git a/sources/elementprovider.cpp b/sources/elementprovider.cpp
index 50847b348..2653fac4e 100644
--- a/sources/elementprovider.cpp
+++ b/sources/elementprovider.cpp
@@ -23,10 +23,10 @@
#include
/**
- * @brief ElementProvider::ElementProvider Constructor
- * @param prj the project where we must find element
- * @param diagram the diagram to exclude from the search
- */
+ @brief ElementProvider::ElementProvider Constructor
+ @param prj the project where we must find element
+ @param diagram the diagram to exclude from the search
+*/
ElementProvider::ElementProvider(QETProject *prj, Diagram *diagram)
{
m_diagram_list = prj->diagrams();
@@ -34,22 +34,22 @@ ElementProvider::ElementProvider(QETProject *prj, Diagram *diagram)
}
/**
- * @brief ElementProvider::ElementProvider Constructor
- * @param diag Diagram to search
- */
+ @brief ElementProvider::ElementProvider Constructor
+ @param diag Diagram to search
+*/
ElementProvider::ElementProvider(Diagram *diag) {
m_diagram_list << diag;
}
/**
- * @brief ElementProvider::FreeElement
- * Search and return the asked element corresponding with the given filter
- * All returned element are free, ie element aren't connected with another element
- * @param filter
- * the filter for search element
- * (You can find all filter with the #define in Element.h)
- * @return
- */
+ @brief ElementProvider::FreeElement
+ Search and return the asked element corresponding with the given filter
+ All returned element are free, ie element aren't connected with another element
+ @param filter
+ the filter for search element
+ (You can find all filter with the #define in Element.h)
+ @return
+*/
QList ElementProvider::freeElement(const int filter) const{
QList free_elmt;
@@ -67,10 +67,10 @@ QList ElementProvider::freeElement(const int filter) const{
}
/**
- * @brief ElementProvider::fromUuids
- * @param uuid_list list of uuid must be found
- * @return all elements with uuid corresponding to uuid in @uuid_list
- */
+ @brief ElementProvider::fromUuids
+ @param uuid_list list of uuid must be found
+ @return all elements with uuid corresponding to uuid in @uuid_list
+*/
QList ElementProvider::fromUuids(QList uuid_list) const {
QList found_element;
@@ -86,12 +86,12 @@ QList ElementProvider::fromUuids(QList uuid_list) const {
}
/**
- * @brief ElementProvider::find
- * Search and return the asked element corresponding with the given filter
- * @param filter
- * the filter for search element
- * (You can find all filter with the #define in Element.h)
- */
+ @brief ElementProvider::find
+ Search and return the asked element corresponding with the given filter
+ @param filter
+ the filter for search element
+ (You can find all filter with the #define in Element.h)
+*/
QList ElementProvider::find(const int filter) const {
QList elmt_;
@@ -109,12 +109,12 @@ QList ElementProvider::find(const int filter) const {
}
/**
- * @brief ElementProvider::table
- * @param table
- * @param model
- * @return All tables wich display the derivated class of @model (if set) and not already in all the chain of next/previous table of @table (if set)
- * If table and model are nullptr, return every tables
- */
+ @brief ElementProvider::table
+ @param table
+ @param model
+ @return All tables wich display the derivated class of @model (if set) and not already in all the chain of next/previous table of @table (if set)
+ If table and model are nullptr, return every tables
+*/
QVector ElementProvider::table(QetGraphicsTableItem *table, QAbstractItemModel *model)
{
QVector v_;
@@ -158,10 +158,10 @@ QVector ElementProvider::table(QetGraphicsTableItem *tab
}
/**
- * @brief ElementProvider::tableFromUuid
- * @param uuid
- * @return the table with uuid @uuid or nullptr if not found
- */
+ @brief ElementProvider::tableFromUuid
+ @param uuid
+ @return the table with uuid @uuid or nullptr if not found
+*/
QetGraphicsTableItem *ElementProvider::tableFromUuid(const QUuid &uuid)
{
for (auto table : this->table())
diff --git a/sources/elementscategoryeditor.cpp b/sources/elementscategoryeditor.cpp
index 43e2e1a9e..6eceedc65 100644
--- a/sources/elementscategoryeditor.cpp
+++ b/sources/elementscategoryeditor.cpp
@@ -28,12 +28,12 @@
#include
/**
- * @brief ElementsCategoryEditor::ElementsCategoryEditor
- * Constructor
- * @param location : location of the category to edit, or parent directory/category for the creation of a new category
- * @param edit : true = edit mode, false = creation mode
- * @param parent : parent widget
- */
+ @brief ElementsCategoryEditor::ElementsCategoryEditor
+ Constructor
+ @param location : location of the category to edit, or parent directory/category for the creation of a new category
+ @param edit : true = edit mode, false = creation mode
+ @param parent : parent widget
+*/
ElementsCategoryEditor::ElementsCategoryEditor(const ElementsLocation &location, bool edit, QWidget *parent) :
QDialog(parent),
m_edit_mode(edit),
@@ -84,24 +84,24 @@ ElementsCategoryEditor::ElementsCategoryEditor(const ElementsLocation &location,
}
/**
- * @brief ElementsCategoryEditor::~ElementsCategoryEditor
- * Destructor
- */
+ @brief ElementsCategoryEditor::~ElementsCategoryEditor
+ Destructor
+*/
ElementsCategoryEditor::~ElementsCategoryEditor() {
}
/**
- * @brief ElementsCategoryEditor::createdLocation
- * @return the location of the created directory
- */
+ @brief ElementsCategoryEditor::createdLocation
+ @return the location of the created directory
+*/
ElementsLocation ElementsCategoryEditor::createdLocation() const
{
return m_created_location;
}
/**
- * @brief ElementsCategoryEditor::setUpWidget
- */
+ @brief ElementsCategoryEditor::setUpWidget
+*/
void ElementsCategoryEditor::setUpWidget()
{
QVBoxLayout *editor_layout = new QVBoxLayout();
@@ -125,9 +125,9 @@ void ElementsCategoryEditor::setUpWidget()
}
/**
- * @brief ElementsCategoryEditor::acceptCreation
- * Valid the creation of the category
- */
+ @brief ElementsCategoryEditor::acceptCreation
+ Valid the creation of the category
+*/
void ElementsCategoryEditor::acceptCreation()
{
if (!m_location.isWritable()) {
@@ -176,9 +176,9 @@ void ElementsCategoryEditor::acceptCreation()
}
/**
- * @brief ElementsCategoryEditor::acceptUpdate
- * Valid the update of the category
- */
+ @brief ElementsCategoryEditor::acceptUpdate
+ Valid the update of the category
+*/
void ElementsCategoryEditor::acceptUpdate()
{
if (!m_location.isWritable()) {
diff --git a/sources/elementscategoryeditor.h b/sources/elementscategoryeditor.h
index ae620bea7..aab809c66 100644
--- a/sources/elementscategoryeditor.h
+++ b/sources/elementscategoryeditor.h
@@ -27,9 +27,9 @@ class QDialogButtonBox;
class QLabel;
/**
- * @brief The ElementsCategoryEditor class
- * This class provides a dialog to edit an existing category or create a new one.
- */
+ @brief The ElementsCategoryEditor class
+ This class provides a dialog to edit an existing category or create a new one.
+*/
class ElementsCategoryEditor : public QDialog
{
Q_OBJECT
diff --git a/sources/elementscollectioncache.cpp b/sources/elementscollectioncache.cpp
index 0b293d426..3c8189dfc 100644
--- a/sources/elementscollectioncache.cpp
+++ b/sources/elementscollectioncache.cpp
@@ -150,14 +150,14 @@ QString ElementsCollectionCache::pixmapStorageFormat() const {
}
/**
- * @brief ElementsCollectionCache::fetchElement
- * Retrieve the data for a given element, using the cache if available,
- * filling it otherwise. Data are then available through pixmap() and name() methods.
- * @param location The definition of an element.
- * @see pixmap()
- * @see name()
- * @return True if the retrieval succeeded, false otherwise.
- */
+ @brief ElementsCollectionCache::fetchElement
+ Retrieve the data for a given element, using the cache if available,
+ filling it otherwise. Data are then available through pixmap() and name() methods.
+ @param location The definition of an element.
+ @see pixmap()
+ @see name()
+ @return True if the retrieval succeeded, false otherwise.
+*/
bool ElementsCollectionCache::fetchElement(ElementsLocation &location)
{
// can we use the cache with this element?
@@ -222,13 +222,13 @@ bool ElementsCollectionCache::fetchData(const ElementsLocation &location) {
}
/**
- * @brief ElementsCollectionCache::fetchNameFromCache
- * Retrieve the name for an element, given its path and uuid
- * The value is then available through the name() method.
- * @param path : Element path (as obtained using ElementsLocation::toString())
- * @param uuid : Element uuid
- * @return True if the retrieval succeeded, false otherwise.
- */
+ @brief ElementsCollectionCache::fetchNameFromCache
+ Retrieve the name for an element, given its path and uuid
+ The value is then available through the name() method.
+ @param path : Element path (as obtained using ElementsLocation::toString())
+ @param uuid : Element uuid
+ @return True if the retrieval succeeded, false otherwise.
+*/
bool ElementsCollectionCache::fetchNameFromCache(const QString &path, const QUuid &uuid)
{
select_name_ -> bindValue(":path", path);
@@ -250,13 +250,13 @@ bool ElementsCollectionCache::fetchNameFromCache(const QString &path, const QUui
}
/**
- * @brief ElementsCollectionCache::fetchPixmapFromCache
- * Retrieve the pixmap for an element, given its path and uuid.
- * It is then available through the pixmap() method.
- * @param path : Element path (as obtained using ElementsLocation::toString())
- * @param uuid : Element uuid
- * @return True if the retrieval succeeded, false otherwise.
- */
+ @brief ElementsCollectionCache::fetchPixmapFromCache
+ Retrieve the pixmap for an element, given its path and uuid.
+ It is then available through the pixmap() method.
+ @param path : Element path (as obtained using ElementsLocation::toString())
+ @param uuid : Element uuid
+ @return True if the retrieval succeeded, false otherwise.
+*/
bool ElementsCollectionCache::fetchPixmapFromCache(const QString &path, const QUuid &uuid)
{
select_pixmap_ -> bindValue(":path", path);
@@ -280,13 +280,13 @@ bool ElementsCollectionCache::fetchPixmapFromCache(const QString &path, const QU
}
/**
- * @brief ElementsCollectionCache::cacheName
- * Cache the current (i.e. last retrieved) name The cache entry will use the locale set via setLocale().
- * @param path : Element path (as obtained using ElementsLocation::toString())
- * @param uuid :Element uuid
- * @return True if the caching succeeded, false otherwise.
- * @see name()
- */
+ @brief ElementsCollectionCache::cacheName
+ Cache the current (i.e. last retrieved) name The cache entry will use the locale set via setLocale().
+ @param path : Element path (as obtained using ElementsLocation::toString())
+ @param uuid :Element uuid
+ @return True if the caching succeeded, false otherwise.
+ @see name()
+*/
bool ElementsCollectionCache::cacheName(const QString &path, const QUuid &uuid)
{
insert_name_ -> bindValue(":path", path);
@@ -302,13 +302,13 @@ bool ElementsCollectionCache::cacheName(const QString &path, const QUuid &uuid)
}
/**
- * @brief ElementsCollectionCache::cachePixmap
- * Cache the current (i.e. last retrieved) pixmap
- * @param path : Element path (as obtained using ElementsLocation::toString())
- * @param uuid : Element uuid
- * @return True if the caching succeeded, false otherwise.
- * @see pixmap()
- */
+ @brief ElementsCollectionCache::cachePixmap
+ Cache the current (i.e. last retrieved) pixmap
+ @param path : Element path (as obtained using ElementsLocation::toString())
+ @param uuid : Element uuid
+ @return True if the caching succeeded, false otherwise.
+ @see pixmap()
+*/
bool ElementsCollectionCache::cachePixmap(const QString &path, const QUuid &uuid)
{
QByteArray ba;
diff --git a/sources/elementsmover.cpp b/sources/elementsmover.cpp
index 3452f427f..a1a144e06 100644
--- a/sources/elementsmover.cpp
+++ b/sources/elementsmover.cpp
@@ -28,8 +28,8 @@
#include "elementtextitemgroup.h"
/**
- * @brief ElementsMover::ElementsMover Constructor
- */
+ @brief ElementsMover::ElementsMover Constructor
+*/
ElementsMover::ElementsMover() :
movement_running_(false),
current_movement_(),
@@ -41,27 +41,27 @@ ElementsMover::ElementsMover() :
}
/**
- * @brief ElementsMover::~ElementsMover Destructor
- */
+ @brief ElementsMover::~ElementsMover Destructor
+*/
ElementsMover::~ElementsMover() {
}
/**
- * @brief ElementsMover::isReady
- * @return True if this element mover is ready to be used.
- * A element mover is ready when the previous managed movement is finish.
- */
+ @brief ElementsMover::isReady
+ @return True if this element mover is ready to be used.
+ A element mover is ready when the previous managed movement is finish.
+*/
bool ElementsMover::isReady() const {
return(!movement_running_);
}
/**
- * @brief ElementsMover::beginMovement
- * Start a new movement
- * @param diagram diagram where the movement is applied
- * @param driver_item item moved by mouse and don't be moved by Element mover
- * @return the numbers of items to be moved or -1 if movement can't be init.
- */
+ @brief ElementsMover::beginMovement
+ Start a new movement
+ @param diagram diagram where the movement is applied
+ @param driver_item item moved by mouse and don't be moved by Element mover
+ @return the numbers of items to be moved or -1 if movement can't be init.
+*/
int ElementsMover::beginMovement(Diagram *diagram, QGraphicsItem *driver_item)
{
// They must be no movement in progress
@@ -88,7 +88,7 @@ int ElementsMover::beginMovement(Diagram *diagram, QGraphicsItem *driver_item)
}
}
- QList etig_list = m_moved_content.m_texts_groups.values();
+ QList etig_list = m_moved_content.m_texts_groups.values();
for(ElementTextItemGroup *etig : etig_list) {
if (m_moved_content.m_elements.contains(etig->parentElement())) {
m_moved_content.m_texts_groups.remove(etig);
@@ -105,10 +105,10 @@ int ElementsMover::beginMovement(Diagram *diagram, QGraphicsItem *driver_item)
}
/**
- * @brief ElementsMover::continueMovement
- * Add a move to the current movement.
- * @param movement movement to applied
- */
+ @brief ElementsMover::continueMovement
+ Add a move to the current movement.
+ @param movement movement to applied
+*/
void ElementsMover::continueMovement(const QPointF &movement)
{
if (!movement_running_ || movement.isNull()) return;
@@ -142,11 +142,11 @@ void ElementsMover::continueMovement(const QPointF &movement)
}
/**
- * @brief ElementsMover::endMovement
- * Ended the current movement by creating an undo added to the undostack of the diagram.
- * If there is only one element moved, we try to auto-connect new conductor from this element
- * and other possible element.
- */
+ @brief ElementsMover::endMovement
+ Ended the current movement by creating an undo added to the undostack of the diagram.
+ If there is only one element moved, we try to auto-connect new conductor from this element
+ and other possible element.
+*/
void ElementsMover::endMovement()
{
// A movement must be inited
diff --git a/sources/elementspanel.cpp b/sources/elementspanel.cpp
index 6b66b740c..f855ccc08 100644
--- a/sources/elementspanel.cpp
+++ b/sources/elementspanel.cpp
@@ -186,10 +186,10 @@ bool ElementsPanel::matchesFilter(const QTreeWidgetItem *item, const QString& fi
}
/**
- * @brief ElementsPanel::reload
- * Reload the elements tree
- * @param reload_collections true for read all collections since their sources (files, projects ...)
- */
+ @brief ElementsPanel::reload
+ Reload the elements tree
+ @param reload_collections true for read all collections since their sources (files, projects ...)
+*/
void ElementsPanel::reload(bool reload_collections) {
Q_UNUSED(reload_collections);
diff --git a/sources/elementspanelwidget.cpp b/sources/elementspanelwidget.cpp
index e3a7a3ed4..b93fc00db 100644
--- a/sources/elementspanelwidget.cpp
+++ b/sources/elementspanelwidget.cpp
@@ -43,19 +43,19 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) {
elements_panel = new ElementsPanel(this);
// initialise les actions
- open_directory = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this);
- copy_path = new QAction(QET::Icons::IC_CopyFile, tr("Copier le chemin"), this);
- prj_activate = new QAction(QET::Icons::ProjectFile, tr("Basculer vers ce projet"), this);
- prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this);
- prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this);
- prj_prop_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this);
- prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this);
- prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer ce folio"), this);
- prj_move_diagram_up = new QAction(QET::Icons::GoUp, tr("Remonter ce folio"), this);
- prj_move_diagram_down = new QAction(QET::Icons::GoDown, tr("Abaisser ce folio"), this);
- prj_move_diagram_upx10 = new QAction(QET::Icons::GoUpDouble, tr("Remonter ce folio x10"), this);
- prj_move_diagram_top = new QAction(QET::Icons::GoTop, tr("Remonter ce folio au debut"), this);
- prj_move_diagram_downx10 = new QAction(QET::Icons::GoDownDouble, tr("Abaisser ce folio x10"), this);
+ open_directory = new QAction(QET::Icons::FolderOpen, tr("Ouvrir le dossier correspondant"), this);
+ copy_path = new QAction(QET::Icons::IC_CopyFile, tr("Copier le chemin"), this);
+ prj_activate = new QAction(QET::Icons::ProjectFile, tr("Basculer vers ce projet"), this);
+ prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this);
+ prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propriétés du projet"), this);
+ prj_prop_diagram = new QAction(QET::Icons::DialogInformation, tr("Propriétés du folio"), this);
+ prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un folio"), this);
+ prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer ce folio"), this);
+ prj_move_diagram_up = new QAction(QET::Icons::GoUp, tr("Remonter ce folio"), this);
+ prj_move_diagram_down = new QAction(QET::Icons::GoDown, tr("Abaisser ce folio"), this);
+ prj_move_diagram_upx10 = new QAction(QET::Icons::GoUpDouble, tr("Remonter ce folio x10"), this);
+ prj_move_diagram_top = new QAction(QET::Icons::GoTop, tr("Remonter ce folio au debut"), this);
+ prj_move_diagram_downx10 = new QAction(QET::Icons::GoDownDouble, tr("Abaisser ce folio x10"), this);
tbt_add = new QAction(QET::Icons::TitleBlock, tr("Nouveau modèle"), this);
tbt_edit = new QAction(QET::Icons::TitleBlock, tr("Éditer ce modèle"), this);
tbt_remove = new QAction(QET::Icons::TitleBlock, tr("Supprimer ce modèle"), this);
@@ -215,7 +215,7 @@ void ElementsPanelWidget::deleteDiagram() {
/**
Emet le signal requestForDiagramMoveUpTop avec le schema selectionne
-+ */
++*/
void ElementsPanelWidget::moveDiagramUpTop() {
if (Diagram *selected_diagram = elements_panel -> selectedDiagram()) {
emit(requestForDiagramMoveUpTop(selected_diagram));
diff --git a/sources/elementtextpattern.cpp b/sources/elementtextpattern.cpp
index b1253f948..22d2da5ae 100644
--- a/sources/elementtextpattern.cpp
+++ b/sources/elementtextpattern.cpp
@@ -35,10 +35,10 @@
#include
/**
- * @brief ExportElementTextPattern::ExportElementTextPattern
- * Constructor
- * @param elmt
- */
+ @brief ExportElementTextPattern::ExportElementTextPattern
+ Constructor
+ @param elmt
+*/
ExportElementTextPattern::ExportElementTextPattern(Element *elmt) :
m_element(elmt)
{
@@ -74,10 +74,10 @@ ExportElementTextPattern::ExportElementTextPattern(Element *elmt) :
}
/**
- * @brief ExportElementTextConf::getName
- * Open a dialog to let user set the name of the conf and return it
- * @return
- */
+ @brief ExportElementTextConf::getName
+ Open a dialog to let user set the name of the conf and return it
+ @return
+*/
QString ExportElementTextPattern::getName(bool &ok) const
{
QString text = QInputDialog::getText(parentWidget(),
@@ -159,11 +159,11 @@ ImportElementTextPattern::ImportElementTextPattern(Element *elmt):
}
/**
- * @brief ImportElementTextPattern::getName
- * Open a dialog to let user select a conf
- * @param ok
- * @return
- */
+ @brief ImportElementTextPattern::getName
+ Open a dialog to let user select a conf
+ @param ok
+ @return
+*/
QString ImportElementTextPattern::getName(const QStringList& list, bool *ok, bool *erase) const
{
return ImportElementTextPatternDialog::getItem(parentWidget(),
@@ -185,11 +185,11 @@ QWidget *ImportElementTextPattern::parentWidget() const
/**
- * @brief ImportElementTextPattern::apply
- * Apply the user choice
- * @param name : the name of the selected pattern
- * @param erase : erase the existing texts and groups of element.
- */
+ @brief ImportElementTextPattern::apply
+ Apply the user choice
+ @param name : the name of the selected pattern
+ @param erase : erase the existing texts and groups of element.
+*/
void ImportElementTextPattern::apply(QString name, bool erase) const
{
if(!name.endsWith(".xml"))
diff --git a/sources/elementtextsmover.cpp b/sources/elementtextsmover.cpp
index 878255199..cb3cca76f 100644
--- a/sources/elementtextsmover.cpp
+++ b/sources/elementtextsmover.cpp
@@ -23,26 +23,26 @@
#include
/**
- * @brief ElementTextsMover::ElementTextsMover
- */
+ @brief ElementTextsMover::ElementTextsMover
+*/
ElementTextsMover::ElementTextsMover() {}
/**
- * @brief ElementTextsMover::isReady
- * @return true if this ElementTextsMover is ready to process a new movement.
- * False if this ElementTextsMover is actually process a movement
- */
+ @brief ElementTextsMover::isReady
+ @return true if this ElementTextsMover is ready to process a new movement.
+ False if this ElementTextsMover is actually process a movement
+*/
bool ElementTextsMover::isReady() const {
return(!m_movement_running);
}
/**
- * @brief ElementTextsMover::beginMovement
- * Begin a movement
- * @param diagram : diagram where the movement is apply
- * @param driver_item : item moved by the mouse
- * @return : the number of moved text (driver_item include), or -1 if this ElementTextsMover can't begin a movement
- */
+ @brief ElementTextsMover::beginMovement
+ Begin a movement
+ @param diagram : diagram where the movement is apply
+ @param driver_item : item moved by the mouse
+ @return : the number of moved text (driver_item include), or -1 if this ElementTextsMover can't begin a movement
+*/
int ElementTextsMover::beginMovement(Diagram *diagram, QGraphicsItem *driver_item)
{
if (m_movement_running || !diagram)
@@ -101,9 +101,9 @@ void ElementTextsMover::continueMovement(QGraphicsSceneMouseEvent *event)
}
/**
- * @brief ElementTextsMover::endMovement
- * Finish the movement by pushing an undo command to the parent diagram of text item
- */
+ @brief ElementTextsMover::endMovement
+ Finish the movement by pushing an undo command to the parent diagram of text item
+*/
void ElementTextsMover::endMovement()
{
//No movement or no items to move
diff --git a/sources/exportdialog.cpp b/sources/exportdialog.cpp
index 09cfc997e..2c98645b2 100644
--- a/sources/exportdialog.cpp
+++ b/sources/exportdialog.cpp
@@ -399,7 +399,11 @@ void ExportDialog::generateSvg(Diagram *diagram, int width, int height, bool kee
@param keep_aspect_ratio True pour conserver le ratio, false sinon
@param io_device Peripherique de sortie pour le code DXF (souvent : un fichier)
*/
-void ExportDialog::generateDxf(Diagram *diagram, int width, int height, bool keep_aspect_ratio, QString &file_path) {
+void ExportDialog::generateDxf(Diagram *diagram,
+ int width,
+ int height,
+ bool keep_aspect_ratio,
+ QString &file_path) {
saveReloadDiagramParameters(diagram, true);
width -= 2*Diagram::margin;
@@ -651,7 +655,11 @@ void ExportDialog::generateDxf(Diagram *diagram, int width, int height, bool kee
saveReloadDiagramParameters(diagram, false);
}
-QPointF ExportDialog::rotation_transformed(qreal px, qreal py , qreal origin_x, qreal origin_y, qreal angle) {
+QPointF ExportDialog::rotation_transformed(qreal px,
+ qreal py,
+ qreal origin_x,
+ qreal origin_y,
+ qreal angle) {
angle *= -3.14159265 / 180;
diff --git a/sources/exportproperties.cpp b/sources/exportproperties.cpp
index 45265cf52..2dadaa24d 100644
--- a/sources/exportproperties.cpp
+++ b/sources/exportproperties.cpp
@@ -83,9 +83,9 @@ void ExportProperties::fromSettings(QSettings &settings, const QString &prefix)
}
/**
- * @brief ExportProperties::defaultProperties
- * @return the default properties stored in the setting file
- */
+ @brief ExportProperties::defaultProperties
+ @return the default properties stored in the setting file
+*/
ExportProperties ExportProperties::defaultExportProperties()
{
QSettings settings;
@@ -97,9 +97,9 @@ ExportProperties ExportProperties::defaultExportProperties()
}
/**
- * @brief ExportProperties::defaultPrintProperties
- * @return the default properties stored in the setting file
- */
+ @brief ExportProperties::defaultPrintProperties
+ @return the default properties stored in the setting file
+*/
ExportProperties ExportProperties::defaultPrintProperties()
{
QSettings settings;
diff --git a/sources/factory/elementfactory.cpp b/sources/factory/elementfactory.cpp
index 6246b6ac6..c41c4e097 100644
--- a/sources/factory/elementfactory.cpp
+++ b/sources/factory/elementfactory.cpp
@@ -25,12 +25,12 @@
ElementFactory* ElementFactory::factory_ = nullptr;
/**
- * @brief ElementFactory::createElement
- * @param location create element at this location
- * @param qgi parent item for this elemnt
- * @param state state of the creation
- * @return the element or 0
- */
+ @brief ElementFactory::createElement
+ @param location create element at this location
+ @param qgi parent item for this elemnt
+ @param state state of the creation
+ @return the element or 0
+*/
Element * ElementFactory::createElement(const ElementsLocation &location, QGraphicsItem *qgi, int *state)
{
if (Q_UNLIKELY( !(location.isElement() && location.exist()) ))
diff --git a/sources/factory/elementfactory.h b/sources/factory/elementfactory.h
index 9dc4a36df..9d5d71889 100644
--- a/sources/factory/elementfactory.h
+++ b/sources/factory/elementfactory.h
@@ -25,12 +25,11 @@ class ElementsLocation;
class QGraphicsItem;
/**
- * @brief The ElementFactory class
- *this class is a pattern factory and also a singleton factory.
- *this class create new instance of herited class element like
- *simple element or report element.
- *
- */
+ @brief The ElementFactory class
+ this class is a pattern factory and also a singleton factory.
+ this class create new instance of herited class element like
+ simple element or report element.
+*/
class ElementFactory
{
//methods for singleton pattern
diff --git a/sources/factory/elementpicturefactory.cpp b/sources/factory/elementpicturefactory.cpp
index 2cb0b11bc..2529cbe96 100644
--- a/sources/factory/elementpicturefactory.cpp
+++ b/sources/factory/elementpicturefactory.cpp
@@ -32,13 +32,13 @@
ElementPictureFactory* ElementPictureFactory::m_factory = nullptr;
/**
- * @brief ElementPictureFactory::getPictures
- * Set the picture of the element at location.
- * Note, picture can be null
- * @param location
- * @param picture
- * @param low_picture
- */
+ @brief ElementPictureFactory::getPictures
+ Set the picture of the element at location.
+ Note, picture can be null
+ @param location
+ @param picture
+ @param low_picture
+*/
void ElementPictureFactory::getPictures(const ElementsLocation &location, QPicture &picture, QPicture &low_picture)
{
if(!location.exist()) {
@@ -68,11 +68,11 @@ void ElementPictureFactory::getPictures(const ElementsLocation &location, QPictu
}
/**
- * @brief ElementPictureFactory::pixmap
- * @param location
- * @return the pixmap of the element at @location
- * Note pixmap can be null
- */
+ @brief ElementPictureFactory::pixmap
+ @param location
+ @return the pixmap of the element at @location
+ Note pixmap can be null
+*/
QPixmap ElementPictureFactory::pixmap(const ElementsLocation &location)
{
QUuid uuid = location.uuid();
@@ -113,10 +113,10 @@ QPixmap ElementPictureFactory::pixmap(const ElementsLocation &location)
/**
- * @brief ElementPictureFactory::getPrimitives
- * @param location
- * @return The primtive used to draw the element at @location
- */
+ @brief ElementPictureFactory::getPrimitives
+ @param location
+ @return The primtive used to draw the element at @location
+*/
ElementPictureFactory::primitives ElementPictureFactory::getPrimitives(const ElementsLocation &location)
{
if(!m_primitives_H.contains(location.uuid()))
@@ -132,15 +132,15 @@ ElementPictureFactory::~ElementPictureFactory() {
}
/**
- * @brief ElementPictureFactory::build
- * Build the picture from location.
- * @param location
- * @param picture
- * @param low_picture
- * if @picture and/or @low_picture are not null this function draw on it and don't store it.
- * if null, this function create a QPicture for normal and low zoom, draw on it and store it in m_pictures_H and m_low_pictures_H
- * @return
- */
+ @brief ElementPictureFactory::build
+ Build the picture from location.
+ @param location
+ @param picture
+ @param low_picture
+ if @picture and/or @low_picture are not null this function draw on it and don't store it.
+ if null, this function create a QPicture for normal and low zoom, draw on it and store it in m_pictures_H and m_low_pictures_H
+ @return
+*/
bool ElementPictureFactory::build(const ElementsLocation &location, QPicture *picture, QPicture *low_picture)
{
QDomElement dom = location.xml();
@@ -542,11 +542,11 @@ void ElementPictureFactory::parseText(const QDomElement &dom, QPainter &painter,
}
/**
- * @brief ElementPictureFactory::setPainterStyle
- * apply the style store in dom to painter.
- * @param dom
- * @param painter
- */
+ @brief ElementPictureFactory::setPainterStyle
+ apply the style store in dom to painter.
+ @param dom
+ @param painter
+*/
void ElementPictureFactory::setPainterStyle(const QDomElement &dom, QPainter &painter) const
{
QPen pen = painter.pen();
diff --git a/sources/factory/elementpicturefactory.h b/sources/factory/elementpicturefactory.h
index 811cf99fb..03b80417b 100644
--- a/sources/factory/elementpicturefactory.h
+++ b/sources/factory/elementpicturefactory.h
@@ -30,10 +30,10 @@ class QPainter;
class QGraphicsSimpleTextItem;
/**
- * @brief The ElementPictureFactory class
- * This class is singleton factory, use
- * to create and get the picture use by elements
- */
+ @brief The ElementPictureFactory class
+ This class is singleton factory, use
+ to create and get the picture use by elements
+*/
class ElementPictureFactory
{
public :
@@ -49,9 +49,9 @@ class ElementPictureFactory
/**
- * @brief instance
- * @return The instance of the factory
- */
+ @brief instance
+ @return The instance of the factory
+ */
static ElementPictureFactory* instance()
{
static QMutex mutex;
@@ -67,9 +67,9 @@ class ElementPictureFactory
}
/**
- * @brief dropInstance
- * Drop the instance of factory
- */
+ @brief dropInstance
+ Drop the instance of factory
+ */
static void dropInstance()
{
static QMutex mutex;
diff --git a/sources/factory/propertieseditorfactory.cpp b/sources/factory/propertieseditorfactory.cpp
index 6966fec09..cf4f7c36f 100644
--- a/sources/factory/propertieseditorfactory.cpp
+++ b/sources/factory/propertieseditorfactory.cpp
@@ -36,12 +36,12 @@
#include "projectdbmodel.h"
/**
- * @brief PropertiesEditorFactory::propertiesEditor
- * @param model : the model to be edited
- * @param editor : if the properties editor to be created is the same class as @editor, the this function set @item as edited item of @editor and return editor
- * @param parent : parent widget of the returned editor
- * @return an editor or nullptr
- */
+ @brief PropertiesEditorFactory::propertiesEditor
+ @param model : the model to be edited
+ @param editor : if the properties editor to be created is the same class as @editor, the this function set @item as edited item of @editor and return editor
+ @param parent : parent widget of the returned editor
+ @return an editor or nullptr
+*/
PropertiesEditorWidget *PropertiesEditorFactory::propertiesEditor(QAbstractItemModel *model, PropertiesEditorWidget *editor, QWidget *parent)
{
Q_UNUSED(model)
diff --git a/sources/factory/propertieseditorfactory.h b/sources/factory/propertieseditorfactory.h
index 986af0c55..1e194bf70 100644
--- a/sources/factory/propertieseditorfactory.h
+++ b/sources/factory/propertieseditorfactory.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef PROPERTIESEDITORFACTORY_H
#define PROPERTIESEDITORFACTORY_H
diff --git a/sources/factory/qetgraphicstablefactory.cpp b/sources/factory/qetgraphicstablefactory.cpp
index a24d5288e..9a85d1e2f 100644
--- a/sources/factory/qetgraphicstablefactory.cpp
+++ b/sources/factory/qetgraphicstablefactory.cpp
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#include "qetgraphicstablefactory.h"
#include "qetgraphicstableitem.h"
@@ -34,11 +34,11 @@ QetGraphicsTableFactory::QetGraphicsTableFactory()
}
/**
- * @brief QetGraphicsTableFactory::createAndAddNomenclature
- * Open a dialog for ask user the config of the table ,create a nomenclature table
- * and add it to diagram @diagram;
- * @param diagram
- */
+ @brief QetGraphicsTableFactory::createAndAddNomenclature
+ Open a dialog for ask user the config of the table ,create a nomenclature table
+ and add it to diagram @diagram;
+ @param diagram
+*/
void QetGraphicsTableFactory::createAndAddNomenclature(Diagram *diagram)
{
QScopedPointer d(new AddTableDialog(new ElementQueryWidget(), diagram->views().first()));
@@ -50,11 +50,11 @@ void QetGraphicsTableFactory::createAndAddNomenclature(Diagram *diagram)
}
/**
- * @brief QetGraphicsTableFactory::createAndAddSummary
- * Open a dialog for ask user the config of the table ,create a summary table
- * and add it to diagram @diagram;
- * @param diagram
- */
+ @brief QetGraphicsTableFactory::createAndAddSummary
+ Open a dialog for ask user the config of the table ,create a summary table
+ and add it to diagram @diagram;
+ @param diagram
+*/
void QetGraphicsTableFactory::createAndAddSummary(Diagram *diagram)
{
QScopedPointer d(new AddTableDialog(new SummaryQueryWidget(), diagram->views().first()));
@@ -104,14 +104,14 @@ void QetGraphicsTableFactory::create(Diagram *diagram, AddTableDialog *dialog)
}
/**
- * @brief QetGraphicsTableFactory::newTable
- * Create a new table .
- * @param diagram : Diagram where we must add the new table.
- * @param dialog : dialog conf, it's used to setup the model.
- * @param previous_table : If you know that the new table will have a previous table and you already now the previous table,
- * set it now they will improve time needed for creating the new table by avoiding to create a new model.
- * @return the new table
- */
+ @brief QetGraphicsTableFactory::newTable
+ Create a new table .
+ @param diagram : Diagram where we must add the new table.
+ @param dialog : dialog conf, it's used to setup the model.
+ @param previous_table : If you know that the new table will have a previous table and you already now the previous table,
+ set it now they will improve time needed for creating the new table by avoiding to create a new model.
+ @return the new table
+*/
QetGraphicsTableItem *QetGraphicsTableFactory::newTable(Diagram *diagram, AddTableDialog *dialog, QetGraphicsTableItem *previous_table)
{
auto table = new QetGraphicsTableItem();
diff --git a/sources/factory/qetgraphicstablefactory.h b/sources/factory/qetgraphicstablefactory.h
index 4ad36068b..d39414cc0 100644
--- a/sources/factory/qetgraphicstablefactory.h
+++ b/sources/factory/qetgraphicstablefactory.h
@@ -1,19 +1,19 @@
/*
- Copyright 2006-2020 The QElectroTech Team
- This file is part of QElectroTech.
+ Copyright 2006-2020 The QElectroTech Team
+ This file is part of QElectroTech.
- QElectroTech is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ QElectroTech is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- QElectroTech is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ QElectroTech is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with QElectroTech. If not, see .
+ You should have received a copy of the GNU General Public License
+ along with QElectroTech. If not, see .
*/
#ifndef QETGRAPHICSTABLEFACTORY_H
#define QETGRAPHICSTABLEFACTORY_H
@@ -23,18 +23,21 @@ class QetGraphicsTableItem;
class AddTableDialog;
/**
- * @brief The QetGraphicsTableFactory class
- */
+ @brief The QetGraphicsTableFactory class
+*/
class QetGraphicsTableFactory
{
- public:
- QetGraphicsTableFactory();
+ public:
+ QetGraphicsTableFactory();
- static void createAndAddNomenclature(Diagram *diagram);
+ static void createAndAddNomenclature(Diagram *diagram);
static void createAndAddSummary(Diagram *diagram);
private:
static void create(Diagram *diagram, AddTableDialog *dialog);
- static QetGraphicsTableItem *newTable(Diagram *diagram, AddTableDialog *dialog, QetGraphicsTableItem *previous_table = nullptr);
+ static QetGraphicsTableItem *newTable(
+ Diagram *diagram,
+ AddTableDialog *dialog,
+ QetGraphicsTableItem *previous_table = nullptr);
};
#endif // QETGRAPHICSTABLEFACTORY_H
diff --git a/sources/factory/ui/addtabledialog.cpp b/sources/factory/ui/addtabledialog.cpp
index b50eba5a9..b8296540f 100644
--- a/sources/factory/ui/addtabledialog.cpp
+++ b/sources/factory/ui/addtabledialog.cpp
@@ -24,16 +24,16 @@
#include
/**
- * @brief AddTableDialog::AddTableDialog
- * @param content_widget : the widget to display in the "content" tab.
- * This dialog take ownership of @content_widget.
- * @param parent : parent widget.
- */
+ @brief AddTableDialog::AddTableDialog
+ @param content_widget : the widget to display in the "content" tab.
+ This dialog take ownership of @content_widget.
+ @param parent : parent widget.
+*/
AddTableDialog::AddTableDialog(QWidget *content_widget, QWidget *parent) :
- QDialog(parent),
+ QDialog(parent),
ui(new Ui::AddTableDialog)
{
- ui->setupUi(this);
+ ui->setupUi(this);
ui->m_header_font_pb->setText(m_header_font.family());
ui->m_table_font_pb->setText(m_table_font.family());
m_content_widget = content_widget;
@@ -46,57 +46,57 @@ AddTableDialog::AddTableDialog(QWidget *content_widget, QWidget *parent) :
}
/**
- * @brief AddTableDialog::~AddNomenclatureDialog
- */
+ @brief AddTableDialog::~AddNomenclatureDialog
+*/
AddTableDialog::~AddTableDialog() {
delete ui;
}
/**
- * @brief AddTableDialog::setQueryWidget
- * Not implemented yet
- * @param widget
- */
+ @brief AddTableDialog::setQueryWidget
+ Not implemented yet
+ @param widget
+*/
void AddTableDialog::setQueryWidget(QWidget *widget) {
Q_UNUSED(widget)
}
/**
- * @brief AddTableDialog::adjustTableToFolio
- * @return
- */
+ @brief AddTableDialog::adjustTableToFolio
+ @return
+*/
bool AddTableDialog::adjustTableToFolio() const {
return ui->m_adjust_table_size_cb->isChecked();
}
/**
- * @brief AddTableDialog::addNewTableToNewDiagram
- * @return
- */
+ @brief AddTableDialog::addNewTableToNewDiagram
+ @return
+*/
bool AddTableDialog::addNewTableToNewDiagram() const {
return ui->m_add_table_and_folio->isChecked();
}
/**
- * @brief AddTableDialog::tableName
- * @return
- */
+ @brief AddTableDialog::tableName
+ @return
+*/
QString AddTableDialog::tableName() const {
return ui->m_table_name_le->text();
}
/**
- * @brief AddTableDialog::headerMargins
- * @return
- */
+ @brief AddTableDialog::headerMargins
+ @return
+*/
QMargins AddTableDialog::headerMargins() const {
return m_header_margins;
}
/**
- * @brief AddTableDialog::headerAlignment
- * @return
- */
+ @brief AddTableDialog::headerAlignment
+ @return
+*/
Qt::Alignment AddTableDialog::headerAlignment() const
{
switch (ui->m_header_alignment_cb->currentIndex()) {
@@ -110,25 +110,25 @@ Qt::Alignment AddTableDialog::headerAlignment() const
}
/**
- * @brief AddTableDialog::headerFont
- * @return
- */
+ @brief AddTableDialog::headerFont
+ @return
+*/
QFont AddTableDialog::headerFont() const {
return m_header_font;
}
/**
- * @brief AddTableDialog::tableMargins
- * @return
- */
+ @brief AddTableDialog::tableMargins
+ @return
+*/
QMargins AddTableDialog::tableMargins() const {
return m_table_margins;
}
/**
- * @brief AddTableDialog::tableAlignment
- * @return
- */
+ @brief AddTableDialog::tableAlignment
+ @return
+*/
Qt::Alignment AddTableDialog::tableAlignment() const
{
switch (ui->m_table_alignment_cb->currentIndex()) {
@@ -142,9 +142,9 @@ Qt::Alignment AddTableDialog::tableAlignment() const
}
/**
- * @brief AddTableDialog::tableFont
- * @return
- */
+ @brief AddTableDialog::tableFont
+ @return
+*/
QFont AddTableDialog::tableFont() const {
return m_table_font;
}
diff --git a/sources/factory/ui/addtabledialog.h b/sources/factory/ui/addtabledialog.h
index 484e44d84..4d16795ec 100644
--- a/sources/factory/ui/addtabledialog.h
+++ b/sources/factory/ui/addtabledialog.h
@@ -27,16 +27,16 @@ class AddTableDialog;
}
/**
- * @brief The AddTableDialog class
- * Provide a dialog used to edit the properties of table befor adding to a diagram.
- * The main difference betwen this dialog and the widget used to edit the properties of table
- * is that the dialog have two extra check box.
- * One for adjust the size of the table to diagram
- * Second for add new tables on new folios if the table can't fit into diagram
- */
+ @brief The AddTableDialog class
+ Provide a dialog used to edit the properties of table befor adding to a diagram.
+ The main difference betwen this dialog and the widget used to edit the properties of table
+ is that the dialog have two extra check box.
+ One for adjust the size of the table to diagram
+ Second for add new tables on new folios if the table can't fit into diagram
+*/
class AddTableDialog : public QDialog
{
- Q_OBJECT
+ Q_OBJECT
public:
explicit AddTableDialog(QWidget *content_widget, QWidget *parent = nullptr);
diff --git a/sources/genericpanel.cpp b/sources/genericpanel.cpp
index 54f41d628..d48d63b79 100644
--- a/sources/genericpanel.cpp
+++ b/sources/genericpanel.cpp
@@ -628,7 +628,7 @@ QTreeWidgetItem *GenericPanel::updateTemplateItem(
"used to display a title block template").arg(
tb_template.name()));
QString tbt_whatsthis = tr(
- "Ceci est un modèle de cartouche, qui peut être appliqué à un folio.",
+ "Ceci est un modèle de cartouche, qui peut être appliqué à un folio.",
"\"What's this\" tip"
);
tb_template_qtwi -> setWhatsThis(0, tbt_whatsthis);
diff --git a/sources/machine_info.cpp b/sources/machine_info.cpp
index 37ec10778..77fa4de1f 100644
--- a/sources/machine_info.cpp
+++ b/sources/machine_info.cpp
@@ -258,7 +258,7 @@ void Machine_info::init_get_cpu_info_macos()
/**
@brief Machine_info::i_max_screen_width
@return max screen width
- */
+*/
int32_t Machine_info::i_max_screen_width()
{
return pc.screen.Max_width;
diff --git a/sources/newelementwizard.cpp b/sources/newelementwizard.cpp
index a9cf648f0..65113e8a5 100644
--- a/sources/newelementwizard.cpp
+++ b/sources/newelementwizard.cpp
@@ -55,10 +55,10 @@ NewElementWizard::~NewElementWizard() {
}
/**
- * @brief NewElementWizard::preselectedLocation
- * Select item in the tree view represented by location,
- * @param location
- */
+ @brief NewElementWizard::preselectedLocation
+ Select item in the tree view represented by location,
+ @param location
+*/
void NewElementWizard::preselectedLocation(const ElementsLocation &location)
{
QModelIndex index = m_model->indexFromLocation(location);
@@ -69,9 +69,9 @@ void NewElementWizard::preselectedLocation(const ElementsLocation &location)
}
/**
- * @brief NewElementWizard::buildStep1
- * @return
- */
+ @brief NewElementWizard::buildStep1
+ @return
+*/
QWizardPage *NewElementWizard::buildStep1()
{
QWizardPage *page = new QWizardPage();
@@ -96,9 +96,9 @@ QWizardPage *NewElementWizard::buildStep1()
}
/**
- * @brief NewElementWizard::buildStep2
- * @return
- */
+ @brief NewElementWizard::buildStep2
+ @return
+*/
QWizardPage *NewElementWizard::buildStep2() {
QWizardPage *page = new QWizardPage();
page -> setProperty("WizardState", Filename);
@@ -120,9 +120,9 @@ QWizardPage *NewElementWizard::buildStep2() {
}
/**
- * @brief NewElementWizard::buildStep3
- * @return
- */
+ @brief NewElementWizard::buildStep3
+ @return
+*/
QWizardPage *NewElementWizard::buildStep3() {
QWizardPage *page = new QWizardPage();
page -> setProperty("WizardState", Names);
@@ -141,9 +141,9 @@ QWizardPage *NewElementWizard::buildStep3() {
}
/**
- * @brief NewElementWizard::validateCurrentPage
- * @return true if the current step is valid
- */
+ @brief NewElementWizard::validateCurrentPage
+ @return true if the current step is valid
+*/
bool NewElementWizard::validateCurrentPage()
{
WizardState wizard_state = static_cast(currentPage() -> property("WizardState").toInt());
@@ -166,10 +166,10 @@ bool NewElementWizard::validateCurrentPage()
}
/**
- * @brief NewElementWizard::validStep1
- * Valid the setp 1
- * @return trie if the step is valid.
- */
+ @brief NewElementWizard::validStep1
+ Valid the setp 1
+ @return trie if the step is valid.
+*/
bool NewElementWizard::validStep1()
{
//They must be one directory selected
@@ -198,10 +198,10 @@ bool NewElementWizard::validStep1()
}
/**
- * @brief NewElementWizard::validStep2
- * Valid the step 2
- * @return true if step is valid
- */
+ @brief NewElementWizard::validStep2
+ Valid the step 2
+ @return true if step is valid
+*/
bool NewElementWizard::validStep2() {
QString file_name = m_qle_filename -> text();
@@ -230,9 +230,9 @@ bool NewElementWizard::validStep2() {
}
/**
- * @brief NewElementWizard::createNewElement
- * Lauch an element editor for create the new element
- */
+ @brief NewElementWizard::createNewElement
+ Lauch an element editor for create the new element
+*/
void NewElementWizard::createNewElement() {
QETElementEditor *edit_new_element = new QETElementEditor(parentWidget());
edit_new_element -> setNames(m_names_list -> names());
diff --git a/sources/nomenclature.cpp b/sources/nomenclature.cpp
index 97b315b17..761d9aece 100644
--- a/sources/nomenclature.cpp
+++ b/sources/nomenclature.cpp
@@ -81,10 +81,10 @@ bool nomenclature::saveToCSVFile()
}
/**
- * @brief nomenclature::getNomenclature
- * Create and formated a nomenclature to csv file.
- * @return The QString of nomenclature
- */
+ @brief nomenclature::getNomenclature
+ Create and formated a nomenclature to csv file.
+ @return The QString of nomenclature
+*/
QString nomenclature::getNomenclature()
{
//Process...
@@ -161,10 +161,10 @@ QString nomenclature::getNomenclature()
}
/**
- * @brief nomenclature::getElementInfo
- * @param elmt : the element to getinfo
- * @return : QString with information about element formated to csv file
- */
+ @brief nomenclature::getElementInfo
+ @param elmt : the element to getinfo
+ @return : QString with information about element formated to csv file
+*/
QString nomenclature::getElementInfo(Element *elmt) {
QString info;
diff --git a/sources/nomenclature.h b/sources/nomenclature.h
index 179620330..1fccbef2e 100644
--- a/sources/nomenclature.h
+++ b/sources/nomenclature.h
@@ -31,11 +31,11 @@ class Diagram;
class Element;
/**
- This class represents a nomenclature...
+ This class represents a nomenclature...
*/
class nomenclature
{
- private:
+ private:
QETProject *m_project;
QList m_list_diagram;
QWidget *m_parent;
diff --git a/sources/projectconfigpages.cpp b/sources/projectconfigpages.cpp
index a106209ae..77a3cc86a 100644
--- a/sources/projectconfigpages.cpp
+++ b/sources/projectconfigpages.cpp
@@ -204,7 +204,7 @@ void ProjectMainConfigPage::readValuesFromProject() {
/**
Set the content of this page read only if the project is read only,
editable if the project is editable.
- */
+*/
void ProjectMainConfigPage::adjustReadOnly() {
bool is_read_only = m_project -> isReadOnly();
title_value_ -> setReadOnly(is_read_only);
@@ -213,11 +213,11 @@ void ProjectMainConfigPage::adjustReadOnly() {
//######################################################################################//
/**
- * @brief ProjectAutoNumConfigPage::ProjectAutoNumConfigPage
- * Default constructor
- * @param project, project to edit
- * @param parent, parent widget
- */
+ @brief ProjectAutoNumConfigPage::ProjectAutoNumConfigPage
+ Default constructor
+ @param project, project to edit
+ @param parent, parent widget
+*/
ProjectAutoNumConfigPage::ProjectAutoNumConfigPage (QETProject *project, QWidget *parent) :
ProjectConfigPage(project, parent)
{
@@ -227,32 +227,32 @@ ProjectAutoNumConfigPage::ProjectAutoNumConfigPage (QETProject *project, QWidget
}
/**
- * @brief ProjectAutoNumConfigPage::title
- * Title of this config page
- * @return
- */
+ @brief ProjectAutoNumConfigPage::title
+ Title of this config page
+ @return
+*/
QString ProjectAutoNumConfigPage::title() const {
- return tr("Numérotation auto");
+ return tr("Numérotation auto");
}
/**
- * @brief ProjectAutoNumConfigPage::icon
- * Icon of this config pafe
- * @return
- */
+ @brief ProjectAutoNumConfigPage::icon
+ Icon of this config pafe
+ @return
+*/
QIcon ProjectAutoNumConfigPage::icon() const {
return QIcon (QET::Icons::AutoNum);
}
/**
- * @brief ProjectAutoNumConfigPage::applyProjectConf
- */
+ @brief ProjectAutoNumConfigPage::applyProjectConf
+*/
void ProjectAutoNumConfigPage::applyProjectConf() {}
/**
- * @brief ProjectAutoNumConfigPage::initWidgets
- * Init some widget of this page
- */
+ @brief ProjectAutoNumConfigPage::initWidgets
+ Init some widget of this page
+*/
void ProjectAutoNumConfigPage::initWidgets()
{
QTabWidget *tab_widget = new QTabWidget(this);
@@ -263,19 +263,19 @@ void ProjectAutoNumConfigPage::initWidgets()
//Conductor tab
m_saw_conductor = new SelectAutonumW(1);
- tab_widget->addTab(m_saw_conductor, tr("Conducteurs"));
+ tab_widget->addTab(m_saw_conductor, tr("Conducteurs"));
//Element tab
m_saw_element = new SelectAutonumW(0);
- tab_widget->addTab(m_saw_element, tr("Eléments"));
+ tab_widget->addTab(m_saw_element, tr("Eléments"));
//Folio Tab
m_saw_folio = new SelectAutonumW(2);
- tab_widget->addTab(m_saw_folio, tr("Folios"));
+ tab_widget->addTab(m_saw_folio, tr("Folios"));
//AutoNumbering Tab
m_faw = new FolioAutonumberingW(project());
- tab_widget->addTab(m_faw, tr("Numérotation auto des folios"));
+ tab_widget->addTab(m_faw, tr("Numérotation auto des folios"));
QHBoxLayout *main_layout = new QHBoxLayout();
main_layout->addWidget(tab_widget);
@@ -283,9 +283,9 @@ void ProjectAutoNumConfigPage::initWidgets()
}
/**
- * @brief ProjectAutoNumConfigPage::readValuesFromProject
- * Read value stored on project, and update display
- */
+ @brief ProjectAutoNumConfigPage::readValuesFromProject
+ Read value stored on project, and update display
+*/
void ProjectAutoNumConfigPage::readValuesFromProject()
{
//Conductor Tab
@@ -305,16 +305,16 @@ void ProjectAutoNumConfigPage::readValuesFromProject()
}
/**
- * @brief ProjectAutoNumConfigPage::adjustReadOnly
- * set this config page disable if project is read only
- */
+ @brief ProjectAutoNumConfigPage::adjustReadOnly
+ set this config page disable if project is read only
+*/
void ProjectAutoNumConfigPage::adjustReadOnly() {
}
/**
- * @brief ProjectAutoNumConfigPage::buildConnections
- * setup some connections
- */
+ @brief ProjectAutoNumConfigPage::buildConnections
+ setup some connections
+*/
void ProjectAutoNumConfigPage::buildConnections()
{
//Management Tab
@@ -340,30 +340,30 @@ void ProjectAutoNumConfigPage::buildConnections()
}
/**
- * @brief ProjectAutoNumConfigPage::updateContext_conductor
- * Display the current selected context for conductor
- * @param str, key of context stored in project
- */
+ @brief ProjectAutoNumConfigPage::updateContext_conductor
+ Display the current selected context for conductor
+ @param str, key of context stored in project
+*/
void ProjectAutoNumConfigPage::updateContextConductor(const QString& str) {
if (str == tr("Nom de la nouvelle numérotation")) m_saw_conductor -> setContext(NumerotationContext());
else m_saw_conductor ->setContext(m_project->conductorAutoNum(str));
}
/**
- * @brief ProjectAutoNumConfigPage::updateContext_folio
- * Display the current selected context for folio
- * @param str, key of context stored in project
- */
+ @brief ProjectAutoNumConfigPage::updateContext_folio
+ Display the current selected context for folio
+ @param str, key of context stored in project
+*/
void ProjectAutoNumConfigPage::updateContextFolio(const QString& str) {
if (str == tr("Nom de la nouvelle numérotation")) m_saw_folio -> setContext(NumerotationContext());
else m_saw_folio ->setContext(m_project->folioAutoNum(str));
}
/**
- * @brief ProjectAutoNumConfigPage::updateContextElement
- * Display the current selected context for element
- * @param str, key of context stored in project
- */
+ @brief ProjectAutoNumConfigPage::updateContextElement
+ Display the current selected context for element
+ @param str, key of context stored in project
+*/
void ProjectAutoNumConfigPage::updateContextElement(const QString& str)
{
if (str == tr("Nom de la nouvelle numérotation"))
@@ -377,9 +377,9 @@ void ProjectAutoNumConfigPage::updateContextElement(const QString& str)
}
/**
- * @brief ProjectAutoNumConfigPage::saveContextElement
- * Save the current displayed Element formula in project
- */
+ @brief ProjectAutoNumConfigPage::saveContextElement
+ Save the current displayed Element formula in project
+*/
void ProjectAutoNumConfigPage::saveContextElement()
{
// If the text is the default text "Name of new numerotation" save the edited context
@@ -408,9 +408,9 @@ void ProjectAutoNumConfigPage::saveContextElement()
}
/**
- * @brief ProjectAutoNumConfigPage::removeContextElement
- * Remove from project the current element numerotation context
- */
+ @brief ProjectAutoNumConfigPage::removeContextElement
+ Remove from project the current element numerotation context
+*/
void ProjectAutoNumConfigPage::removeContextElement()
{
//if default text, return
@@ -421,9 +421,9 @@ void ProjectAutoNumConfigPage::removeContextElement()
}
/**
- * @brief ProjectAutoNumConfigPage::saveContext_conductor
- * Save the current displayed conductor context in project
- */
+ @brief ProjectAutoNumConfigPage::saveContext_conductor
+ Save the current displayed conductor context in project
+*/
void ProjectAutoNumConfigPage::saveContextConductor()
{
// If the text is the default text "Name of new numerotation" save the edited context
@@ -451,9 +451,9 @@ void ProjectAutoNumConfigPage::saveContextConductor()
}
/**
- * @brief ProjectAutoNumConfigPage::saveContext_folio
- * Save the current displayed folio context in project
- */
+ @brief ProjectAutoNumConfigPage::saveContext_folio
+ Save the current displayed folio context in project
+*/
void ProjectAutoNumConfigPage::saveContextFolio() {
// If the text is the default text "Name of new numerotation" save the edited context
// With the the name "No name"
@@ -474,9 +474,9 @@ void ProjectAutoNumConfigPage::saveContextFolio() {
}
/**
- * @brief ProjectAutoNumConfigPage::applyAutoNum
- * Apply auto folio numbering, New Folios or Selected Folios
- */
+ @brief ProjectAutoNumConfigPage::applyAutoNum
+ Apply auto folio numbering, New Folios or Selected Folios
+*/
void ProjectAutoNumConfigPage::applyAutoNum() {
if (m_faw->newFolios){
@@ -498,9 +498,9 @@ void ProjectAutoNumConfigPage::applyAutoNum() {
}
/**
- * @brief ProjectAutoNumConfigPage::applyAutoManagement
- * Apply Management Options in Selected Folios
- */
+ @brief ProjectAutoNumConfigPage::applyAutoManagement
+ Apply Management Options in Selected Folios
+*/
void ProjectAutoNumConfigPage::applyManagement() {
int from;
int to;
@@ -592,9 +592,9 @@ void ProjectAutoNumConfigPage::applyManagement() {
}
/**
- * @brief ProjectAutoNumConfigPage::removeContext
- * Remove from project the current conductor numerotation context
- */
+ @brief ProjectAutoNumConfigPage::removeContext
+ Remove from project the current conductor numerotation context
+*/
void ProjectAutoNumConfigPage::removeContextConductor() {
//if default text, return
if ( m_saw_conductor->contextComboBox()-> currentText() == tr("Nom de la nouvelle numérotation") ) return;
@@ -604,9 +604,9 @@ void ProjectAutoNumConfigPage::removeContextConductor() {
}
/**
- * @brief ProjectAutoNumConfigPage::removeContext_folio
- * Remove from project the current folio numerotation context
- */
+ @brief ProjectAutoNumConfigPage::removeContext_folio
+ Remove from project the current folio numerotation context
+*/
void ProjectAutoNumConfigPage::removeContextFolio() {
//if default text, return
if ( m_saw_folio->contextComboBox() -> currentText() == tr("Nom de la nouvelle numérotation") ) return;
@@ -616,10 +616,10 @@ void ProjectAutoNumConfigPage::removeContextFolio() {
}
/**
- * @brief ProjectAutoNumConfigPage::changeToTab
- * @param tab index
- * Change to Selected Tab
- */
+ @brief ProjectAutoNumConfigPage::changeToTab
+ @param tab index
+ Change to Selected Tab
+*/
void ProjectAutoNumConfigPage::changeToTab(int i)
{
Q_UNUSED(i);
diff --git a/sources/projectview.cpp b/sources/projectview.cpp
index 434c570ab..ef33170a7 100644
--- a/sources/projectview.cpp
+++ b/sources/projectview.cpp
@@ -67,10 +67,10 @@ QETProject *ProjectView::project() {
}
/**
- * @brief ProjectView::setProject
- * Set the project display by the project view
- * @param project
- */
+ @brief ProjectView::setProject
+ Set the project display by the project view
+ @param project
+*/
void ProjectView::setProject(QETProject *project)
{
if (!m_project)
@@ -99,9 +99,9 @@ QList ProjectView::diagram_views() const {
}
/**
- * @brief ProjectView::currentDiagram
- * @return The current active diagram view or nullptr if there isn't diagramView in this project view.
- */
+ @brief ProjectView::currentDiagram
+ @return The current active diagram view or nullptr if there isn't diagramView in this project view.
+*/
DiagramView *ProjectView::currentDiagram() const {
int current_tab_index = m_tab -> currentIndex();
if (current_tab_index == -1)
@@ -276,11 +276,11 @@ bool ProjectView::tryClosingElementEditors() {
}
/**
- * @brief ProjectView::tryClosingDiagrams
- * try to close this project, if diagram or project option are changed
- * a dialog ask if user want to save the modification.
- * @return the answer of dialog or discard if no change.
- */
+ @brief ProjectView::tryClosingDiagrams
+ try to close this project, if diagram or project option are changed
+ a dialog ask if user want to save the modification.
+ @return the answer of dialog or discard if no change.
+*/
int ProjectView::tryClosingDiagrams() {
if (!m_project) return(QMessageBox::Discard);
@@ -345,21 +345,21 @@ QETResult ProjectView::noProjectResult() const {
}
/**
- * @brief ProjectView::removeDiagram
- * Remove a diagram (folio) of the project
- * @param diagram_view : diagram view to remove
- */
+ @brief ProjectView::removeDiagram
+ Remove a diagram (folio) of the project
+ @param diagram_view : diagram view to remove
+*/
void ProjectView::removeDiagram(DiagramView *diagram_view)
{
if (!diagram_view)
- return;
+ return;
if (m_project -> isReadOnly())
- return;
+ return;
if (!m_diagram_ids.values().contains(diagram_view))
- return;
+ return;
- //Ask confirmation to user.
+ //Ask confirmation to user.
int answer = QET::QetMessageBox::question(
this,
tr("Supprimer le folio ?", "message box title"),
@@ -371,18 +371,18 @@ void ProjectView::removeDiagram(DiagramView *diagram_view)
return;
}
- //Remove the diagram view of the tabs widget
+ //Remove the diagram view of the tabs widget
int index_to_remove = m_diagram_ids.key(diagram_view);
m_tab->removeTab(index_to_remove);
m_diagram_view_list.removeAll(diagram_view);
rebuildDiagramsMap();
-
+
m_project -> removeDiagram(diagram_view -> diagram());
delete diagram_view;
emit(diagramRemoved(diagram_view));
- updateAllTabsTitle();
- m_project -> setModified(true);
+ updateAllTabsTitle();
+ m_project -> setModified(true);
}
/**
@@ -493,8 +493,8 @@ void ProjectView::moveDiagramDown(Diagram *diagram) {
}
/*
- * Deplace le schema diagram_view vers le haut / la gauche en position 0
- */
+ Deplace le schema diagram_view vers le haut / la gauche en position 0
+*/
void ProjectView::moveDiagramUpTop(DiagramView *diagram_view)
{
if (!diagram_view) return;
@@ -508,8 +508,8 @@ void ProjectView::moveDiagramUpTop(DiagramView *diagram_view)
}
/*
- * Deplace le schema diagram vers le haut / la gauche en position 0
- */
+ Deplace le schema diagram vers le haut / la gauche en position 0
+*/
void ProjectView::moveDiagramUpTop(Diagram *diagram)
{
moveDiagramUpTop(findDiagram(diagram));
@@ -782,11 +782,11 @@ void ProjectView::initLayout() {
/**
- * @brief ProjectView::loadDiagrams
- * Load diagrams of project.
- * We create a diagram view for each diagram,
- * and add it to the project view.
- */
+ @brief ProjectView::loadDiagrams
+ Load diagrams of project.
+ We create a diagram view for each diagram,
+ and add it to the project view.
+*/
void ProjectView::loadDiagrams()
{
if (!m_project) return;
@@ -812,19 +812,19 @@ void ProjectView::loadDiagrams()
diagramAdded(diagram);
}
- if (DiagramView *dv = currentDiagram())
- {
- dv->diagram()->loadElmtFolioSeq();
- dv->diagram()->loadCndFolioSeq();
- }
+ if (DiagramView *dv = currentDiagram())
+ {
+ dv->diagram()->loadElmtFolioSeq();
+ dv->diagram()->loadCndFolioSeq();
+ }
QSettings settings;
}
/**
- * @brief ProjectView::updateWindowTitle
- * Update the project view title
- */
+ @brief ProjectView::updateWindowTitle
+ Update the project view title
+*/
void ProjectView::updateWindowTitle() {
QString title;
if (m_project) {
@@ -852,10 +852,10 @@ void ProjectView::adjustReadOnlyState() {
}
/**
- * @brief ProjectView::diagramAdded
- * Slot called when qetproject emit diagramAdded
- * @param diagram
- */
+ @brief ProjectView::diagramAdded
+ Slot called when qetproject emit diagramAdded
+ @param diagram
+*/
void ProjectView::diagramAdded(Diagram *diagram)
{
auto dv = new DiagramView(diagram);
@@ -881,10 +881,10 @@ void ProjectView::diagramAdded(Diagram *diagram)
}
/**
- * @brief ProjectView::updateTabTitle
- * Update the title of the tab which display the diagram view @diagram_view.
- * @param diagram : The diagram view.
- */
+ @brief ProjectView::updateTabTitle
+ Update the title of the tab which display the diagram view @diagram_view.
+ @param diagram : The diagram view.
+*/
void ProjectView::updateTabTitle(DiagramView *diagram_view)
{
int diagram_tab_id = m_diagram_ids.key(diagram_view, -1);
@@ -911,9 +911,9 @@ void ProjectView::updateTabTitle(DiagramView *diagram_view)
}
/**
- * @brief ProjectView::updateAllTabsTitle
- * Update all tabs title
- */
+ @brief ProjectView::updateAllTabsTitle
+ Update all tabs title
+*/
void ProjectView::updateAllTabsTitle()
{
for (DiagramView *dv : m_diagram_ids.values())
@@ -969,12 +969,12 @@ void ProjectView::rebuildDiagramsMap() {
}
/**
- * @brief ProjectView::tabChanged
- * Manage the tab change.
- * If tab_id == -1 (there is no diagram opened),
- * we display the fallback widget.
- * @param tab_id
- */
+ @brief ProjectView::tabChanged
+ Manage the tab change.
+ If tab_id == -1 (there is no diagram opened),
+ we display the fallback widget.
+ @param tab_id
+*/
void ProjectView::tabChanged(int tab_id)
{
if (tab_id == -1)
diff --git a/sources/properties/reportproperties.cpp b/sources/properties/reportproperties.cpp
index 61b913570..973e1857a 100644
--- a/sources/properties/reportproperties.cpp
+++ b/sources/properties/reportproperties.cpp
@@ -22,9 +22,9 @@ ReportProperties::ReportProperties()
{}
/**
- * @brief ReportProperties::defaultProperties
- * @return the default properties stored in the setting file
- */
+ @brief ReportProperties::defaultProperties
+ @return the default properties stored in the setting file
+*/
QString ReportProperties::defaultProperties()
{
QSettings settings;
diff --git a/sources/properties/xrefproperties.cpp b/sources/properties/xrefproperties.cpp
index 538549761..c92628bed 100644
--- a/sources/properties/xrefproperties.cpp
+++ b/sources/properties/xrefproperties.cpp
@@ -20,9 +20,9 @@
#include
/**
- * @brief XRefProperties::XRefProperties
- * Default Constructor
- */
+ @brief XRefProperties::XRefProperties
+ Default Constructor
+*/
XRefProperties::XRefProperties()
{
m_show_power_ctc = true;
@@ -36,11 +36,11 @@ XRefProperties::XRefProperties()
}
/**
- * @brief XRefProperties::toSettings
- * Save to settings
- * @param settings: QSettings to use
- * @param prefix: prefix before properties name
- */
+ @brief XRefProperties::toSettings
+ Save to settings
+ @param settings: QSettings to use
+ @param prefix: prefix before properties name
+*/
void XRefProperties::toSettings(QSettings &settings, const QString prefix) const {
settings.setValue(prefix + "showpowerctc", m_show_power_ctc);
QString display = m_display == Cross? "cross" : "contacts";
@@ -64,11 +64,11 @@ void XRefProperties::toSettings(QSettings &settings, const QString prefix) const
}
/**
- * @brief XRefProperties::fromSettings
- * load from settings
- * @param settings: QSettings to use
- * @param prefix: prefix before properties name
- */
+ @brief XRefProperties::fromSettings
+ load from settings
+ @param settings: QSettings to use
+ @param prefix: prefix before properties name
+*/
void XRefProperties::fromSettings(const QSettings &settings, const QString prefix)
{
m_show_power_ctc = settings.value(prefix + "showpowerctc", true).toBool();
@@ -89,16 +89,16 @@ void XRefProperties::fromSettings(const QSettings &settings, const QString prefi
}
/**
- * @brief XRefProperties::toXml
- * Save to xml
- * @param xml_element: QDomElement to use for saving
- */
+ @brief XRefProperties::toXml
+ Save to xml
+ @param xml_element: QDomElement to use for saving
+*/
QDomElement XRefProperties::toXml(QDomDocument &xml_document) const {
- QDomElement xml_element = xml_document.createElement("xref");
- xml_element.setAttribute("type", m_key);
+ QDomElement xml_element = xml_document.createElement("xref");
+ xml_element.setAttribute("type", m_key);
- xml_element.setAttribute("showpowerctc", m_show_power_ctc? "true" : "false");
+ xml_element.setAttribute("showpowerctc", m_show_power_ctc? "true" : "false");
QString display = m_display == Cross? "cross" : "contacts";
xml_element.setAttribute("displayhas", display);
QString snap = m_snap_to == Bottom? "bottom" : "label";
@@ -119,14 +119,14 @@ QDomElement XRefProperties::toXml(QDomDocument &xml_document) const {
xml_element.setAttribute(key + "prefix", m_prefix.value(key));
}
- return xml_element;
+ return xml_element;
}
/**
- * @brief XRefProperties::fromXml
- * Load from xml
- * @param xml_element: QDomElement to use for load
- */
+ @brief XRefProperties::fromXml
+ Load from xml
+ @param xml_element: QDomElement to use for load
+*/
bool XRefProperties::fromXml(const QDomElement &xml_element) {
m_show_power_ctc = xml_element.attribute("showpowerctc") == "true";
QString display = xml_element.attribute("displayhas", "cross");
@@ -149,16 +149,16 @@ bool XRefProperties::fromXml(const QDomElement &xml_element) {
foreach (QString key, m_prefix_keys) {
m_prefix.insert(key, xml_element.attribute(key + "prefix"));
}
- return true;
+ return true;
}
/**
- * @brief XRefProperties::defaultProperties
- * @return the default properties stored in the setting file
- * For the xref, there is 2 propreties.
- * For coil, stored with the string "coil" in the returned QHash.
- * For protection, stored with the string "protection" in the returned QHash.
- */
+ @brief XRefProperties::defaultProperties
+ @return the default properties stored in the setting file
+ For the xref, there is 2 propreties.
+ For coil, stored with the string "coil" in the returned QHash.
+ For protection, stored with the string "protection" in the returned QHash.
+*/
QHash XRefProperties::defaultProperties()
{
QHash hash;
diff --git a/sources/properties/xrefproperties.h b/sources/properties/xrefproperties.h
index dc03196cf..7762d8f45 100644
--- a/sources/properties/xrefproperties.h
+++ b/sources/properties/xrefproperties.h
@@ -22,9 +22,9 @@
#include