SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

blockview #22 #25

Browse Source
This commit is contained in:
Пелипенко Иван
2022-07-20 11:14:30 +03:00
parent 883612e835
commit b525077156
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/blockview/blockview.cpp
View File

@@ -293,7 +293,7 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
return true;
}
if (mm_ci) {
if ((mm_ci->data(bvidType).toInt() == bvitPin) && m_connect && !me->modifiers().testFlag(Qt::ControlModifier)) {
if ((mm_ci->data(bvidType).toInt() == bvitPin) && m_connect) {
if (qgraphicsitem_cast<BlockItemPin*>(mm_ci)->state() == BlockItemPin::Hover) {
trace_from = mm_ci->scenePos();
qgraphicsitem_cast<BlockItemPin*>(mm_ci)->clearStateStack();
@@ -318,8 +318,8 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
wavetrace.setPreferredDirection(BlockViewWavetrace::Horizontal);
else
wavetrace.setPreferredDirection(BlockViewWavetrace::Vertical);
return true;
}
return true;
}
}
cur_scl = qSqrt(transform().determinant());
@@ -1740,6 +1740,8 @@ void BlockView::newBranchAccept(BlockBusItem * item) {
tmp_bus.hide();
if (tmp_bus.pol.size() < 2) return;
tmp_bus.pol.pop_front();
if ((tmp_bus.pol.size() == 1) && (tmp_bus.pol[0] == item->press_pos))
return;
int np = item->addPoint(item->press_pos);
if (np < 0) return;
if (match_bus) {

20
utils/piintrospector/piintrospector.cpp
View File

@@ -107,16 +107,16 @@ void QPIIntrospector::buildDumpSection(QTreeWidgetItem * pi, PIString & str) {
void QPIIntrospector::showInfo() {
PIString s;
s << info.execCommand << "\n";
s << info.execDateTime.toString() << "\n";
s << info.OS_name << "(" << info.OS_version << ", " << info.architecture << ")\n";
s << info.user << "\n";
s << info.build_options.join(", ") << "\n";
s << "\n";
s << "load k: " << PIString::fromNumber(stat.proc.cpu_load_system, 'f', 2) << " %\n";
s << "load u: " << PIString::fromNumber(stat.proc.cpu_load_user, 'f', 2) << " %\n";
s << "threads: " << stat.proc.threads << "\n";
s << "memory usage: " << stat.proc.physical_memsize_readable;
s += info.execCommand + "\n";
s += info.execDateTime.toString() + "\n";
s += info.OS_name + "(" + info.OS_version + ", " + info.architecture + ")\n";
s += info.user + "\n";
s += info.build_options.join(", ") + "\n";
s += "\n";
s += "load k: " + PIString::fromNumber(stat.proc.cpu_load_system, 'f', 2) + " %\n";
s += "load u: " + PIString::fromNumber(stat.proc.cpu_load_user, 'f', 2) + " %\n";
s += "threads: " + PIString::fromNumber(stat.proc.threads) + "\n";
s += "memory usage: " + stat.proc.physical_memsize_readable;
labelInfo->setText(PI2QString(s));
int tlic = treeStat->topLevelItemCount();
for (int i = tlic; i < stat.threads.size_s(); ++i)