mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-07-30 07:44:13 +02:00
Dieter Mayer
96f6fa44ad
QHash/QMap::keys() allocates a list of every key on each call, then contains() searches it linearly - an accidental O(n) plus allocation where a direct O(1) lookup was meant. 35 occurrences across 7 files, found while profiling project load times (context: #553/#560). The hot one is ElementPictureFactory::getPictures(), which runs once per element instance on project load: on the 3399 KiB example project (191 instances, 129 cache hits) the keys() detour cost 45 ms of the 1.34 s total - measured, not estimated; the fix reproducibly shaves ~35-45 ms off that load. The remaining call sites are UI paths (search&replace, dynamic text model, undo commands) where the waste scales with selection/model size. No behavior change: for QHash/QMap, keys().contains(k) and contains(k) are equivalent by definition. (cherry picked from commit 0a7f8f072fa68de7c01a9fc134a4bc8e16d62062)
122 lines
3.4 KiB
C++
122 lines
3.4 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/>.
|
|
*/
|
|
#include "changeelementinformationcommand.h"
|
|
#include "../qetproject.h"
|
|
#include "../diagram.h"
|
|
#include "../qetgraphicsitem/element.h"
|
|
|
|
#include <QObject>
|
|
|
|
/**
|
|
@brief ChangeElementInformationCommand::ChangeElementInformationCommand
|
|
Default constructor
|
|
@param elmt : element to change information
|
|
@param old_info : old info of element
|
|
@param new_info : new info of element
|
|
@param parent
|
|
*/
|
|
ChangeElementInformationCommand::ChangeElementInformationCommand(
|
|
Element *elmt,
|
|
const DiagramContext &old_info,
|
|
const DiagramContext &new_info,
|
|
QUndoCommand *parent) :
|
|
QUndoCommand (parent)
|
|
{
|
|
m_map.insert(QPointer<Element>(elmt), qMakePair(old_info, new_info));
|
|
setText(QObject::tr("Modifier les informations de l'élément : %1")
|
|
.arg(elmt -> name()));
|
|
}
|
|
|
|
ChangeElementInformationCommand::ChangeElementInformationCommand(QMap<QPointer<Element>, QPair<DiagramContext, DiagramContext> > map,
|
|
QUndoCommand *parent) :
|
|
QUndoCommand(parent),
|
|
m_map(map)
|
|
{
|
|
setText(QObject::tr("Modifier les informations de plusieurs éléments"));
|
|
}
|
|
|
|
bool ChangeElementInformationCommand::mergeWith(const QUndoCommand *other)
|
|
{
|
|
if (id() != other->id())
|
|
return false;
|
|
|
|
ChangeElementInformationCommand const *other_undo = static_cast<const ChangeElementInformationCommand*>(other);
|
|
|
|
//In case of other undo_undo have the same elements as keys
|
|
if (m_map.size() == other_undo->m_map.size())
|
|
{
|
|
for (auto key : other_undo->m_map.keys()) {
|
|
if (!m_map.contains(key)) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
//Other_undo will be merged with this undo :
|
|
//Replace the new_info values of this m_map
|
|
//by the new_info values of other_undo's m_map
|
|
for (auto key : other_undo->m_map.keys())
|
|
{
|
|
m_map.insert(key,
|
|
qMakePair(
|
|
m_map.value(key).first,
|
|
other_undo->m_map.value(key).second));
|
|
}
|
|
return true;
|
|
}
|
|
else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
@brief ChangeElementInformationCommand::undo
|
|
*/
|
|
void ChangeElementInformationCommand::undo()
|
|
{
|
|
for (auto element : m_map.keys()) {
|
|
element->setElementInformations(m_map.value(element).first);
|
|
}
|
|
updateProjectDB();
|
|
}
|
|
|
|
/**
|
|
@brief ChangeElementInformationCommand::redo
|
|
*/
|
|
void ChangeElementInformationCommand::redo()
|
|
{
|
|
for (auto element : m_map.keys()) {
|
|
element->setElementInformations(m_map.value(element).second);
|
|
}
|
|
updateProjectDB();
|
|
}
|
|
|
|
void ChangeElementInformationCommand::updateProjectDB()
|
|
{
|
|
auto elmt = m_map.keys().first().data();
|
|
if(elmt && elmt->diagram())
|
|
{
|
|
//need to have a list of element instead of QPointer<Element>
|
|
//for the function elementInfoChange of the database
|
|
QList<Element *> list_;
|
|
for (auto p_elmt : m_map.keys())
|
|
list_ << p_elmt.data();
|
|
|
|
elmt->diagram()->project()->dataBase()->elementInfoChanged(list_);
|
|
}
|
|
}
|