Sheet: Apply clang format

This commit is contained in:
wmayer
2023-09-10 14:24:00 +02:00
committed by wwmayer
parent 159525084d
commit 8bb1249cef
30 changed files with 1947 additions and 1403 deletions

View File

@@ -24,9 +24,9 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <sstream>
# include <QMenu>
# include <QString>
#include <QMenu>
#include <QString>
#include <sstream>
#endif
#include <Gui/Application.h>
@@ -36,9 +36,9 @@
#include <Gui/View3DInventor.h>
#include <Mod/Spreadsheet/App/Sheet.h>
#include "SpreadsheetView.h"
#include "ViewProviderSpreadsheet.h"
#include "ViewProviderSpreadsheetPy.h"
#include "SpreadsheetView.h"
using namespace Base;
@@ -51,14 +51,13 @@ PROPERTY_SOURCE(SpreadsheetGui::ViewProviderSheet, Gui::ViewProviderDocumentObje
ViewProviderSheet::ViewProviderSheet()
: Gui::ViewProviderDocumentObject()
{
}
{}
ViewProviderSheet::~ViewProviderSheet()
{
if (!view.isNull()) {
Gui::getMainWindow()->removeWindow(view);
// delete view;
// delete view;
}
}
@@ -76,27 +75,12 @@ std::vector<std::string> ViewProviderSheet::getDisplayModes() const
QIcon ViewProviderSheet::getIcon() const
{
static const char * const Points_Feature_xpm[] = {
"16 16 3 1",
" c None",
". c #000000",
"+ c #FFFFFF",
" ",
" ",
"................",
".++++.++++.++++.",
".++++.++++.++++.",
"................",
".++++.++++.++++.",
".++++.++++.++++.",
"................",
".++++.++++.++++.",
".++++.++++.++++.",
"................",
".++++.++++.++++.",
".++++.++++.++++.",
"................",
" "};
static const char* const Points_Feature_xpm[] = {
"16 16 3 1", " c None", ". c #000000", "+ c #FFFFFF",
" ", " ", "................", ".++++.++++.++++.",
".++++.++++.++++.", "................", ".++++.++++.++++.", ".++++.++++.++++.",
"................", ".++++.++++.++++.", ".++++.++++.++++.", "................",
".++++.++++.++++.", ".++++.++++.++++.", "................", " "};
QPixmap px(Points_Feature_xpm);
return px;
}
@@ -123,14 +107,14 @@ bool ViewProviderSheet::doubleClicked()
return true;
}
void ViewProviderSheet::setupContextMenu(QMenu * menu, QObject *receiver, const char *member)
void ViewProviderSheet::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act;
act = menu->addAction(QObject::tr("Show spreadsheet"), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
}
Sheet *ViewProviderSheet::getSpreadsheetObject() const
Sheet* ViewProviderSheet::getSpreadsheetObject() const
{
return freecad_dynamic_cast<Sheet>(pcObject);
}
@@ -138,21 +122,23 @@ Sheet *ViewProviderSheet::getSpreadsheetObject() const
void ViewProviderSheet::beforeDelete()
{
ViewProviderDocumentObject::beforeDelete();
if(!view)
if (!view) {
return;
if(view==Gui::getMainWindow()->activeWindow())
getDocument()->setActiveView(nullptr,Gui::View3DInventor::getClassTypeId());
}
if (view == Gui::getMainWindow()->activeWindow()) {
getDocument()->setActiveView(nullptr, Gui::View3DInventor::getClassTypeId());
}
Gui::getMainWindow()->removeWindow(view);
}
SheetView *ViewProviderSheet::showSpreadsheetView()
SheetView* ViewProviderSheet::showSpreadsheetView()
{
if (!view){
Gui::Document* doc = Gui::Application::Instance->getDocument
(this->pcObject->getDocument());
if (!view) {
Gui::Document* doc = Gui::Application::Instance->getDocument(this->pcObject->getDocument());
view = new SheetView(doc, this->pcObject, Gui::getMainWindow());
view->setWindowIcon(Gui::BitmapFactory().pixmap(":icons/Spreadsheet.svg"));
view->setWindowTitle(QString::fromUtf8(pcObject->Label.getValue()) + QString::fromLatin1("[*]"));
view->setWindowTitle(QString::fromUtf8(pcObject->Label.getValue())
+ QString::fromLatin1("[*]"));
Gui::getMainWindow()->addWindow(view);
startEditing();
}
@@ -160,32 +146,35 @@ SheetView *ViewProviderSheet::showSpreadsheetView()
return view;
}
Gui::MDIView *ViewProviderSheet::getMDIView() const
Gui::MDIView* ViewProviderSheet::getMDIView() const
{
return const_cast<ViewProviderSheet*>(this)->showSpreadsheetView();
}
void ViewProviderSheet::updateData(const App::Property* prop)
{
if (view)
if (view) {
view->updateCell(prop);
}
}
PyObject *ViewProviderSheet::getPyObject()
PyObject* ViewProviderSheet::getPyObject()
{
if (!pyViewObject)
if (!pyViewObject) {
pyViewObject = new ViewProviderSpreadsheetPy(this);
}
pyViewObject->IncRef();
return pyViewObject;
}
// Python feature -----------------------------------------------------------------------
namespace Gui {
namespace Gui
{
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(SpreadsheetGui::ViewProviderSheetPython, SpreadsheetGui::ViewProviderSheet)
/// @endcond
// explicit template instantiation
template class SpreadsheetGuiExport ViewProviderPythonFeatureT<ViewProviderSheet>;
}
}// namespace Gui