mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
Coding - Apply .clang-format formatting #286
Update empty method guards to new style with regex (see PR). Used clang-format 18.1.8. New actions to validate code formatting is added. Update .clang-format with disabling of include sorting. It is temporary changes, then include will be sorted. Apply formatting for /src and /tools folder. The files with .hxx,.cxx,.lxx,.h,.pxx,.hpp,*.cpp extensions.
This commit is contained in:
dpasukhi
@@ -11,7 +11,7 @@
|
||||
// distribution for complete text of the license and disclaimer of any warranty.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#include <inspector/TreeModel_Tools.hxx>
|
||||
#include <inspector/TreeModel_ModelBase.hxx>
|
||||
@@ -37,44 +37,44 @@ const int INFO_LENGHT = 60;
|
||||
// function : ToString
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
QString TreeModel_Tools::ToString (const QByteArray& theValue)
|
||||
QString TreeModel_Tools::ToString(const QByteArray& theValue)
|
||||
{
|
||||
char aBuffer[8];
|
||||
char aBuffer[8];
|
||||
QStringList aBytesList;
|
||||
for (int aByteId = 0; aByteId < theValue.size(); aByteId++)
|
||||
for (int aByteId = 0; aByteId < theValue.size(); aByteId++)
|
||||
{
|
||||
::sprintf (aBuffer, "#%02X", (unsigned char)theValue.at (aByteId));
|
||||
aBytesList.append (QString (aBuffer));
|
||||
::sprintf(aBuffer, "#%02X", (unsigned char)theValue.at(aByteId));
|
||||
aBytesList.append(QString(aBuffer));
|
||||
}
|
||||
return QString ("@ByteArray[%1]").arg (aBytesList.join (" "));
|
||||
return QString("@ByteArray[%1]").arg(aBytesList.join(" "));
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : ToByteArray
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
QByteArray TreeModel_Tools::ToByteArray (const QString& theValue)
|
||||
QByteArray TreeModel_Tools::ToByteArray(const QString& theValue)
|
||||
{
|
||||
QByteArray aStateArray;
|
||||
if (!theValue.startsWith ("@ByteArray[") || !theValue.endsWith (']'))
|
||||
if (!theValue.startsWith("@ByteArray[") || !theValue.endsWith(']'))
|
||||
return aStateArray;
|
||||
|
||||
QString aValue = theValue.mid (11, theValue.size() - 12);
|
||||
QStringList lst = aValue.split (QRegExp ("[\\s|,]"), QString::SkipEmptyParts);
|
||||
QString aValue = theValue.mid(11, theValue.size() - 12);
|
||||
QStringList lst = aValue.split(QRegExp("[\\s|,]"), QString::SkipEmptyParts);
|
||||
for (QStringList::ConstIterator aByteId = lst.begin(); aByteId != lst.end(); ++aByteId)
|
||||
{
|
||||
int aBase = 10;
|
||||
int aBase = 10;
|
||||
QString aString = *aByteId;
|
||||
if (aString.startsWith ("#"))
|
||||
if (aString.startsWith("#"))
|
||||
{
|
||||
aBase = 16;
|
||||
aString = aString.mid (1);
|
||||
aBase = 16;
|
||||
aString = aString.mid(1);
|
||||
}
|
||||
bool isOk = false;
|
||||
int aNum = aString.toInt (&isOk, aBase);
|
||||
int aNum = aString.toInt(&isOk, aBase);
|
||||
if (!isOk || aNum < 0 || aNum > 255)
|
||||
continue;
|
||||
aStateArray.append ((char)aNum);
|
||||
aStateArray.append((char)aNum);
|
||||
}
|
||||
return aStateArray;
|
||||
}
|
||||
@@ -83,38 +83,43 @@ QByteArray TreeModel_Tools::ToByteArray (const QString& theValue)
|
||||
// function : SaveState
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void TreeModel_Tools::SaveState (QTreeView* theTreeView, QMap<QString, QString>& theItems,
|
||||
const QString& thePrefix)
|
||||
void TreeModel_Tools::SaveState(QTreeView* theTreeView,
|
||||
QMap<QString, QString>& theItems,
|
||||
const QString& thePrefix)
|
||||
{
|
||||
QStringList aColumnWidths;
|
||||
for (int aColumnId = 0; aColumnId < theTreeView->model()->columnCount(); aColumnId++)
|
||||
{
|
||||
if (theTreeView->isColumnHidden (aColumnId))
|
||||
if (theTreeView->isColumnHidden(aColumnId))
|
||||
{
|
||||
aColumnWidths.append (QString());
|
||||
aColumnWidths.append(QString());
|
||||
}
|
||||
else
|
||||
aColumnWidths.append (QString::number (theTreeView->columnWidth (aColumnId)));
|
||||
aColumnWidths.append(QString::number(theTreeView->columnWidth(aColumnId)));
|
||||
}
|
||||
theItems[thePrefix + "columns_width"] = aColumnWidths.join (",");
|
||||
theItems[thePrefix + "columns_width"] = aColumnWidths.join(",");
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : RestoreState
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
bool TreeModel_Tools::RestoreState (QTreeView* theTreeView, const QString& theKey, const QString& theValue,
|
||||
const QString& thePrefix)
|
||||
bool TreeModel_Tools::RestoreState(QTreeView* theTreeView,
|
||||
const QString& theKey,
|
||||
const QString& theValue,
|
||||
const QString& thePrefix)
|
||||
{
|
||||
if (theKey == thePrefix + "columns_width")
|
||||
{
|
||||
QStringList aValues = theValue.split (",");
|
||||
for (int aColumnId = 0; aColumnId < theTreeView->model()->columnCount() && aColumnId < aValues.size(); aColumnId++)
|
||||
QStringList aValues = theValue.split(",");
|
||||
for (int aColumnId = 0;
|
||||
aColumnId < theTreeView->model()->columnCount() && aColumnId < aValues.size();
|
||||
aColumnId++)
|
||||
{
|
||||
bool isOk;
|
||||
int aWidth = aValues.at (aColumnId).toInt (&isOk);
|
||||
if (isOk && !theTreeView->isColumnHidden (aColumnId)) // do not resize hidden columns
|
||||
theTreeView->setColumnWidth (aColumnId, aWidth);
|
||||
int aWidth = aValues.at(aColumnId).toInt(&isOk);
|
||||
if (isOk && !theTreeView->isColumnHidden(aColumnId)) // do not resize hidden columns
|
||||
theTreeView->setColumnWidth(aColumnId, aWidth);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -128,13 +133,14 @@ bool TreeModel_Tools::RestoreState (QTreeView* theTreeView, const QString& theKe
|
||||
// =======================================================================
|
||||
void TreeModel_Tools::SetDefaultHeaderSections(QTreeView* theTreeView)
|
||||
{
|
||||
TreeModel_ModelBase* aTreeModel = dynamic_cast<TreeModel_ModelBase*> (theTreeView->model());
|
||||
TreeModel_ModelBase* aTreeModel = dynamic_cast<TreeModel_ModelBase*>(theTreeView->model());
|
||||
|
||||
for (int aColumnId = 0, aNbColumns = aTreeModel->columnCount(); aColumnId < aNbColumns; aColumnId++)
|
||||
for (int aColumnId = 0, aNbColumns = aTreeModel->columnCount(); aColumnId < aNbColumns;
|
||||
aColumnId++)
|
||||
{
|
||||
TreeModel_HeaderSection* aSection = aTreeModel->ChangeHeaderItem (aColumnId);
|
||||
theTreeView->setColumnWidth (aColumnId, aSection->GetWidth());
|
||||
theTreeView->setColumnHidden (aColumnId, aSection->IsHidden());
|
||||
TreeModel_HeaderSection* aSection = aTreeModel->ChangeHeaderItem(aColumnId);
|
||||
theTreeView->setColumnWidth(aColumnId, aSection->GetWidth());
|
||||
theTreeView->setColumnHidden(aColumnId, aSection->IsHidden());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,53 +148,56 @@ void TreeModel_Tools::SetDefaultHeaderSections(QTreeView* theTreeView)
|
||||
// function : UseVisibilityColumn
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void TreeModel_Tools::UseVisibilityColumn (QTreeView* theTreeView, const bool theActive)
|
||||
void TreeModel_Tools::UseVisibilityColumn(QTreeView* theTreeView, const bool theActive)
|
||||
{
|
||||
QHeaderView* aHeader = theTreeView->header();
|
||||
#if QT_VERSION < 0x050000
|
||||
aHeader->setResizeMode (TreeModel_ColumnType_Visibility, QHeaderView::Fixed);
|
||||
aHeader->setResizeMode(TreeModel_ColumnType_Visibility, QHeaderView::Fixed);
|
||||
#else
|
||||
aHeader->setSectionResizeMode (TreeModel_ColumnType_Visibility, QHeaderView::Fixed);
|
||||
aHeader->setSectionResizeMode(TreeModel_ColumnType_Visibility, QHeaderView::Fixed);
|
||||
#endif
|
||||
aHeader->moveSection (TreeModel_ColumnType_Name, TreeModel_ColumnType_Visibility);
|
||||
aHeader->moveSection(TreeModel_ColumnType_Name, TreeModel_ColumnType_Visibility);
|
||||
|
||||
TreeModel_ModelBase* aModel = dynamic_cast<TreeModel_ModelBase*> (theTreeView->model());
|
||||
TreeModel_HeaderSection* anItem = aModel->ChangeHeaderItem ((int)TreeModel_ColumnType_Visibility);
|
||||
anItem->SetIsHidden (theActive);
|
||||
anItem->SetWidth (TreeModel_ModelBase::ColumnVisibilityWidth());
|
||||
TreeModel_ModelBase* aModel = dynamic_cast<TreeModel_ModelBase*>(theTreeView->model());
|
||||
TreeModel_HeaderSection* anItem = aModel->ChangeHeaderItem((int)TreeModel_ColumnType_Visibility);
|
||||
anItem->SetIsHidden(theActive);
|
||||
anItem->SetWidth(TreeModel_ModelBase::ColumnVisibilityWidth());
|
||||
|
||||
aModel->SetUseVisibilityColumn (theActive);
|
||||
aModel->SetUseVisibilityColumn(theActive);
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : GetTextWidth
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
int TreeModel_Tools::GetTextWidth (const QString& theText, QObject*)
|
||||
int TreeModel_Tools::GetTextWidth(const QString& theText, QObject*)
|
||||
{
|
||||
// TODO: find margins like QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, (QWidget*)theParent);
|
||||
int aTextMargin = 10;
|
||||
QFontMetrics aFontMetrics (QApplication::font());
|
||||
QRect aBoundingRect = aFontMetrics.boundingRect (theText);
|
||||
return qMax (aBoundingRect.width(), aFontMetrics.width (theText)) + aTextMargin * 2;
|
||||
// TODO: find margins like QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin, 0,
|
||||
// (QWidget*)theParent);
|
||||
int aTextMargin = 10;
|
||||
QFontMetrics aFontMetrics(QApplication::font());
|
||||
QRect aBoundingRect = aFontMetrics.boundingRect(theText);
|
||||
return qMax(aBoundingRect.width(), aFontMetrics.width(theText)) + aTextMargin * 2;
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : CutString
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
QString TreeModel_Tools::CutString (const QString& theText, const int theWidth, const QString& theTail)
|
||||
QString TreeModel_Tools::CutString(const QString& theText,
|
||||
const int theWidth,
|
||||
const QString& theTail)
|
||||
{
|
||||
if (theText.isEmpty())
|
||||
return theText;
|
||||
|
||||
int aLength = theWidth < 0 ? INFO_LENGHT : theWidth - 3;
|
||||
|
||||
int anIndex = theText.indexOf ('\n');
|
||||
int anIndex = theText.indexOf('\n');
|
||||
if (anIndex > 0 && anIndex < aLength)
|
||||
aLength = anIndex;
|
||||
|
||||
return aLength < theText.length() ? theText.mid (0, aLength) + theTail : theText;
|
||||
return aLength < theText.length() ? theText.mid(0, aLength) + theTail : theText;
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
@@ -197,7 +206,7 @@ QString TreeModel_Tools::CutString (const QString& theText, const int theWidth,
|
||||
// =======================================================================
|
||||
QColor TreeModel_Tools::LightHighlightColor()
|
||||
{
|
||||
QWidget aWidget;
|
||||
QWidget aWidget;
|
||||
QPalette aPalette = aWidget.palette();
|
||||
return aPalette.highlight().color().lighter();
|
||||
}
|
||||
@@ -206,15 +215,15 @@ QColor TreeModel_Tools::LightHighlightColor()
|
||||
// function : SetExpandedTo
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void TreeModel_Tools::SetExpandedTo (QTreeView* theTreeView, const QModelIndex& theIndex)
|
||||
void TreeModel_Tools::SetExpandedTo(QTreeView* theTreeView, const QModelIndex& theIndex)
|
||||
{
|
||||
QAbstractItemModel* aModel = theTreeView->model();
|
||||
|
||||
QModelIndex aParent = aModel->parent (theIndex);
|
||||
QModelIndex aParent = aModel->parent(theIndex);
|
||||
while (aParent.isValid())
|
||||
{
|
||||
theTreeView->setExpanded (aParent, true);
|
||||
aParent = aModel->parent (aParent);
|
||||
theTreeView->setExpanded(aParent, true);
|
||||
aParent = aModel->parent(aParent);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -222,21 +231,23 @@ void TreeModel_Tools::SetExpandedTo (QTreeView* theTreeView, const QModelIndex&
|
||||
// function : setExpanded
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void TreeModel_Tools::SetExpanded (QTreeView* theTreeView, const QModelIndex& theIndex, const bool isExpanded,
|
||||
int& theLevels)
|
||||
void TreeModel_Tools::SetExpanded(QTreeView* theTreeView,
|
||||
const QModelIndex& theIndex,
|
||||
const bool isExpanded,
|
||||
int& theLevels)
|
||||
{
|
||||
bool isToExpand = theLevels == -1 || theLevels > 0;
|
||||
if (!isToExpand)
|
||||
return;
|
||||
|
||||
theTreeView->setExpanded (theIndex, isExpanded);
|
||||
theTreeView->setExpanded(theIndex, isExpanded);
|
||||
if (theLevels != -1)
|
||||
theLevels--;
|
||||
|
||||
QAbstractItemModel* aModel = theTreeView->model();
|
||||
for (int aRowId = 0, aRows = aModel->rowCount (theIndex); aRowId < aRows; aRowId++)
|
||||
for (int aRowId = 0, aRows = aModel->rowCount(theIndex); aRowId < aRows; aRowId++)
|
||||
{
|
||||
int aLevels = theLevels;
|
||||
SetExpanded (theTreeView, aModel->index (aRowId, 0, theIndex), isExpanded, aLevels);
|
||||
SetExpanded(theTreeView, aModel->index(aRowId, 0, theIndex), isExpanded, aLevels);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user