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/DFBrowser_TreeLevelLine.hxx>
|
||||
|
||||
@@ -39,68 +39,72 @@
|
||||
#include <Standard_WarningsRestore.hxx>
|
||||
|
||||
const int HISTORY_SIZE = 10;
|
||||
const int MARGIN_SIZE = 2;
|
||||
const int MARGIN_SIZE = 2;
|
||||
|
||||
// =======================================================================
|
||||
// function : Constructor
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
DFBrowser_TreeLevelLine::DFBrowser_TreeLevelLine (QWidget* theParent)
|
||||
: QObject (theParent), mySelectionProcessingBlocked (false), myCurrentHistoryIndex (-1)
|
||||
DFBrowser_TreeLevelLine::DFBrowser_TreeLevelLine(QWidget* theParent)
|
||||
: QObject(theParent),
|
||||
mySelectionProcessingBlocked(false),
|
||||
myCurrentHistoryIndex(-1)
|
||||
{
|
||||
myMainWindow = new QWidget (theParent);
|
||||
QGridLayout* aLayout = new QGridLayout (myMainWindow);
|
||||
aLayout->setContentsMargins (MARGIN_SIZE, MARGIN_SIZE, MARGIN_SIZE, MARGIN_SIZE);
|
||||
myMainWindow = new QWidget(theParent);
|
||||
QGridLayout* aLayout = new QGridLayout(myMainWindow);
|
||||
aLayout->setContentsMargins(MARGIN_SIZE, MARGIN_SIZE, MARGIN_SIZE, MARGIN_SIZE);
|
||||
|
||||
myBackwardButton = new QToolButton (myMainWindow);
|
||||
myBackwardButton->setIcon (QIcon (":/icons/treeline_backward.png"));
|
||||
myBackwardButton->setToolTip (tr ("Backward"));
|
||||
connect (myBackwardButton, SIGNAL (clicked()), this, SLOT (onActionClicked()));
|
||||
aLayout->addWidget (myBackwardButton, 0, 0);
|
||||
myBackwardButton = new QToolButton(myMainWindow);
|
||||
myBackwardButton->setIcon(QIcon(":/icons/treeline_backward.png"));
|
||||
myBackwardButton->setToolTip(tr("Backward"));
|
||||
connect(myBackwardButton, SIGNAL(clicked()), this, SLOT(onActionClicked()));
|
||||
aLayout->addWidget(myBackwardButton, 0, 0);
|
||||
|
||||
myForwardButton = new QToolButton (myMainWindow);
|
||||
myForwardButton->setIcon (QIcon (":/icons/treeline_forward.png"));
|
||||
myForwardButton->setToolTip (tr ("Forward"));
|
||||
connect (myForwardButton, SIGNAL (clicked()), this, SLOT (onActionClicked()));
|
||||
aLayout->addWidget (myForwardButton, 0, 1);
|
||||
myForwardButton = new QToolButton(myMainWindow);
|
||||
myForwardButton->setIcon(QIcon(":/icons/treeline_forward.png"));
|
||||
myForwardButton->setToolTip(tr("Forward"));
|
||||
connect(myForwardButton, SIGNAL(clicked()), this, SLOT(onActionClicked()));
|
||||
aLayout->addWidget(myForwardButton, 0, 1);
|
||||
|
||||
myTableView = new QTableView (myMainWindow);
|
||||
myTableView->horizontalHeader()->setVisible (false);
|
||||
myTableView = new QTableView(myMainWindow);
|
||||
myTableView->horizontalHeader()->setVisible(false);
|
||||
QHeaderView* aVHeader = myTableView->verticalHeader();
|
||||
aVHeader->setVisible (false);
|
||||
aVHeader->setVisible(false);
|
||||
int aDefCellSize = aVHeader->minimumSectionSize() + TreeModel_Tools::HeaderSectionMargin();
|
||||
aVHeader->setDefaultSectionSize (aDefCellSize);
|
||||
aLayout->addWidget (myTableView, 0, 2);
|
||||
aVHeader->setDefaultSectionSize(aDefCellSize);
|
||||
aLayout->addWidget(myTableView, 0, 2);
|
||||
|
||||
myTableView->setFixedHeight (aDefCellSize);
|
||||
myTableView->horizontalHeader()->setMinimumSectionSize (5); // it will be resized by context
|
||||
myTableView->setHorizontalScrollMode (QAbstractItemView::ScrollPerItem);
|
||||
myTableView->setHorizontalScrollBarPolicy (Qt::ScrollBarAlwaysOff); //! TEMPORARY
|
||||
myTableView->setShowGrid (false);
|
||||
myTableView->setFixedHeight(aDefCellSize);
|
||||
myTableView->horizontalHeader()->setMinimumSectionSize(5); // it will be resized by context
|
||||
myTableView->setHorizontalScrollMode(QAbstractItemView::ScrollPerItem);
|
||||
myTableView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); //! TEMPORARY
|
||||
myTableView->setShowGrid(false);
|
||||
|
||||
DFBrowser_TreeLevelLineModel* aHModel = new DFBrowser_TreeLevelLineModel (myTableView);
|
||||
myTableView->setModel (aHModel);
|
||||
DFBrowser_TreeLevelLineModel* aHModel = new DFBrowser_TreeLevelLineModel(myTableView);
|
||||
myTableView->setModel(aHModel);
|
||||
|
||||
QItemSelectionModel* aSelectionModel = new QItemSelectionModel (aHModel);
|
||||
myTableView->setSelectionMode (QAbstractItemView::SingleSelection);
|
||||
myTableView->setSelectionModel (aSelectionModel);
|
||||
connect (aSelectionModel, SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)),
|
||||
this, SLOT (onTableSelectionChanged (const QItemSelection&, const QItemSelection&)));
|
||||
QItemSelectionModel* aSelectionModel = new QItemSelectionModel(aHModel);
|
||||
myTableView->setSelectionMode(QAbstractItemView::SingleSelection);
|
||||
myTableView->setSelectionModel(aSelectionModel);
|
||||
connect(aSelectionModel,
|
||||
SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
|
||||
this,
|
||||
SLOT(onTableSelectionChanged(const QItemSelection&, const QItemSelection&)));
|
||||
|
||||
// highlight for items
|
||||
myTableView->viewport()->setAttribute (Qt::WA_Hover);
|
||||
myTableView->setItemDelegate (new DFBrowser_TreeLevelLineDelegate (myTableView));
|
||||
myTableView->viewport()->setAttribute(Qt::WA_Hover);
|
||||
myTableView->setItemDelegate(new DFBrowser_TreeLevelLineDelegate(myTableView));
|
||||
|
||||
aLayout->setColumnStretch (2, 1);
|
||||
aLayout->setColumnStretch(2, 1);
|
||||
|
||||
myUpdateButton = new QToolButton (myMainWindow);
|
||||
myUpdateButton->setIcon (QIcon (":/icons/treeline_update.png"));
|
||||
myUpdateButton->setToolTip (tr ("Update Tree Model"));
|
||||
connect (myUpdateButton, SIGNAL (clicked()), this, SLOT (onActionClicked()));
|
||||
aLayout->addWidget (myUpdateButton, 0, 3);
|
||||
myUpdateButton = new QToolButton(myMainWindow);
|
||||
myUpdateButton->setIcon(QIcon(":/icons/treeline_update.png"));
|
||||
myUpdateButton->setToolTip(tr("Update Tree Model"));
|
||||
connect(myUpdateButton, SIGNAL(clicked()), this, SLOT(onActionClicked()));
|
||||
aLayout->addWidget(myUpdateButton, 0, 3);
|
||||
|
||||
mySearchLine = new DFBrowser_SearchLine (myMainWindow);
|
||||
aLayout->addWidget (mySearchLine, 0, 4);
|
||||
mySearchLine = new DFBrowser_SearchLine(myMainWindow);
|
||||
aLayout->addWidget(mySearchLine, 0, 4);
|
||||
|
||||
updateActionsState();
|
||||
}
|
||||
@@ -112,31 +116,32 @@ DFBrowser_TreeLevelLine::DFBrowser_TreeLevelLine (QWidget* theParent)
|
||||
void DFBrowser_TreeLevelLine::ClearHistory()
|
||||
{
|
||||
myHistoryIndices.clear();
|
||||
setCurrentHistoryIndex (-1);
|
||||
setCurrentHistoryIndex(-1);
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : onSelectionChanged
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void DFBrowser_TreeLevelLine::OnTreeViewSelectionChanged (const QItemSelection& theSelected,
|
||||
const QItemSelection&)
|
||||
void DFBrowser_TreeLevelLine::OnTreeViewSelectionChanged(const QItemSelection& theSelected,
|
||||
const QItemSelection&)
|
||||
{
|
||||
QModelIndexList aSelectedIndices = theSelected.indexes();
|
||||
QModelIndex aSelectedIndex = TreeModel_ModelBase::SingleSelected (aSelectedIndices, 0);
|
||||
QModelIndex aSelectedIndex = TreeModel_ModelBase::SingleSelected(aSelectedIndices, 0);
|
||||
|
||||
if (!mySelectionProcessingBlocked) // we're processing action click
|
||||
setForwardIndex (aSelectedIndex);
|
||||
setForwardIndex(aSelectedIndex);
|
||||
|
||||
bool isBlocked = mySelectionProcessingBlocked;
|
||||
// block selection processing in order to avoid circling by processing table selection changing
|
||||
mySelectionProcessingBlocked = true;
|
||||
DFBrowser_TreeLevelLineModel* aModel = dynamic_cast<DFBrowser_TreeLevelLineModel*> (myTableView->model());
|
||||
aModel->Init (aSelectedIndex);
|
||||
DFBrowser_TreeLevelLineModel* aModel =
|
||||
dynamic_cast<DFBrowser_TreeLevelLineModel*>(myTableView->model());
|
||||
aModel->Init(aSelectedIndex);
|
||||
myTableView->selectionModel()->clearSelection();
|
||||
myTableView->resizeColumnsToContents();
|
||||
|
||||
myTableView->scrollTo (myTableView->model()->index (0, myTableView->model()->columnCount()-1));
|
||||
myTableView->scrollTo(myTableView->model()->index(0, myTableView->model()->columnCount() - 1));
|
||||
|
||||
mySelectionProcessingBlocked = isBlocked;
|
||||
}
|
||||
@@ -145,18 +150,20 @@ void DFBrowser_TreeLevelLine::OnTreeViewSelectionChanged (const QItemSelection&
|
||||
// function : onTableSelectionChanged
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void DFBrowser_TreeLevelLine::onTableSelectionChanged (const QItemSelection& theSelected,
|
||||
const QItemSelection&)
|
||||
void DFBrowser_TreeLevelLine::onTableSelectionChanged(const QItemSelection& theSelected,
|
||||
const QItemSelection&)
|
||||
{
|
||||
if (mySelectionProcessingBlocked)
|
||||
return;
|
||||
|
||||
DFBrowser_TreeLevelLineModel* aTableModel = dynamic_cast<DFBrowser_TreeLevelLineModel*> (myTableView->model());
|
||||
DFBrowser_TreeLevelLineModel* aTableModel =
|
||||
dynamic_cast<DFBrowser_TreeLevelLineModel*>(myTableView->model());
|
||||
if (!aTableModel)
|
||||
return;
|
||||
|
||||
QModelIndex aSelectedIndex = TreeModel_ModelBase::SingleSelected (theSelected.indexes(), 0, Qt::Vertical);
|
||||
emit indexSelected (aTableModel->GetTreeViewIndex (aSelectedIndex));
|
||||
QModelIndex aSelectedIndex =
|
||||
TreeModel_ModelBase::SingleSelected(theSelected.indexes(), 0, Qt::Vertical);
|
||||
emit indexSelected(aTableModel->GetTreeViewIndex(aSelectedIndex));
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
@@ -168,23 +175,23 @@ void DFBrowser_TreeLevelLine::onActionClicked()
|
||||
QToolButton* aSender = (QToolButton*)sender();
|
||||
if (aSender == myBackwardButton || aSender == myForwardButton)
|
||||
{
|
||||
bool aBlocked = mySelectionProcessingBlocked;
|
||||
bool aBlocked = mySelectionProcessingBlocked;
|
||||
mySelectionProcessingBlocked = true;
|
||||
QModelIndex anIndex;
|
||||
if (aSender == myBackwardButton)
|
||||
{
|
||||
anIndex = getBackwardIndex();
|
||||
if (anIndex.isValid())
|
||||
setCurrentHistoryIndex (myCurrentHistoryIndex - 1);
|
||||
setCurrentHistoryIndex(myCurrentHistoryIndex - 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
anIndex = getForwardIndex();
|
||||
if (anIndex.isValid())
|
||||
setCurrentHistoryIndex (myCurrentHistoryIndex + 1);
|
||||
setCurrentHistoryIndex(myCurrentHistoryIndex + 1);
|
||||
}
|
||||
if (anIndex.isValid())
|
||||
emit indexSelected (anIndex);
|
||||
emit indexSelected(anIndex);
|
||||
mySelectionProcessingBlocked = aBlocked;
|
||||
}
|
||||
else if (aSender == myUpdateButton)
|
||||
@@ -197,7 +204,7 @@ void DFBrowser_TreeLevelLine::onActionClicked()
|
||||
// =======================================================================
|
||||
QModelIndex DFBrowser_TreeLevelLine::getBackwardIndex()
|
||||
{
|
||||
return myCurrentHistoryIndex > 0 ? myHistoryIndices[myCurrentHistoryIndex-1] : QModelIndex();
|
||||
return myCurrentHistoryIndex > 0 ? myHistoryIndices[myCurrentHistoryIndex - 1] : QModelIndex();
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
@@ -207,30 +214,31 @@ QModelIndex DFBrowser_TreeLevelLine::getBackwardIndex()
|
||||
QModelIndex DFBrowser_TreeLevelLine::getForwardIndex()
|
||||
{
|
||||
return (myCurrentHistoryIndex >= 0 && myCurrentHistoryIndex + 1 < myHistoryIndices.count())
|
||||
? myHistoryIndices[myCurrentHistoryIndex + 1] : QModelIndex();
|
||||
? myHistoryIndices[myCurrentHistoryIndex + 1]
|
||||
: QModelIndex();
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : setForwardIndex
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void DFBrowser_TreeLevelLine::setForwardIndex (const QModelIndex& theIndex)
|
||||
void DFBrowser_TreeLevelLine::setForwardIndex(const QModelIndex& theIndex)
|
||||
{
|
||||
while (myCurrentHistoryIndex != myHistoryIndices.count() - 1)
|
||||
myHistoryIndices.removeLast();
|
||||
|
||||
myHistoryIndices.append (theIndex);
|
||||
myHistoryIndices.append(theIndex);
|
||||
if (myHistoryIndices.size() > HISTORY_SIZE)
|
||||
myHistoryIndices.removeFirst();
|
||||
|
||||
setCurrentHistoryIndex (myHistoryIndices.count() - 1);
|
||||
setCurrentHistoryIndex(myHistoryIndices.count() - 1);
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : setCurrentHistoryIndex
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
void DFBrowser_TreeLevelLine::setCurrentHistoryIndex (const int theIndexId)
|
||||
void DFBrowser_TreeLevelLine::setCurrentHistoryIndex(const int theIndexId)
|
||||
{
|
||||
myCurrentHistoryIndex = theIndexId;
|
||||
updateActionsState();
|
||||
@@ -244,12 +252,12 @@ void DFBrowser_TreeLevelLine::updateActionsState()
|
||||
{
|
||||
if (myCurrentHistoryIndex < 0)
|
||||
{
|
||||
myBackwardButton->setEnabled (false);
|
||||
myForwardButton->setEnabled (false);
|
||||
myBackwardButton->setEnabled(false);
|
||||
myForwardButton->setEnabled(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
myBackwardButton->setEnabled (myCurrentHistoryIndex > 0);
|
||||
myForwardButton->setEnabled (myCurrentHistoryIndex < myHistoryIndices.size() - 1);
|
||||
myBackwardButton->setEnabled(myCurrentHistoryIndex > 0);
|
||||
myForwardButton->setEnabled(myCurrentHistoryIndex < myHistoryIndices.size() - 1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user