diff options
| -rw-r--r-- | doc/visitor-changes.txt | 2 | ||||
| -rw-r--r-- | src/dxfdata.cc | 10 | ||||
| -rw-r--r-- | src/openscad.cc | 4 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/FindGLEW.cmake | 10 |
5 files changed, 13 insertions, 15 deletions
diff --git a/doc/visitor-changes.txt b/doc/visitor-changes.txt new file mode 100644 index 0000000..e39cd2e --- /dev/null +++ b/doc/visitor-changes.txt @@ -0,0 +1,2 @@ +Changes in visitor branch: +o import_dxf(): layername="" imports all layers. Importing a single layer with a zero-length name is no longer supported. diff --git a/src/dxfdata.cc b/src/dxfdata.cc index 78ab454..7bf4364 100644 --- a/src/dxfdata.cc +++ b/src/dxfdata.cc @@ -48,7 +48,7 @@ DxfData::DxfData() } /*! - Reads a layer from the given file, or all layers if layename.isNull() + Reads a layer from the given file, or all layers if layername.isEmpty() */ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString layername, double xorigin, double yorigin, double scale) { @@ -74,7 +74,7 @@ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString laye if (!in_entities_section && !in_blocks_section) \ break; \ if (in_entities_section && \ - !(layername.isNull() || layername == layer)) \ + !(layername.isEmpty() || layername == layer)) \ break; \ grid.align(_p1x, _p1y); \ grid.align(_p2x, _p2y); \ @@ -249,7 +249,7 @@ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString laye } } else if (mode == "DIMENSION" && - (layername.isNull() || layername == layer)) { + (layername.isEmpty() || layername == layer)) { this->dims.append(Dim()); this->dims.last().type = dimtype; for (int i = 0; i < 7; i++) @@ -268,7 +268,7 @@ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString laye else if (mode == "ENDSEC") { } else if (in_blocks_section || (in_entities_section && - (layername.isNull() || layername == layer))) { + (layername.isEmpty() || layername == layer))) { unsupported_entities_list[mode]++; } mode = data; @@ -357,7 +357,7 @@ DxfData::DxfData(double fn, double fs, double fa, QString filename, QString laye QHashIterator<QString, int> i(unsupported_entities_list); while (i.hasNext()) { i.next(); - if (layername.isNull()) { + if (layername.isEmpty()) { PRINTA("WARNING: Unsupported DXF Entity `%1' (%2x) in `%3'.", i.key(), QString::number(i.value()), filename); } else { diff --git a/src/openscad.cc b/src/openscad.cc index f3aee76..a948c5a 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -358,9 +358,9 @@ int main(int argc, char **argv) } if (dxf_output_file) { - QFile file(stl_output_file); + QFile file(dxf_output_file); if (!file.open(QIODevice::ReadWrite)) { - PRINTA("Can't open file \"%1\" for export", stl_output_file); + PRINTA("Can't open file \"%1\" for export", dxf_output_file); } else { QTextStream fstream(&file); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fb86448..ae5c496 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -149,7 +149,7 @@ target_link_libraries(cgaltest ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_ # opencsgtest # add_executable(opencsgtest opencsgtest.cc OffscreenView.cc OffscreenContext.mm - ../src/opencsgrenderer.cc ../src/throwntogetherrenderer.cc ../src/CSGTermEvaluator.cc ../src/cgal.cc ../src/CGALEvaluator.cc + ../src/OpenCSGRenderer.cc ../src/ThrownTogetherRenderer.cc ../src/CSGTermEvaluator.cc ../src/cgal.cc ../src/CGALEvaluator.cc ../src/PolySetCGALEvaluator.cc ../src/qhash.cc ../src/nef2dxf.cc ../src/cgaladv_minkowski2.cc ../src/cgaladv_minkowski3.cc ${COMMON_SOURCES}) diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake index bccb20a..e058e8c 100644 --- a/tests/FindGLEW.cmake +++ b/tests/FindGLEW.cmake @@ -20,16 +20,14 @@ IF (WIN32) ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib DOC "The GLEW library") ELSE (WIN32) - message(${GLEW_DIR}) + message("GLEW_DIR: " ${GLEW_DIR}) FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h - PATHS - ${GLEW_DIR}/include + PATHS ${GLEW_DIR}/include /usr/include /usr/local/include NO_DEFAULT_PATH DOC "The directory where GL/glew.h resides") FIND_LIBRARY( GLEW_LIBRARY NAMES GLEW glew - PATHS - ${GLEW_DIR}/lib + PATHS ${GLEW_DIR}/lib /usr/lib /usr/local/lib NO_DEFAULT_PATH DOC "The GLEW library") ENDIF (WIN32) @@ -40,5 +38,3 @@ IF (GLEW_INCLUDE_PATH) ELSE (GLEW_INCLUDE_PATH) SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") ENDIF (GLEW_INCLUDE_PATH) - -MARK_AS_ADVANCED( GLEW_FOUND ) |