mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-17 12:40:35 +01:00
Revert r5449 and disable r5452 momentary : Load time from elements is
very slow git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5461 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -71,7 +71,7 @@ ExportDialog::ExportDialog(QETProject *project, QWidget *parent) : QDialog(paren
|
||||
|
||||
// disposition des elements
|
||||
|
||||
auto *hLayout = new QHBoxLayout();
|
||||
QHBoxLayout *hLayout = new QHBoxLayout();
|
||||
hLayout -> addWidget(new QLabel(tr("Choisissez les folios que vous désirez exporter ainsi que leurs dimensions :")));
|
||||
selectAll = new QPushButton();
|
||||
deSelectAll = new QPushButton();
|
||||
@@ -83,7 +83,7 @@ ExportDialog::ExportDialog(QETProject *project, QWidget *parent) : QDialog(paren
|
||||
connect(deSelectAll, SIGNAL(clicked()), this, SLOT(slot_deSelectAllClicked()));
|
||||
|
||||
|
||||
auto *layout = new QVBoxLayout(this);
|
||||
QVBoxLayout *layout = new QVBoxLayout(this);
|
||||
layout -> addLayout(hLayout);
|
||||
layout -> addWidget(initDiagramsListPart(), 1);
|
||||
layout -> addWidget(epw);
|
||||
@@ -177,7 +177,7 @@ QWidget *ExportDialog::initDiagramsListPart() {
|
||||
QWidget *widget_diagrams_list = new QWidget();
|
||||
widget_diagrams_list -> setLayout(diagrams_list_layout_);
|
||||
|
||||
auto *scroll_diagrams_list = new QScrollArea();
|
||||
QScrollArea *scroll_diagrams_list = new QScrollArea();
|
||||
scroll_diagrams_list -> setWidget(widget_diagrams_list);
|
||||
|
||||
return(scroll_diagrams_list);
|
||||
@@ -426,7 +426,7 @@ void ExportDialog::generateDxf(Diagram *diagram, int width, int height, bool kee
|
||||
//QList<QRectF *> list_ellipses;
|
||||
QList <QetShapeItem *> list_shapes;
|
||||
|
||||
auto *ptr = dynamic_cast<DiagramFolioList *>(diagram);
|
||||
DiagramFolioList *ptr = dynamic_cast<DiagramFolioList *>(diagram);
|
||||
if (ptr) {
|
||||
list_lines = ptr -> lines();
|
||||
list_rectangles = ptr -> rectangles();
|
||||
@@ -469,15 +469,15 @@ void ExportDialog::generateDxf(Diagram *diagram, int width, int height, bool kee
|
||||
} else {
|
||||
// Determine les elements a "XMLiser"
|
||||
foreach(QGraphicsItem *qgi, diagram -> items()) {
|
||||
if (auto *elmt = qgraphicsitem_cast<Element *>(qgi)) {
|
||||
if (Element *elmt = qgraphicsitem_cast<Element *>(qgi)) {
|
||||
list_elements << elmt;
|
||||
} else if (auto *f = qgraphicsitem_cast<Conductor *>(qgi)) {
|
||||
} else if (Conductor *f = qgraphicsitem_cast<Conductor *>(qgi)) {
|
||||
list_conductors << f;
|
||||
} else if (auto *iti = qgraphicsitem_cast<IndependentTextItem *>(qgi)) {
|
||||
} else if (IndependentTextItem *iti = qgraphicsitem_cast<IndependentTextItem *>(qgi)) {
|
||||
list_texts << iti;
|
||||
} else if (auto *dii = qgraphicsitem_cast<DiagramImageItem *>(qgi)) {
|
||||
} else if (DiagramImageItem *dii = qgraphicsitem_cast<DiagramImageItem *>(qgi)) {
|
||||
list_images << dii;
|
||||
} else if (auto *dii = qgraphicsitem_cast<QetShapeItem *>(qgi)) {
|
||||
} else if (QetShapeItem *dii = qgraphicsitem_cast<QetShapeItem *>(qgi)) {
|
||||
list_shapes << dii;
|
||||
}
|
||||
}
|
||||
@@ -909,14 +909,14 @@ void ExportDialog::slot_previewDiagram(int diagram_id) {
|
||||
preview_dialog.setWindowTitle(tr("Aperçu"));
|
||||
preview_dialog.setWindowState(preview_dialog.windowState() | Qt::WindowMaximized);
|
||||
|
||||
auto *preview_scene = new QGraphicsScene();
|
||||
QGraphicsScene *preview_scene = new QGraphicsScene();
|
||||
preview_scene -> setBackgroundBrush(Qt::lightGray);
|
||||
auto *preview_view = new QGraphicsView(preview_scene);
|
||||
QGraphicsView *preview_view = new QGraphicsView(preview_scene);
|
||||
preview_view -> setDragMode(QGraphicsView::ScrollHandDrag);
|
||||
QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok);
|
||||
connect(buttons, SIGNAL(accepted()), &preview_dialog, SLOT(accept()));
|
||||
|
||||
auto *vboxlayout1 = new QVBoxLayout();
|
||||
QVBoxLayout *vboxlayout1 = new QVBoxLayout();
|
||||
vboxlayout1 -> addWidget(preview_view);
|
||||
vboxlayout1 -> addWidget(buttons);
|
||||
preview_dialog.setLayout(vboxlayout1);
|
||||
@@ -1050,7 +1050,7 @@ ExportDialog::ExportDiagramLine::~ExportDiagramLine() {
|
||||
taille d'un schema avant son export.
|
||||
*/
|
||||
QBoxLayout *ExportDialog::ExportDiagramLine::sizeLayout() {
|
||||
auto *layout = new QHBoxLayout();
|
||||
QHBoxLayout *layout = new QHBoxLayout();
|
||||
layout -> addWidget(width);
|
||||
layout -> addWidget(x_label);
|
||||
layout -> addWidget(height);
|
||||
|
||||
Reference in New Issue
Block a user