mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-02-09 08:59:59 +01:00
update diagramAutoNum
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2147 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -15,43 +15,48 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "dialogconductorautonum.h"
|
||||
#include "ui_dialogconductorautonum.h"
|
||||
#include "dialogautonum.h"
|
||||
#include "ui_dialogautonum.h"
|
||||
|
||||
#include "conductorautonumerotation.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),
|
||||
ui(new Ui::DialogConductorAutoNum)
|
||||
ui(new Ui::DialogAutoNum)
|
||||
{
|
||||
ui -> setupUi(this);
|
||||
dg_ = dg;
|
||||
|
||||
// create widget of diagram selection
|
||||
dgselect_ = new diagramselection( dg_ ->project(), this );
|
||||
dgselect_ = new diagramselection( dg_ -> project(), this );
|
||||
ui -> verticalLayout_Selection -> addWidget( dgselect_ );
|
||||
}
|
||||
|
||||
DialogConductorAutoNum::~DialogConductorAutoNum()
|
||||
{
|
||||
/**
|
||||
* @brief Destructor
|
||||
*/
|
||||
DialogAutoNum::~DialogAutoNum(){
|
||||
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
|
||||
QList<Diagram *>listDiag = dgselect_ ->list_of_DiagramSelected();
|
||||
QList<Diagram *>listDiag = dgselect_ -> list_of_DiagramSelected();
|
||||
if(listDiag.count()<=0) return;
|
||||
|
||||
QString diagramsTitle;
|
||||
for(int i=0; i<listDiag.count(); i++){
|
||||
diagramsTitle += listDiag.at(i)->title();
|
||||
if(i+1<listDiag.count()) diagramsTitle += ", ";
|
||||
diagramsTitle += listDiag.at(i) -> title();
|
||||
if(i+1 < listDiag.count()) diagramsTitle += ", ";
|
||||
}
|
||||
// Ask if user is sure to delete the conductor numerotation
|
||||
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
|
||||
*/
|
||||
void DialogConductorAutoNum::on_pushButton_annotation_clicked(){
|
||||
void DialogAutoNum::on_pushButton_annotation_clicked(){
|
||||
// Get list of diagrams selected
|
||||
QList<Diagram *>listDiag = dgselect_ ->list_of_DiagramSelected();
|
||||
QList<Diagram *>listDiag = dgselect_ -> list_of_DiagramSelected();
|
||||
if(listDiag.count()<=0) return;
|
||||
|
||||
QString diagramsTitle;
|
||||
for(int i=0; i<listDiag.count(); i++){
|
||||
diagramsTitle += listDiag.at(i)->title();
|
||||
if(i+1<listDiag.count()) diagramsTitle += ", ";
|
||||
diagramsTitle += listDiag.at(i) -> title();
|
||||
if(i+1 < listDiag.count()) diagramsTitle += ", ";
|
||||
}
|
||||
// Ask if user is sure to numerate the conductor
|
||||
QMessageBox::StandardButton answer = QET::MessageBox::warning(
|
||||
@@ -106,15 +104,25 @@ void DialogConductorAutoNum::on_pushButton_annotation_clicked(){
|
||||
|
||||
// if yes numerate all
|
||||
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";
|
||||
}
|
||||
*/
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef DIALOGCONDUCTORAUTONUM_H
|
||||
#define DIALOGCONDUCTORAUTONUM_H
|
||||
#ifndef DIALOGAUTONUM_H
|
||||
#define DIALOGAUTONUM_H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
@@ -24,16 +24,16 @@
|
||||
#include "ui/diagramselection.h"
|
||||
|
||||
namespace Ui {
|
||||
class DialogConductorAutoNum;
|
||||
class DialogAutoNum;
|
||||
}
|
||||
|
||||
class DialogConductorAutoNum : public QDialog
|
||||
class DialogAutoNum : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DialogConductorAutoNum(Diagram *dg, QWidget *parent = 0);
|
||||
~DialogConductorAutoNum();
|
||||
explicit DialogAutoNum(Diagram *dg, QWidget *parent = 0);
|
||||
~DialogAutoNum();
|
||||
|
||||
private slots:
|
||||
void on_pushButton_annotation_clicked();
|
||||
@@ -41,10 +41,10 @@ class DialogConductorAutoNum : public QDialog
|
||||
void on_pushButton_close_clicked();
|
||||
|
||||
private:
|
||||
Ui::DialogConductorAutoNum *ui;
|
||||
Ui::DialogAutoNum *ui;
|
||||
Diagram *dg_;
|
||||
diagramselection *dgselect_;
|
||||
|
||||
};
|
||||
|
||||
#endif // DIALOGCONDUCTORAUTONUM_H
|
||||
#endif // DialogAutoNum_H
|
||||
165
sources/ui/dialogautonum.ui
Normal file
165
sources/ui/dialogautonum.ui
Normal 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>
|
||||
@@ -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>
|
||||
Reference in New Issue
Block a user