Skip to content

Commit

Permalink
Add clang-format checking (#65)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffwheeler authored Apr 14, 2024
1 parent 82ca44d commit 08823bc
Show file tree
Hide file tree
Showing 16 changed files with 727 additions and 706 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BasedOnStyle: Google
19 changes: 19 additions & 0 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: clang-format Check

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/[email protected]
with:
clang-format-version: '18'
check-path: 'src'
3 changes: 2 additions & 1 deletion src/brd_cli/html.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ void stream_header(std::string &fname, File<kAMax> &f) {
std::cout << "<td>Imperial</td>";
break;
default:
printf("<td>Unrecognized! <code>%02hhX</code></td>", (uint8_t)f.hdr->units);
printf("<td>Unrecognized! <code>%02hhX</code></td>",
(uint8_t)f.hdr->units);
};
std::cout << R"A(
</tr>
Expand Down
88 changes: 44 additions & 44 deletions src/brd_gui/brdview.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,61 +12,61 @@
#include "mainwindow.h"

class BrdView : public QGraphicsView {
Q_OBJECT
Q_OBJECT

public:
explicit BrdView(MainWindow *parent = nullptr);
public:
explicit BrdView(MainWindow *parent = nullptr);

void loadFile(File<kAMax> *fs);
void loadFile(File<kAMax> *fs);

void zoomIn();
void zoomOut();
void zoomFit();
void zoomIn();
void zoomOut();
void zoomFit();

void drawX01(const x01<kAMax> *inst, QPainterPath *path);
void drawX05(const x05<kAMax> *inst, QPen *pen);
void drawX14(const x14<kAMax> *inst, QPen *pen);
void drawX15(const x15<kAMax> *inst, QPainterPath *path);
void drawX16(const x16<kAMax> *inst, QPainterPath *path);
void drawX17(const x17<kAMax> *inst, QPainterPath *path);
void drawX23(const x23<kAMax> *inst, QPen *pen);
void drawX28(const x28<kAMax> *inst, QPen *pen);
void drawX2B(const x2B<kAMax> *inst, QPen *pen);
void drawX2D(const x2D<kAMax> *inst, QPen *pen);
void drawX30(const x30<kAMax> *inst, QPen *pen);
void drawX32(const x32<kAMax> *inst, QPen *pen, uint32_t sym_rotation);
void drawX33(const x33<kAMax> *inst, QPen *pen);
void drawX34(const x34<kAMax> *inst, QPen *pen);
void drawShape(const uint32_t ptr, QPen *pen);
void drawFile();
void drawX01(const x01<kAMax> *inst, QPainterPath *path);
void drawX05(const x05<kAMax> *inst, QPen *pen);
void drawX14(const x14<kAMax> *inst, QPen *pen);
void drawX15(const x15<kAMax> *inst, QPainterPath *path);
void drawX16(const x16<kAMax> *inst, QPainterPath *path);
void drawX17(const x17<kAMax> *inst, QPainterPath *path);
void drawX23(const x23<kAMax> *inst, QPen *pen);
void drawX28(const x28<kAMax> *inst, QPen *pen);
void drawX2B(const x2B<kAMax> *inst, QPen *pen);
void drawX2D(const x2D<kAMax> *inst, QPen *pen);
void drawX30(const x30<kAMax> *inst, QPen *pen);
void drawX32(const x32<kAMax> *inst, QPen *pen, uint32_t sym_rotation);
void drawX33(const x33<kAMax> *inst, QPen *pen);
void drawX34(const x34<kAMax> *inst, QPen *pen);
void drawShape(const uint32_t ptr, QPen *pen);
void drawFile();

void selectLayer(std::vector<std::pair<uint16_t, uint16_t>> layers);
void selectLayer(std::vector<std::pair<uint16_t, uint16_t>> layers);

enum layer_choice { ALL = -1, FAB = -2 };
enum layer_choice { ALL = -1, FAB = -2 };

protected:
void keyPressEvent(QKeyEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
protected:
void keyPressEvent(QKeyEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;

private:
QColor customPenColor(uint32_t x05_k, QColor default_);
bool isLineSegment(uint32_t k);
std::optional<QPointF> startingPoint(uint32_t k);
std::optional<QPointF> endingPoint(uint32_t k);
bool onSelectedLayer(uint8_t subtype, uint16_t layer);
char *netName(uint32_t k);
private:
QColor customPenColor(uint32_t x05_k, QColor default_);
bool isLineSegment(uint32_t k);
std::optional<QPointF> startingPoint(uint32_t k);
std::optional<QPointF> endingPoint(uint32_t k);
bool onSelectedLayer(uint8_t subtype, uint16_t layer);
char *netName(uint32_t k);

void updatePathWidth(QPainterPath *path, QPen **pen, QPen *base_pen,
uint32_t *prev_width, uint32_t new_width);
void updatePathWidth(QPainterPath *path, QPen **pen, QPen *base_pen,
uint32_t *prev_width, uint32_t new_width);

QGraphicsScene *scene;
qreal centerX, centerY;
std::unordered_set<uint32_t> already_drawn;
QGraphicsScene *scene;
qreal centerX, centerY;
std::unordered_set<uint32_t> already_drawn;

File<kAMax> *fs;
const double factor;
std::vector<std::pair<uint16_t, uint16_t>> selectedLayers;
File<kAMax> *fs;
const double factor;
std::vector<std::pair<uint16_t, uint16_t>> selectedLayers;
};

#endif
40 changes: 20 additions & 20 deletions src/brd_gui/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,30 @@
#include "mainwindow.h"

int main(int argc, char *argv[]) {
QApplication app(argc, argv);
app.setApplicationName("brd_parser");
app.setApplicationVersion("0.0.0");
QApplication app(argc, argv);
app.setApplicationName("brd_parser");
app.setApplicationVersion("0.0.0");

QCommandLineParser parser;
parser.addPositionalArgument("input", ".brd file to open");
parser.addHelpOption();
parser.addVersionOption();
QCommandLineParser parser;
parser.addPositionalArgument("input", ".brd file to open");
parser.addHelpOption();
parser.addVersionOption();

parser.process(app);
const QStringList args = parser.positionalArguments();
parser.process(app);
const QStringList args = parser.positionalArguments();

if (args.length() > 1) {
parser.showHelp();
}
if (args.length() > 1) {
parser.showHelp();
}

MainWindow window;
window.resize(1000, 700);
window.setWindowTitle(QApplication::translate("toplevel", "PCB viewer"));
MainWindow window;
window.resize(1000, 700);
window.setWindowTitle(QApplication::translate("toplevel", "PCB viewer"));

if (args.length() == 1) {
window.loadFile(args.at(0).toStdString());
}
if (args.length() == 1) {
window.loadFile(args.at(0).toStdString());
}

window.show();
return app.exec();
window.show();
return app.exec();
}
Loading

0 comments on commit 08823bc

Please sign in to comment.