From 900261cb7f9553737f4c9f8e1e7b1af0c46ac6d4 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 15:57:04 +0300 Subject: [PATCH] For tool point along line default type of line is "no line". --HG-- branch : develop --- dialogs/dialogalongline.cpp | 1 + dialogs/dialogalongline.h | 2 +- dialogs/dialogtool.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index 3765cde10..aa66b467a 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -46,6 +46,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidg QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); connect(bCansel, &QPushButton::clicked, this, &DialogAlongLine::DialogRejected); FillComboBoxTypeLine(ui->comboBoxLineType); + ui->comboBoxLineType->setCurrentIndex(1); FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxSecondPoint); diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index 3f004fb52..200d4168a 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -48,7 +48,7 @@ public: void setSecondPointId(const qint64 &value, const qint64 &id); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogAlongLine) Ui::DialogAlongLine *ui; diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index a347196d3..37e459821 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -92,6 +92,7 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const qint64 &id) const{ } void DialogTool::FillComboBoxTypeLine(QComboBox *box) const{ + Q_ASSERT(box != 0); QStringList list; list<addItems(list);