mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-03 10:34:14 +02:00
ispyisail
68e75b4c55
PotentialSelectorDialog::chosenProperties() built an OK-only dialog
and discarded exec()'s return value entirely:
dialog.exec();
for (QRadioButton *b : H.keys()) {
if (b->isChecked()) return H.value(b);
}
return ConductorProperties();
Escape and the window close button already trigger QDialog::reject()
on a plain QDialog, but since the result was never checked, dismissing
the dialog without picking anything just silently returned blank
ConductorProperties() -- the same value returned when a real potential
was chosen but happened to produce empty properties. There was no way
to distinguish "the user cancelled" from "the user chose an empty
potential", so the caller always proceeded as if a choice had been
made.
Add a real Cancel button, check dialog.exec() == QDialog::Accepted,
and report cancellation through a new optional `bool *cancelled`
out-parameter. Also pre-select the first entry, closing a related gap
where clicking OK without ever touching a radio button hit the exact
same "silently returns blank properties" failure mode.
Thread the result through ConductorCreator::setUpPropertieToUse()
(now returning bool) so the calling constructor aborts and creates no
conductors at all when the user cancels, instead of proceeding with
blank properties.
The sibling constructor-based PotentialSelectorDialog (used for
conductor/report potential linking, a separate flow) already gates its
side effects behind on_buttonBox_accepted(), so cancelling it was
already safe -- gave it a visible Cancel button too for consistency
while touching this file, no behavior change there.
Verified with real Qt event simulation (QTest::mouseClick/keyClick)
against the exact new dialog-building logic: clicking Cancel and
pressing Escape both correctly report cancellation with empty
properties; clicking OK untouched returns the pre-selected first
entry; selecting the second option then OK returns that selection.
See discussion #581.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
113 lines
3.5 KiB
C++
113 lines
3.5 KiB
C++
/*
|
|
Copyright 2006-2026 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 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 <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef POTENTIALSELECTORDIALOG_H
|
|
#define POTENTIALSELECTORDIALOG_H
|
|
|
|
#include "../autoNum/assignvariables.h"
|
|
#include "../conductorproperties.h"
|
|
|
|
#include <QDialog>
|
|
class Conductor;
|
|
class QUndoCommand;
|
|
class Element;
|
|
|
|
class AbstractPotentialSelector
|
|
{
|
|
public:
|
|
AbstractPotentialSelector()
|
|
: m_conductor_number_1(0)
|
|
, m_conductor_number_2(0) {}
|
|
virtual ~AbstractPotentialSelector() {}
|
|
virtual bool isValid() const = 0;
|
|
|
|
autonum::sequentialNumbers m_seq_num_1, m_seq_num_2;
|
|
int m_conductor_number_1, m_conductor_number_2;
|
|
QList<ConductorProperties> m_properties_list_1,
|
|
m_properties_list_2;
|
|
QList <Conductor *> m_conductors_list_1, m_conductors_list_2;
|
|
};
|
|
|
|
namespace Ui {
|
|
class PotentialSelectorDialog;
|
|
}
|
|
|
|
/**
|
|
@brief The PotentialSelectorDialog class
|
|
This dialog is used when user try to connect
|
|
two existing potential together.
|
|
The dialog ask to user to make a choice between
|
|
the properties of the two existing potential,
|
|
to apply it for the new potential.
|
|
|
|
Each constructor have a QUndoCommand parent_undo for parameter
|
|
If parent_undo isn't null, when user click on OK button,
|
|
the dialog will use the parent-undo
|
|
as parent of the undo command that describe the changes.
|
|
If parent_undo is null, the created undo-command is push
|
|
to the undo stack of the parent diagram of a conductor in potential.
|
|
else we apply the change without a QUndoCommand.
|
|
|
|
the static function chosenProperties,
|
|
open a dialog who ask user to make a choice between the given
|
|
properties. If the dialog is cancelled (Cancel button, Escape, or the
|
|
window's close button) and @a cancelled is non-null, *cancelled is set
|
|
to true and an empty ConductorProperties() is returned; callers that
|
|
care about a real cancellation (as opposed to "no properties to choose
|
|
from") should check it rather than relying on the returned value alone.
|
|
*/
|
|
class PotentialSelectorDialog : public QDialog
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
static ConductorProperties chosenProperties(
|
|
QList<ConductorProperties> list,
|
|
QWidget *parent = nullptr,
|
|
bool *cancelled = nullptr);
|
|
|
|
public:
|
|
explicit PotentialSelectorDialog(
|
|
Conductor *conductor,
|
|
QUndoCommand *parent_undo = nullptr,
|
|
QWidget *parent = nullptr);
|
|
explicit PotentialSelectorDialog(
|
|
Element *report,
|
|
QUndoCommand *parent_undo = nullptr,
|
|
QWidget *parent = nullptr);
|
|
~PotentialSelectorDialog() override;
|
|
|
|
|
|
private slots:
|
|
void on_buttonBox_accepted();
|
|
|
|
private:
|
|
void buildWidget();
|
|
|
|
private:
|
|
Ui::PotentialSelectorDialog *ui;
|
|
Conductor *m_conductor;
|
|
Element *m_report;
|
|
QUndoCommand *m_parent_undo;
|
|
autonum::sequentialNumbers m_sequential_num;
|
|
AbstractPotentialSelector *m_potential_selector;
|
|
QList <ConductorProperties> m_properties_list;
|
|
QList <Conductor *> m_conductors_to_change;
|
|
int m_selected = 0;
|
|
};
|
|
#endif // POTENTIALSELECTORDIALOG_H
|