From de5c4b440a941e20420262a0b152f435e4cc5bb8 Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Mon, 24 Mar 2014 21:11:25 -0400 Subject: [PATCH 1/5] Add mac/win suffixes to zip files --- app/package.sh | 2 +- exe/package.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.sh b/app/package.sh index da97313..d51c470 100755 --- a/app/package.sh +++ b/app/package.sh @@ -10,5 +10,5 @@ rm empty.lproj cd ../../.. cp -r fstl.app .. cd .. -zip -r fstl.zip fstl.app README.md +zip -r fstl_mac.zip fstl.app README.md diff --git a/exe/package.sh b/exe/package.sh index 5faecf1..ef81b62 100644 --- a/exe/package.sh +++ b/exe/package.sh @@ -1,3 +1,3 @@ cd .. cp build/release/fstl.exe . -/c/Program\ Files/7-Zip/7z.exe a fstl.zip fstl.exe README.md +/c/Program\ Files/7-Zip/7z.exe a fstl_win.zip fstl.exe README.md From 9cc3bd82e832f5d49911048d6dc053e177922abf Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Tue, 25 Mar 2014 18:53:07 -0400 Subject: [PATCH 2/5] Added check for stl corruption --- src/loader.cpp | 14 ++++++++++++++ src/loader.h | 1 + src/window.cpp | 10 ++++++++++ src/window.h | 1 + 4 files changed, 26 insertions(+) diff --git a/src/loader.cpp b/src/loader.cpp index d7ce46a..355f40c 100644 --- a/src/loader.cpp +++ b/src/loader.cpp @@ -4,6 +4,7 @@ Loader::Loader(QObject* parent, const QString& filename) : QThread(parent), filename(filename) { + // Nothing to do here } void Loader::run() @@ -16,6 +17,19 @@ void Loader::run() emit error_ascii_stl(); return; } + + // Skip the rest of the buffer + file.read(75); + + // Assume we're on a little-endian system for simplicity + uint32_t tri_count; + file.read(reinterpret_cast(&tri_count), sizeof(tri_count)); + + if (file.size() != 84 + tri_count*50) + { + emit error_bad_stl(); + return; + } } emit got_mesh(Mesh::load_stl(filename)); diff --git a/src/loader.h b/src/loader.h index 85e0c53..1de1157 100644 --- a/src/loader.h +++ b/src/loader.h @@ -16,6 +16,7 @@ signals: void loaded_file(QString filename); void got_mesh(Mesh* m); void error_ascii_stl(); + void error_bad_stl(); private: const QString filename; diff --git a/src/window.cpp b/src/window.cpp index 5f8ac9e..2d809bf 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -77,6 +77,14 @@ void Window::on_ascii_stl() "Please convert to binary .stl and retry"); } +void Window::on_bad_stl() +{ + QMessageBox::critical(this, "Error", + "Error:
" + "This .stl file is invalid or corrupted.
" + "Please export it from the original source, verify, and retry."); +} + void Window::enable_open() { open_action->setEnabled(true); @@ -101,6 +109,8 @@ bool Window::load_stl(const QString& filename) canvas, &Canvas::load_mesh); connect(loader, &Loader::error_ascii_stl, this, &Window::on_ascii_stl); + connect(loader, &Loader::error_bad_stl, + this, &Window::on_bad_stl); connect(loader, &Loader::finished, loader, &Loader::deleteLater); diff --git a/src/window.h b/src/window.h index 8484822..3ac5e95 100644 --- a/src/window.h +++ b/src/window.h @@ -16,6 +16,7 @@ public slots: void on_open(); void on_about(); void on_ascii_stl(); + void on_bad_stl(); void enable_open(); void disable_open(); From 61c930444d093b2d1bb43b72a2f34b4a7d748eaf Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Tue, 25 Mar 2014 20:01:46 -0400 Subject: [PATCH 3/5] Move load_stl from Mesh to Loader --- src/loader.cpp | 134 +++++++++++++++++++++++++++++++++++++++++-------- src/loader.h | 4 ++ src/mesh.cpp | 99 ------------------------------------ src/mesh.h | 1 - 4 files changed, 117 insertions(+), 121 deletions(-) diff --git a/src/loader.cpp b/src/loader.cpp index 355f40c..0d6b165 100644 --- a/src/loader.cpp +++ b/src/loader.cpp @@ -1,5 +1,4 @@ #include "loader.h" -#include "mesh.h" Loader::Loader(QObject* parent, const QString& filename) : QThread(parent), filename(filename) @@ -9,29 +8,122 @@ Loader::Loader(QObject* parent, const QString& filename) void Loader::run() { - { // Verify that this isn't an ascii stl file - QFile file(filename); - file.open(QIODevice::ReadOnly); - if (file.read(5) == "solid") - { - emit error_ascii_stl(); - return; - } + Mesh* mesh = load_stl(); + if (mesh) + { + emit got_mesh(mesh); + emit loaded_file(filename); + } +} - // Skip the rest of the buffer - file.read(75); - // Assume we're on a little-endian system for simplicity - uint32_t tri_count; - file.read(reinterpret_cast(&tri_count), sizeof(tri_count)); +//////////////////////////////////////////////////////////////////////////////// - if (file.size() != 84 + tri_count*50) - { - emit error_bad_stl(); - return; - } +struct Vec3 +{ + GLfloat x, y, z; + bool operator!=(const Vec3& rhs) const + { + return x != rhs.x || y != rhs.y || z != rhs.z; + } + bool operator<(const Vec3& rhs) const + { + if (x != rhs.x) return x < rhs.x; + else if (y != rhs.y) return y < rhs.y; + else if (z != rhs.z) return z < rhs.z; + else return false; + } +}; + +typedef std::pair Vec3i; + +//////////////////////////////////////////////////////////////////////////////// + +Mesh* Loader::load_stl() +{ + QFile file(filename); + file.open(QIODevice::ReadOnly); + if (file.read(5) == "solid") + { + emit error_ascii_stl(); + return NULL; + } + // Skip the rest of the header material + file.read(75); + + QDataStream data(&file); + data.setByteOrder(QDataStream::LittleEndian); + data.setFloatingPointPrecision(QDataStream::SinglePrecision); + + // Load the triangle count from the .stl file + uint32_t tri_count; + data >> tri_count; + + // Verify that the file is the right size + if (file.size() != 84 + tri_count*50) + { + emit error_bad_stl(); + return NULL; } - emit got_mesh(Mesh::load_stl(filename)); - emit loaded_file(filename); + // Extract vertices into an array of xyz, unsigned pairs + QVector verts(tri_count*3); + + // Dummy array, because readRawData is faster than skipRawData + char buffer[sizeof(float)*3]; + + // Store vertices in the array, processing one triangle at a time. + for (auto v=verts.begin(); v != verts.end(); v += 3) + { + // Skip face's normal vector + data.readRawData(buffer, 3*sizeof(float)); + + // Load vertex data from .stl file into vertices + data >> v[0].first.x >> v[0].first.y >> v[0].first.z; + data >> v[1].first.x >> v[1].first.y >> v[1].first.z; + data >> v[2].first.x >> v[2].first.y >> v[2].first.z; + + // Skip face attribute + data.readRawData(buffer, sizeof(uint16_t)); + } + + // Save indicies as the second element in the array + // (so that we can reconstruct triangle order after sorting) + for (size_t i=0; i < tri_count*3; ++i) + { + verts[i].second = i; + } + + // Sort the set of vertices (to deduplicate) + std::sort(verts.begin(), verts.end()); + + // This vector will store triangles as sets of 3 indices + std::vector indices(tri_count*3); + + // Go through the sorted vertex list, deduplicating and creating + // an indexed geometry representation for the triangles. + // Unique vertices are moved so that they occupy the first vertex_count + // positions in the verts array. + size_t vertex_count = 0; + for (auto v : verts) + { + if (!vertex_count || v.first != verts[vertex_count-1].first) + { + verts[vertex_count++] = v; + } + indices[v.second] = vertex_count - 1; + } + verts.resize(vertex_count); + + std::vector flat_verts; + flat_verts.reserve(vertex_count*3); + for (auto v : verts) + { + flat_verts.push_back(v.first.x); + flat_verts.push_back(v.first.y); + flat_verts.push_back(v.first.z); + } + + return new Mesh(flat_verts, indices); } + diff --git a/src/loader.h b/src/loader.h index 1de1157..fb0c8d8 100644 --- a/src/loader.h +++ b/src/loader.h @@ -12,9 +12,13 @@ public: explicit Loader(QObject* parent, const QString& filename); void run(); +protected: + Mesh* load_stl(); + signals: void loaded_file(QString filename); void got_mesh(Mesh* m); + void error_ascii_stl(); void error_bad_stl(); diff --git a/src/mesh.cpp b/src/mesh.cpp index 3e092d6..cfb4ca4 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include "mesh.h" @@ -34,101 +33,3 @@ float Mesh::max(size_t start) const } return v; } -//////////////////////////////////////////////////////////////////////////////// - -struct Vec3 -{ - GLfloat x, y, z; - bool operator!=(const Vec3& rhs) const - { - return x != rhs.x || y != rhs.y || z != rhs.z; - } - bool operator<(const Vec3& rhs) const - { - if (x != rhs.x) return x < rhs.x; - else if (y != rhs.y) return y < rhs.y; - else if (z != rhs.z) return z < rhs.z; - else return false; - } -}; - -typedef std::pair Vec3i; - -//////////////////////////////////////////////////////////////////////////////// - -Mesh* Mesh::load_stl(const QString& filename) -{ - QFile file(filename); - file.open(QIODevice::ReadOnly); - - QDataStream data(&file); - data.setByteOrder(QDataStream::LittleEndian); - data.setFloatingPointPrecision(QDataStream::SinglePrecision); - - // Skip .stl file header - data.skipRawData(80); - - // Load the triangle count from the .stl file - uint32_t tri_count; - data >> tri_count; - - // Extract vertices into an array of xyz, unsigned pairs - QVector verts(tri_count*3); - - // Dummy array, because readRawData is faster than skipRawData - char buffer[sizeof(float)*3]; - - // Store vertices in the array, processing one triangle at a time. - for (auto v=verts.begin(); v != verts.end(); v += 3) - { - // Skip face's normal vector - data.readRawData(buffer, 3*sizeof(float)); - - // Load vertex data from .stl file into vertices - data >> v[0].first.x >> v[0].first.y >> v[0].first.z; - data >> v[1].first.x >> v[1].first.y >> v[1].first.z; - data >> v[2].first.x >> v[2].first.y >> v[2].first.z; - - // Skip face attribute - data.readRawData(buffer, sizeof(uint16_t)); - } - - // Save indicies as the second element in the array - // (so that we can reconstruct triangle order after sorting) - for (size_t i=0; i < tri_count*3; ++i) - { - verts[i].second = i; - } - - // Sort the set of vertices (to deduplicate) - std::sort(verts.begin(), verts.end()); - - // This vector will store triangles as sets of 3 indices - std::vector indices(tri_count*3); - - // Go through the sorted vertex list, deduplicating and creating - // an indexed geometry representation for the triangles. - // Unique vertices are moved so that they occupy the first vertex_count - // positions in the verts array. - size_t vertex_count = 0; - for (auto v : verts) - { - if (!vertex_count || v.first != verts[vertex_count-1].first) - { - verts[vertex_count++] = v; - } - indices[v.second] = vertex_count - 1; - } - verts.resize(vertex_count); - - std::vector flat_verts; - flat_verts.reserve(vertex_count*3); - for (auto v : verts) - { - flat_verts.push_back(v.first.x); - flat_verts.push_back(v.first.y); - flat_verts.push_back(v.first.z); - } - - return new Mesh(flat_verts, indices); -} diff --git a/src/mesh.h b/src/mesh.h index f83a477..e8a02f0 100644 --- a/src/mesh.h +++ b/src/mesh.h @@ -10,7 +10,6 @@ class Mesh { public: Mesh(std::vector vertices, std::vector indices); - static Mesh* load_stl(const QString& filename); float min(size_t start) const; float max(size_t start) const; From d9301bbba097438546344405bd8899b0311cdc85 Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Wed, 26 Mar 2014 21:40:59 -0400 Subject: [PATCH 4/5] Fix double-click to open .stl on windows --- src/app.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app.cpp b/src/app.cpp index afa4ea7..b6eb3af 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -8,7 +8,10 @@ App::App(int argc, char *argv[]) : QApplication(argc, argv), window(new Window()) { window->show(); - window->load_stl(":gl/sphere.stl"); + if (argc > 1) + window->load_stl(argv[1]); + else + window->load_stl(":gl/sphere.stl"); } bool App::event(QEvent* e) From 5a38a2db976cf17640808317694c2aaa7091fe35 Mon Sep 17 00:00:00 2001 From: Matt Keeter Date: Wed, 26 Mar 2014 21:51:58 -0400 Subject: [PATCH 5/5] Allow dropping of files onto window --- src/window.cpp | 16 ++++++++++++++++ src/window.h | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/src/window.cpp b/src/window.cpp index 2d809bf..3002ecc 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -14,6 +14,7 @@ Window::Window(QWidget *parent) : { setWindowTitle("fstl"); + setAcceptDrops(true); QFile styleFile(":/qt/style.qss"); styleFile.open( QFile::ReadOnly ); @@ -128,3 +129,18 @@ bool Window::load_stl(const QString& filename) loader->start(); return true; } + +void Window::dragEnterEvent(QDragEnterEvent *event) +{ + if (event->mimeData()->hasUrls()) + { + auto urls = event->mimeData()->urls(); + if (urls.size() == 1 && urls.front().path().endsWith(".stl")) + event->acceptProposedAction(); + } +} + +void Window::dropEvent(QDropEvent *event) +{ + load_stl(event->mimeData()->urls().front().toLocalFile()); +} diff --git a/src/window.h b/src/window.h index 3ac5e95..cb92ebb 100644 --- a/src/window.h +++ b/src/window.h @@ -12,6 +12,10 @@ public: explicit Window(QWidget* parent=0); bool load_stl(const QString& filename); +protected: + void dragEnterEvent(QDragEnterEvent* event); + void dropEvent(QDropEvent* event); + public slots: void on_open(); void on_about();