Browse Source

Merge branch 'merill-merge'

remi durand 3 years ago
parent
commit
8025205190

+ 1 - 1
resources/calibration/cube/LICENCE.txt

@@ -1,2 +1,2 @@
-voron_design_cube_v6.amf is under GPL V3, made by vorondesign (https://github.com/VoronDesign/Voron-2)
+voron_design_cube_v7.amf is under GPL V3, made by vorondesign (https://github.com/VoronDesign/Voron-2)
 xyzCalibration_cube is under CC BY-SA 3.0, made by iDig3Dprinting (https://www.thingiverse.com/thing:1278865)

BIN
resources/calibration/cube/voron_design_cube_v6.amf


BIN
resources/calibration/cube/voron_design_cube_v7.amf


BIN
resources/icons/splashscreen.jpg → resources/splashscreen/benchy-splashscreen.jpg


BIN
resources/icons/splashscreen-gcodepreview.jpg → resources/splashscreen/prusa-gcodepreview.jpg


+ 9 - 4
src/CMakeLists.txt

@@ -25,6 +25,8 @@ if (SLIC3R_GUI)
     add_subdirectory(imgui)
     add_subdirectory(hidapi)
     include_directories(hidapi/include)
+    add_subdirectory(exif)
+    include_directories(exif/include)
 
     if(WIN32)
         message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
@@ -221,14 +223,17 @@ else ()
         add_custom_command(TARGET Slic3r POST_BUILD
             COMMAND ls
             # COMMAND ln -sf Slic3r slic3r
-            COMMAND ln -sf Slic3r prusa-gcodeviewer
-            COMMAND ln -sf Slic3r PrusaGCodeViewer
+            #was: COMMAND ln -sf Slic3r prusa-gcodeviewer
+            COMMAND ln -sf Slic3r ${GCODEVIEWER_APP_CMD}
+            #was: COMMAND ln -sf Slic3r PrusaGCodeViewer
+            COMMAND ln -sf Slic3r ${GCODEVIEWER_APP_KEY}
             WORKING_DIRECTORY "$<TARGET_FILE_DIR:Slic3r>"
             COMMENT "Symlinking the G-code viewer to Slic3r, symlinking to slic3r and gcodeviewer"
             VERBATIM)
     else ()
         add_custom_command(TARGET Slic3r POST_BUILD
-            COMMAND ln -sf slic3r prusa-gcodeviewer
+            #was: COMMAND ln -sf Slic3r prusa-gcodeviewer
+            COMMAND ln -sf slic3r ${GCODEVIEWER_APP_CMD}
             WORKING_DIRECTORY "$<TARGET_FILE_DIR:Slic3r>"
             COMMENT "Symlinking the G-code viewer to Slic3r"
             VERBATIM)
@@ -257,5 +262,5 @@ else ()
     install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
     # Install the symlink for gcodeviewer
-    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r slic3rgcodeviewer WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
+    install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
 endif ()

+ 1 - 1
src/PrusaSlicer.cpp

@@ -103,7 +103,7 @@ int CLI::run(int argc, char **argv)
             false;
 #else
             // On Unix systems, the superslicer binary may be symlinked to give the application a different meaning.
-            boost::algorithm::iends_with(boost::filesystem::path(argv[0]).filename().string(), "gcodeviewer");
+            boost::algorithm::iends_with(boost::filesystem::path(argv[0]).filename().string(), GCODEVIEWER_APP_CMD);
 #endif // _WIN32
 
     const std::vector<std::string> &load_configs		= m_config.option<ConfigOptionStrings>("load", true)->values;

+ 6 - 0
src/exif/CMakeLists.txt

@@ -0,0 +1,6 @@
+
+cmake_minimum_required(VERSION 2.5)
+
+include_directories(include)
+
+add_library(exif STATIC exif.c)

+ 201 - 0
src/exif/COPYING

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

+ 94 - 0
src/exif/README

@@ -0,0 +1,94 @@
+"exif.c" is a simple implementation to access the Exif segment in a JPEG file.
+It easily enables you to get the value of the IFD tag field with such code:
+
+  TagNodeInfo *tag = getTagInfo(ifdArray, IFD_EXIF, TAG_DateTimeOriginal);
+  printf("DateTimeOriginal = [%s]\n", tag->byteData);
+
+  -> DateTimeOriginal = [2013:09:01 09:49:00]
+
+See "sample_main.c" and "exif.h" for details.
+
+exif.c only uses standard C library functions. So, it will be usable in many environments. 
+It has been tested in the following environments.
+
+ - Windows XP 32bit + 32bit Visual C++
+ - Windows 7 64bit + 64bit Visual C++
+ - Redhat Linux 32bit + 32bit gcc
+ - Mac OS X 64bit + 64bit gcc
+
+building with gcc:
+gcc -o exif sample_main.c exif.c
+
+building with Microsoft Visual C++:
+cl.exe /o exif sample_main.c exif.c
+
+The following output is the result of the sample program.
+---------------------------------------------------------------------------
+$ exif test.jpg
+
+[test.jpg] createIfdTableArray: result=4
+
+{0TH IFD}
+ - Make: [Apple]
+ - Model: [iPod touch]
+ - Orientation: 1
+ - XResolution: 72/1
+ - YResolution: 72/1
+ - ResolutionUnit: 2
+ - Software: [6.1.4]
+ - DateTime: [2013:09:01 09:49:00]
+ - YCbCrPositioning: 1
+ - ExifIFDPointer: 206
+ - GPSInfoIFDPointer: 576
+
+{EXIF IFD}
+ - ExposureTime: 1/30
+ - FNumber: 12/5
+ - ExposureProgram: 2
+ - PhotographicSensitivity: 400
+ - ExifVersion: 0 2 2 1
+ - DateTimeOriginal: [2013:09:01 09:49:00]
+ - DateTimeDigitized: [2013:09:01 09:49:00]
+ - ComponentsConfiguration: 0x01 0x02 0x03 0x00
+ - ShutterSpeedValue: 4035/821
+ - ApertureValue: 4845/1918
+ - BrightnessValue: 2234/1113
+ - MeteringMode: 5
+ - Flash: 32
+ - FocalLength: 77/20
+ - FlashPixVersion: 0 1 0 0
+ - ColorSpace: 1
+ - PixelXDimension: 960
+ - PixelYDimension: 720
+ - SensingMethod: 2
+ - ExposureMode: 0
+ - WhiteBalance: 0
+ - FocalLengthIn35mmFormat: 32
+ - SceneCaptureType: 0
+
+{GPS IFD}
+ - GPSLatitudeRef: [S]
+ - GPSLatitude: 69/1 17/100 0/1
+ - GPSLongitudeRef: [E]
+ - GPSLongitude: 39/1 35/100 0/1
+ - GPSAltitudeRef: 0
+ - GPSAltitude: 6151/470
+ - GPSTimeStamp: 0/1 48/1 3921/100
+
+{1ST IFD}
+ - Compression: 6
+ - XResolution: 72/1
+ - YResolution: 72/1
+ - ResolutionUnit: 2
+ - JPEGInterchangeFormat: 840
+ - JPEGInterchangeFormatLength: 8648
+
+0th IFD : Model = [iPod touch]
+Exif IFD : DateTimeOriginal = [2013:09:01 09:49:00]
+GPS IFD : GPSLatitude = 69/1 17/100 0/1
+removeExifSegmentFromJPEGFile: result=1
+---------------------------------------------------------------------------
+http://dsas.blog.klab.org/archives/52123322.html (Japanese only)
+
+Copyright (C) 2013 KLab Inc.
+

Some files were not shown because too many files changed in this diff