Clang format to ignore 3rdparty and fix one file

This commit is contained in:
Miodrag Milanovic 2018-06-11 21:36:54 +02:00
parent 599cbb12fa
commit 102e10f2dd
2 changed files with 84 additions and 36 deletions

View File

@ -108,6 +108,7 @@ endforeach (family)
file(GLOB_RECURSE CLANGFORMAT_FILES *.cc *.h) file(GLOB_RECURSE CLANGFORMAT_FILES *.cc *.h)
string(REGEX REPLACE "[^;]*/ice40/chipdbs/chipdb-[^;]*.cc" "" CLANGFORMAT_FILES "${CLANGFORMAT_FILES}") string(REGEX REPLACE "[^;]*/ice40/chipdbs/chipdb-[^;]*.cc" "" CLANGFORMAT_FILES "${CLANGFORMAT_FILES}")
string(REGEX REPLACE "[^;]*/3rdparty[^;]*" "" CLANGFORMAT_FILES "${CLANGFORMAT_FILES}")
add_custom_target( add_custom_target(
clangformat clangformat

View File

@ -4,10 +4,10 @@
#include <string> #include <string>
#include "emb.h" #include "emb.h"
#include "pybindings.h" #include "pybindings.h"
#include "ui_mainwindow.h"
#include "qtpropertymanager.h" #include "qtpropertymanager.h"
#include "qtvariantproperty.h"
#include "qttreepropertybrowser.h" #include "qttreepropertybrowser.h"
#include "qtvariantproperty.h"
#include "ui_mainwindow.h"
#include <QDate> #include <QDate>
#include <QLocale> #include <QLocale>
@ -26,116 +26,163 @@ MainWindow::MainWindow(Design *_design, QWidget *parent)
emb::set_stdout(write); emb::set_stdout(write);
std::string title = "nextpnr-ice40 - " + design->chip.getChipName(); std::string title = "nextpnr-ice40 - " + design->chip.getChipName();
setWindowTitle(title.c_str()); setWindowTitle(title.c_str());
QtVariantPropertyManager *variantManager = new QtVariantPropertyManager(); QtVariantPropertyManager *variantManager = new QtVariantPropertyManager();
int i = 0; int i = 0;
QtProperty *topItem = variantManager->addProperty(QtVariantPropertyManager::groupTypeId(), QtProperty *topItem = variantManager->addProperty(
QString::number(i++) + QLatin1String(" Group Property")); QtVariantPropertyManager::groupTypeId(),
QString::number(i++) + QLatin1String(" Group Property"));
QtVariantProperty *item = variantManager->addProperty(QVariant::Bool, QString::number(i++) + QLatin1String(" Bool Property")); QtVariantProperty *item = variantManager->addProperty(
QVariant::Bool,
QString::number(i++) + QLatin1String(" Bool Property"));
item->setValue(true); item->setValue(true);
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Int, QString::number(i++) + QLatin1String(" Int Property")); item = variantManager->addProperty(QVariant::Int,
QString::number(i++) +
QLatin1String(" Int Property"));
item->setValue(20); item->setValue(20);
item->setAttribute(QLatin1String("minimum"), 0); item->setAttribute(QLatin1String("minimum"), 0);
item->setAttribute(QLatin1String("maximum"), 100); item->setAttribute(QLatin1String("maximum"), 100);
item->setAttribute(QLatin1String("singleStep"), 10); item->setAttribute(QLatin1String("singleStep"), 10);
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Double, QString::number(i++) + QLatin1String(" Double Property")); item = variantManager->addProperty(
QVariant::Double,
QString::number(i++) + QLatin1String(" Double Property"));
item->setValue(1.2345); item->setValue(1.2345);
item->setAttribute(QLatin1String("singleStep"), 0.1); item->setAttribute(QLatin1String("singleStep"), 0.1);
item->setAttribute(QLatin1String("decimals"), 3); item->setAttribute(QLatin1String("decimals"), 3);
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::String, QString::number(i++) + QLatin1String(" String Property")); item = variantManager->addProperty(
QVariant::String,
QString::number(i++) + QLatin1String(" String Property"));
item->setValue("Value"); item->setValue("Value");
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Date, QString::number(i++) + QLatin1String(" Date Property")); item = variantManager->addProperty(QVariant::Date,
QString::number(i++) +
QLatin1String(" Date Property"));
item->setValue(QDate::currentDate().addDays(2)); item->setValue(QDate::currentDate().addDays(2));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Time, QString::number(i++) + QLatin1String(" Time Property")); item = variantManager->addProperty(QVariant::Time,
QString::number(i++) +
QLatin1String(" Time Property"));
item->setValue(QTime::currentTime()); item->setValue(QTime::currentTime());
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::DateTime, QString::number(i++) + QLatin1String(" DateTime Property")); item = variantManager->addProperty(
QVariant::DateTime,
QString::number(i++) + QLatin1String(" DateTime Property"));
item->setValue(QDateTime::currentDateTime()); item->setValue(QDateTime::currentDateTime());
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::KeySequence, QString::number(i++) + QLatin1String(" KeySequence Property")); item = variantManager->addProperty(
QVariant::KeySequence,
QString::number(i++) + QLatin1String(" KeySequence Property"));
item->setValue(QKeySequence(Qt::ControlModifier | Qt::Key_Q)); item->setValue(QKeySequence(Qt::ControlModifier | Qt::Key_Q));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Char, QString::number(i++) + QLatin1String(" Char Property")); item = variantManager->addProperty(QVariant::Char,
QString::number(i++) +
QLatin1String(" Char Property"));
item->setValue(QChar(386)); item->setValue(QChar(386));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Locale, QString::number(i++) + QLatin1String(" Locale Property")); item = variantManager->addProperty(
QVariant::Locale,
QString::number(i++) + QLatin1String(" Locale Property"));
item->setValue(QLocale(QLocale::Polish, QLocale::Poland)); item->setValue(QLocale(QLocale::Polish, QLocale::Poland));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Point, QString::number(i++) + QLatin1String(" Point Property")); item = variantManager->addProperty(
QVariant::Point,
QString::number(i++) + QLatin1String(" Point Property"));
item->setValue(QPoint(10, 10)); item->setValue(QPoint(10, 10));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::PointF, QString::number(i++) + QLatin1String(" PointF Property")); item = variantManager->addProperty(
QVariant::PointF,
QString::number(i++) + QLatin1String(" PointF Property"));
item->setValue(QPointF(1.2345, -1.23451)); item->setValue(QPointF(1.2345, -1.23451));
item->setAttribute(QLatin1String("decimals"), 3); item->setAttribute(QLatin1String("decimals"), 3);
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Size, QString::number(i++) + QLatin1String(" Size Property")); item = variantManager->addProperty(QVariant::Size,
QString::number(i++) +
QLatin1String(" Size Property"));
item->setValue(QSize(20, 20)); item->setValue(QSize(20, 20));
item->setAttribute(QLatin1String("minimum"), QSize(10, 10)); item->setAttribute(QLatin1String("minimum"), QSize(10, 10));
item->setAttribute(QLatin1String("maximum"), QSize(30, 30)); item->setAttribute(QLatin1String("maximum"), QSize(30, 30));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::SizeF, QString::number(i++) + QLatin1String(" SizeF Property")); item = variantManager->addProperty(
QVariant::SizeF,
QString::number(i++) + QLatin1String(" SizeF Property"));
item->setValue(QSizeF(1.2345, 1.2345)); item->setValue(QSizeF(1.2345, 1.2345));
item->setAttribute(QLatin1String("decimals"), 3); item->setAttribute(QLatin1String("decimals"), 3);
item->setAttribute(QLatin1String("minimum"), QSizeF(0.12, 0.34)); item->setAttribute(QLatin1String("minimum"), QSizeF(0.12, 0.34));
item->setAttribute(QLatin1String("maximum"), QSizeF(20.56, 20.78)); item->setAttribute(QLatin1String("maximum"), QSizeF(20.56, 20.78));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Rect, QString::number(i++) + QLatin1String(" Rect Property")); item = variantManager->addProperty(QVariant::Rect,
QString::number(i++) +
QLatin1String(" Rect Property"));
item->setValue(QRect(10, 10, 20, 20)); item->setValue(QRect(10, 10, 20, 20));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item->setAttribute(QLatin1String("constraint"), QRect(0, 0, 50, 50)); item->setAttribute(QLatin1String("constraint"), QRect(0, 0, 50, 50));
item = variantManager->addProperty(QVariant::RectF, QString::number(i++) + QLatin1String(" RectF Property")); item = variantManager->addProperty(
QVariant::RectF,
QString::number(i++) + QLatin1String(" RectF Property"));
item->setValue(QRectF(1.2345, 1.2345, 1.2345, 1.2345)); item->setValue(QRectF(1.2345, 1.2345, 1.2345, 1.2345));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item->setAttribute(QLatin1String("constraint"), QRectF(0, 0, 50, 50)); item->setAttribute(QLatin1String("constraint"), QRectF(0, 0, 50, 50));
item->setAttribute(QLatin1String("decimals"), 3); item->setAttribute(QLatin1String("decimals"), 3);
item = variantManager->addProperty(QtVariantPropertyManager::enumTypeId(), item = variantManager->addProperty(QtVariantPropertyManager::enumTypeId(),
QString::number(i++) + QLatin1String(" Enum Property")); QString::number(i++) +
QLatin1String(" Enum Property"));
QStringList enumNames; QStringList enumNames;
enumNames << "Enum0" << "Enum1" << "Enum2"; enumNames << "Enum0"
<< "Enum1"
<< "Enum2";
item->setAttribute(QLatin1String("enumNames"), enumNames); item->setAttribute(QLatin1String("enumNames"), enumNames);
item->setValue(1); item->setValue(1);
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QtVariantPropertyManager::flagTypeId(), item = variantManager->addProperty(QtVariantPropertyManager::flagTypeId(),
QString::number(i++) + QLatin1String(" Flag Property")); QString::number(i++) +
QLatin1String(" Flag Property"));
QStringList flagNames; QStringList flagNames;
flagNames << "Flag0" << "Flag1" << "Flag2"; flagNames << "Flag0"
<< "Flag1"
<< "Flag2";
item->setAttribute(QLatin1String("flagNames"), flagNames); item->setAttribute(QLatin1String("flagNames"), flagNames);
item->setValue(5); item->setValue(5);
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::SizePolicy, QString::number(i++) + QLatin1String(" SizePolicy Property")); item = variantManager->addProperty(
QVariant::SizePolicy,
QString::number(i++) + QLatin1String(" SizePolicy Property"));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Font, QString::number(i++) + QLatin1String(" Font Property")); item = variantManager->addProperty(QVariant::Font,
QString::number(i++) +
QLatin1String(" Font Property"));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Cursor, QString::number(i++) + QLatin1String(" Cursor Property")); item = variantManager->addProperty(
QVariant::Cursor,
QString::number(i++) + QLatin1String(" Cursor Property"));
topItem->addSubProperty(item); topItem->addSubProperty(item);
item = variantManager->addProperty(QVariant::Color, QString::number(i++) + QLatin1String(" Color Property")); item = variantManager->addProperty(
QVariant::Color,
QString::number(i++) + QLatin1String(" Color Property"));
topItem->addSubProperty(item); topItem->addSubProperty(item);
QtVariantEditorFactory *variantFactory = new QtVariantEditorFactory(); QtVariantEditorFactory *variantFactory = new QtVariantEditorFactory();
@ -149,13 +196,13 @@ MainWindow::MainWindow(Design *_design, QWidget *parent)
ui->splitter_2->addWidget(variantEditor); ui->splitter_2->addWidget(variantEditor);
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
//delete variantManager; // delete variantManager;
//delete variantFactory; // delete variantFactory;
//delete variantEditor; // delete variantEditor;
delete ui; delete ui;
} }
void handle_system_exit() { exit(-1); } void handle_system_exit() { exit(-1); }