kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 08:40:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

update diagramAutoNum

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2147 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
cfdev
2013-05-07 13:17:57 +00:00
parent f14792eadb
commit 0857577f28
6 changed files with 227 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sources/qetdiagrameditor.cpp
View File

@@ -34,7 +34,7 @@
#include "genericpanel.h" #include "genericpanel.h"
#include "nomenclature.h" #include "nomenclature.h"
#include "ui/dialogconductorautonum.h" #include "ui/dialogautonum.h"
#include <QMessageBox> #include <QMessageBox>
@@ -224,8 +224,8 @@ void QETDiagramEditor::actions() {
prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un sch\351ma"), this); prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un sch\351ma"), this);
prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le sch\351ma"), this); prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le sch\351ma"), this);
prj_clean = new QAction(QET::Icons::EditClear, tr("Nettoyer le projet"), this); prj_clean = new QAction(QET::Icons::EditClear, tr("Nettoyer le projet"), this);
prj_conductorANum = new QAction(QET::Icons::ConductorSettings, tr("Annoter les conducteurs (beta)"), this); prj_diagramNum = new QAction(QET::Icons::ConductorSettings, tr("Annoter les sch\351mas (beta)"), this);
prj_nomenclature = new QAction(QET::Icons::DocumentExport, tr("Exporter une nomenclature (beta)"), this); prj_nomenclature = new QAction(QET::Icons::DocumentExport, tr("Exporter une nomenclature (beta)"), this);
zoom_in = new QAction(QET::Icons::ZoomIn, tr("Zoom avant"), this); zoom_in = new QAction(QET::Icons::ZoomIn, tr("Zoom avant"), this);
zoom_out = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re"), this); zoom_out = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re"), this);
@@ -372,7 +372,7 @@ void QETDiagramEditor::actions() {
connect(prj_add_diagram, SIGNAL(triggered()), this, SLOT(addDiagramToProject()) ); connect(prj_add_diagram, SIGNAL(triggered()), this, SLOT(addDiagramToProject()) );
connect(prj_del_diagram, SIGNAL(triggered()), this, SLOT(removeDiagramFromProject()) ); connect(prj_del_diagram, SIGNAL(triggered()), this, SLOT(removeDiagramFromProject()) );
connect(prj_clean, SIGNAL(triggered()), this, SLOT(cleanCurrentProject()) ); connect(prj_clean, SIGNAL(triggered()), this, SLOT(cleanCurrentProject()) );
connect(prj_conductorANum, SIGNAL(triggered()), this, SLOT(conductorAutoNumProject()) ); connect(prj_diagramNum, SIGNAL(triggered()), this, SLOT(diagramNumProject()) );
connect(prj_nomenclature, SIGNAL(triggered()), this, SLOT(nomenclatureProject()) ); connect(prj_nomenclature, SIGNAL(triggered()), this, SLOT(nomenclatureProject()) );
connect(zoom_in, SIGNAL(triggered()), this, SLOT(slot_zoomIn()) ); connect(zoom_in, SIGNAL(triggered()), this, SLOT(slot_zoomIn()) );
connect(zoom_out, SIGNAL(triggered()), this, SLOT(slot_zoomOut()) ); connect(zoom_out, SIGNAL(triggered()), this, SLOT(slot_zoomOut()) );
@@ -490,7 +490,7 @@ void QETDiagramEditor::menus() {
menu_project -> addAction(prj_del_diagram); menu_project -> addAction(prj_del_diagram);
menu_project -> addAction(prj_clean); menu_project -> addAction(prj_clean);
menu_project -> addSeparator(); menu_project -> addSeparator();
menu_project -> addAction(prj_conductorANum); menu_project -> addAction(prj_diagramNum);
menu_project -> addAction(prj_nomenclature); menu_project -> addAction(prj_nomenclature);
main_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils principale")); main_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils principale"));
@@ -1131,7 +1131,7 @@ void QETDiagramEditor::slot_updateActions() {
prj_add_diagram -> setEnabled(editable_project); prj_add_diagram -> setEnabled(editable_project);
prj_del_diagram -> setEnabled(editable_project); prj_del_diagram -> setEnabled(editable_project);
prj_clean -> setEnabled(editable_project); prj_clean -> setEnabled(editable_project);
prj_conductorANum -> setEnabled(editable_project); prj_diagramNum -> setEnabled(editable_project);
prj_nomenclature -> setEnabled(editable_project); prj_nomenclature -> setEnabled(editable_project);
import_diagram -> setEnabled(editable_project); import_diagram -> setEnabled(editable_project);
export_diagram -> setEnabled(opened_diagram); export_diagram -> setEnabled(opened_diagram);
@@ -1153,7 +1153,7 @@ void QETDiagramEditor::slot_updateActions() {
//display the beta feature only in debug mode //display the beta feature only in debug mode
#ifdef QT_NO_DEBUG #ifdef QT_NO_DEBUG
prj_conductorANum -> setVisible(false); prj_diagramNum -> setVisible(false);
prj_nomenclature -> setVisible(false); prj_nomenclature -> setVisible(false);
#endif #endif
@@ -1709,10 +1709,10 @@ void QETDiagramEditor::cleanCurrentProject() {
} }
/** /**
* @brief launch AutoNumConductor dialog * @brief launch dialog for numerate diagram
*/ */
void QETDiagramEditor::conductorAutoNumProject() { void QETDiagramEditor::diagramNumProject() {
DialogConductorAutoNum *dg = new DialogConductorAutoNum(currentDiagram()->diagram(), this); DialogAutoNum *dg = new DialogAutoNum(currentDiagram()->diagram(), this);
dg->setModal(true); dg->setModal(true);
dg->exec(); dg->exec();

4
sources/qetdiagrameditor.h
View File

@@ -146,7 +146,7 @@ class QETDiagramEditor : public QETMainWindow {
void moveDiagramUp(Diagram *); void moveDiagramUp(Diagram *);
void moveDiagramDown(Diagram *); void moveDiagramDown(Diagram *);
void cleanCurrentProject(); void cleanCurrentProject();
void conductorAutoNumProject(); void diagramNumProject();
void nomenclatureProject(); void nomenclatureProject();
void diagramWasAdded(DiagramView *); void diagramWasAdded(DiagramView *);
void diagramIsAboutToBeRemoved(DiagramView *); void diagramIsAboutToBeRemoved(DiagramView *);
@@ -204,7 +204,7 @@ class QETDiagramEditor : public QETMainWindow {
QAction *prj_add_diagram; ///< Add a diagram to the current project. QAction *prj_add_diagram; ///< Add a diagram to the current project.
QAction *prj_del_diagram; ///< Delete a diagram from the current project QAction *prj_del_diagram; ///< Delete a diagram from the current project
QAction *prj_clean; ///< Clean the content of the curent project by removing useless items QAction *prj_clean; ///< Clean the content of the curent project by removing useless items
QAction *prj_conductorANum; ///< Auto numerotation conductors QAction *prj_diagramNum; ///< Numerotation des schemas
QAction *prj_nomenclature; ///< generate nomenclature QAction *prj_nomenclature; ///< generate nomenclature
QAction *zoom_in; ///< Zoom in QAction *zoom_in; ///< Zoom in
QAction *zoom_out; ///< Zoom out QAction *zoom_out; ///< Zoom out

76
sources/ui/dialogconductorautonum.cpp → sources/ui/dialogautonum.cpp
View File

@@ -15,43 +15,48 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "dialogconductorautonum.h" #include "dialogautonum.h"
#include "ui_dialogconductorautonum.h" #include "ui_dialogautonum.h"
#include "conductorautonumerotation.h" #include "conductorautonumerotation.h"
#include "qetmessagebox.h" #include "qetmessagebox.h"
/**
DialogConductorAutoNum::DialogConductorAutoNum(Diagram *dg, QWidget *parent) : * @brief DialogAutoNum::DialogAutoNum
* @param dg
* @param parent
*/
DialogAutoNum::DialogAutoNum(Diagram *dg, QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::DialogConductorAutoNum) ui(new Ui::DialogAutoNum)
{ {
ui -> setupUi(this); ui -> setupUi(this);
dg_ = dg; dg_ = dg;
// create widget of diagram selection // create widget of diagram selection
dgselect_ = new diagramselection( dg_ ->project(), this ); dgselect_ = new diagramselection( dg_ -> project(), this );
ui -> verticalLayout_Selection -> addWidget( dgselect_ ); ui -> verticalLayout_Selection -> addWidget( dgselect_ );
} }
DialogConductorAutoNum::~DialogConductorAutoNum() /**
{ * @brief Destructor
*/
DialogAutoNum::~DialogAutoNum(){
delete ui; delete ui;
} }
/** /**
* @brief DialogConductorAutoNum::on_pushButton_delete_clicked * @brief DialogAutoNum::on_pushButton_delete_clicked
*/ */
void DialogConductorAutoNum::on_pushButton_delete_clicked() { void DialogAutoNum::on_pushButton_delete_clicked() {
// get list of diagrams selected // get list of diagrams selected
QList<Diagram *>listDiag = dgselect_ ->list_of_DiagramSelected(); QList<Diagram *>listDiag = dgselect_ -> list_of_DiagramSelected();
if(listDiag.count()<=0) return; if(listDiag.count()<=0) return;
QString diagramsTitle; QString diagramsTitle;
for(int i=0; i<listDiag.count(); i++){ for(int i=0; i<listDiag.count(); i++){
diagramsTitle += listDiag.at(i)->title(); diagramsTitle += listDiag.at(i) -> title();
if(i+1<listDiag.count()) diagramsTitle += ", "; if(i+1 < listDiag.count()) diagramsTitle += ", ";
} }
// Ask if user is sure to delete the conductor numerotation // Ask if user is sure to delete the conductor numerotation
QMessageBox::StandardButton answer = QET::MessageBox::critical( QMessageBox::StandardButton answer = QET::MessageBox::critical(
@@ -73,25 +78,18 @@ void DialogConductorAutoNum::on_pushButton_delete_clicked() {
} }
} }
/**
* @brief Close the dialog
*/
void DialogConductorAutoNum::on_pushButton_close_clicked() {
close();
}
/** /**
* @brief set the autonum to all diagram selected * @brief set the autonum to all diagram selected
*/ */
void DialogConductorAutoNum::on_pushButton_annotation_clicked(){ void DialogAutoNum::on_pushButton_annotation_clicked(){
// Get list of diagrams selected // Get list of diagrams selected
QList<Diagram *>listDiag = dgselect_ ->list_of_DiagramSelected(); QList<Diagram *>listDiag = dgselect_ -> list_of_DiagramSelected();
if(listDiag.count()<=0) return; if(listDiag.count()<=0) return;
QString diagramsTitle; QString diagramsTitle;
for(int i=0; i<listDiag.count(); i++){ for(int i=0; i<listDiag.count(); i++){
diagramsTitle += listDiag.at(i)->title(); diagramsTitle += listDiag.at(i) -> title();
if(i+1<listDiag.count()) diagramsTitle += ", "; if(i+1 < listDiag.count()) diagramsTitle += ", ";
} }
// Ask if user is sure to numerate the conductor // Ask if user is sure to numerate the conductor
QMessageBox::StandardButton answer = QET::MessageBox::warning( QMessageBox::StandardButton answer = QET::MessageBox::warning(
@@ -106,15 +104,25 @@ void DialogConductorAutoNum::on_pushButton_annotation_clicked(){
// if yes numerate all // if yes numerate all
if( answer == QMessageBox::Yes) { if( answer == QMessageBox::Yes) {
NumerotationContext num;
for(int i=0; i<listDiag.count(); i++){
num.clear();
num.addValue("ten",5);
num.addValue("string","U");
num.addValue("folio");
listDiag.at(i)->setNumerotation(Diagram::Conductors, num);
qDebug() << "ok";
}
} }
} }
/**
* @brief Close the dialog
*/
void DialogAutoNum::on_pushButton_close_clicked() {
close();
}
/*
NumerotationContext num;
for(int i=0; i<listDiag.count(); i++){
num.clear();
num.addValue("ten",5);
num.addValue("string","U");
num.addValue("folio");
listDiag.at(i)->setNumerotation(Diagram::Conductors, num);
qDebug() << "ok";
}
*/

16
sources/ui/dialogconductorautonum.h → sources/ui/dialogautonum.h
View File

@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef DIALOGCONDUCTORAUTONUM_H #ifndef DIALOGAUTONUM_H
#define DIALOGCONDUCTORAUTONUM_H #define DIALOGAUTONUM_H
#include <QDialog> #include <QDialog>
@@ -24,16 +24,16 @@
#include "ui/diagramselection.h" #include "ui/diagramselection.h"
namespace Ui { namespace Ui {
class DialogConductorAutoNum; class DialogAutoNum;
} }
class DialogConductorAutoNum : public QDialog class DialogAutoNum : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DialogConductorAutoNum(Diagram *dg, QWidget *parent = 0); explicit DialogAutoNum(Diagram *dg, QWidget *parent = 0);
~DialogConductorAutoNum(); ~DialogAutoNum();
private slots: private slots:
void on_pushButton_annotation_clicked(); void on_pushButton_annotation_clicked();
@@ -41,10 +41,10 @@ class DialogConductorAutoNum : public QDialog
void on_pushButton_close_clicked(); void on_pushButton_close_clicked();
private: private:
Ui::DialogConductorAutoNum *ui; Ui::DialogAutoNum *ui;
Diagram *dg_; Diagram *dg_;
diagramselection *dgselect_; diagramselection *dgselect_;
}; };
#endif // DIALOGCONDUCTORAUTONUM_H #endif // DialogAutoNum_H

165
sources/ui/dialogautonum.ui Normal file
View File

@@ -0,0 +1,165 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DialogAutoNum</class>
<widget class="QDialog" name="DialogAutoNum">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>482</width>
<height>416</height>
</rect>
</property>
<property name="windowTitle">
<string>Annotation des schémas</string>
</property>
<property name="windowIcon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/oxygen-icons/32x32/apps/qelectrotech.png</normaloff>:/ico/oxygen-icons/32x32/apps/qelectrotech.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Configuration</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<layout class="QVBoxLayout" name="verticalLayout_5"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_annotation">
<attribute name="title">
<string>Annotation</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_Selection">
<property name="title">
<string>Sélection</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_">
<item>
<widget class="QRadioButton" name="radioButton_conductor">
<property name="text">
<string>Conducteurs</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/22x22/conductor2.png</normaloff>:/ico/22x22/conductor2.png</iconset>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_component">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Composants</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/22x22/single_page.png</normaloff>:/ico/22x22/single_page.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_Selection"/>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pushButton_annotation">
<property name="text">
<string>Annotation</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/edit-select-all.png</normaloff>:/ico/16x16/edit-select-all.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_delete">
<property name="text">
<string>Supprimer l'annotation</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/edit-delete.png</normaloff>:/ico/16x16/edit-delete.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_close">
<property name="text">
<string>Fermer</string>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources>
<include location="../../qelectrotech.qrc"/>
</resources>
<connections/>
</ui>

127
sources/ui/dialogconductorautonum.ui
View File

@@ -1,127 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DialogConductorAutoNum</class>
<widget class="QDialog" name="DialogConductorAutoNum">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>482</width>
<height>382</height>
</rect>
</property>
<property name="windowTitle">
<string>Annotation des conducteurs</string>
</property>
<property name="windowIcon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/oxygen-icons/32x32/apps/qelectrotech.png</normaloff>:/ico/oxygen-icons/32x32/apps/qelectrotech.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_Selection">
<property name="title">
<string>Sélection</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QVBoxLayout" name="verticalLayout_Selection"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_Annotation">
<property name="title">
<string>Annotation</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_format">
<property name="text">
<string>Format : </string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_info">
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/configure.png</normaloff>:/ico/16x16/configure.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_annotation">
<property name="text">
<string>Annotation</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/edit-select-all.png</normaloff>:/ico/16x16/edit-select-all.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_delete">
<property name="text">
<string>Supprimer l'annotation</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/edit-delete.png</normaloff>:/ico/16x16/edit-delete.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_close">
<property name="text">
<string>Fermer</string>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources>
<include location="../../qelectrotech.qrc"/>
</resources>
<connections/>
</ui>