Fix file version name issue (.rc1 instead of rc1), and compile issue …

…for python 2.7 on windows.
FormerLurker · Dec 28, 2020 · a559cbc · a559cbc
1 parent a0f41e1
commit a559cbc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
 include README.md
 recursive-include octoprint_arc_welder/templates *
 recursive-include octoprint_arc_welder/static *
-recursive-include octoprint_arc_welder/data/ *
+recursive-include octoprint_arc_welder/data *
 recursive-include octoprint_arc_welder/data/firmware *
diff --git a/octoprint_arc_welder/data/lib/c/arc_welder/segmented_shape.cpp b/octoprint_arc_welder/data/lib/c/arc_welder/segmented_shape.cpp
@@ -684,12 +684,12 @@ bool arc::ray_intersects_segment(const point rayOrigin, const point rayDirection
   vector v2 = point2 - point1;
   vector v3 = vector(-rayDirection.y, rayDirection.x, 0);
 
-  float dot = dot(v2, v3);
+  double dot = dot(v2, v3);
   if (std::fabs(dot) < 0.000001)
     return false;
 
-  float t1 = vector::cross_product_magnitude(v2, v1) / dot;
-  float t2 = dot(v1,v3) / dot;
+  double t1 = vector::cross_product_magnitude(v2, v1) / dot;
+  double t2 = dot(v1,v3) / dot;
 
   if (t1 >= 0.0 && (t2 >= 0.0 && t2 <= 1.0))
     return true;

diff --git a/octoprint_arc_welder/data/lib/c/gcode_processor_lib/fpconv.cpp b/octoprint_arc_welder/data/lib/c/gcode_processor_lib/fpconv.cpp
@@ -51,9 +51,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <stdbool.h>
 #include <string.h>
-
 #include "fpconv.h"
 
 #define fracmask  0x000FFFFFFFFFFFFFU

diff --git a/octoprint_arc_welder/data/lib/c/gcode_processor_lib/fpconv.h b/octoprint_arc_welder/data/lib/c/gcode_processor_lib/fpconv.h
@@ -52,8 +52,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef FPCONV_H
 #define FPCONV_H
-
-#include <stdint.h>
+typedef unsigned long long uint64_t;
 /* Fast and accurate double to string conversion based on Florian Loitsch's
  * Grisu-algorithm[1].
  *
@@ -171,4 +170,5 @@ static Fp find_cachedpow10(int exp, int* k)
 
     return powers_ten[idx];
   }
-}
+}
+
diff --git a/octoprint_arc_welder/templates/arc_welder_settings_about.jinja2 b/octoprint_arc_welder/templates/arc_welder_settings_about.jinja2
@@ -88,5 +88,14 @@
         </ul>
         I would also love to hear any feedback you have, since I'm always trying to improve my plugins.
     </p>
+    <h4>Included Libraries</h4>
+    <p>
+        A couple external libraries are included in ArcWelder:
+    </p>
+    <p>
+        Fpconv float to string conversion - <a href="https://github.com/miloyip/dtoa-benchmark/blob/master/license.txt" target="_blank">Copyright (C) 2014 Milo Yip</a><br/>
+        The original fpconv algorithm - <a href="https://github.com/miloyip/dtoa-benchmark/blob/master/src/fpconv/license" target="_blank">Copyright(c) 2013 Andreas Samoljuk</a><br/>
+    </p>
+    <p>In addition, the console version includes the powerful command line argument processing tool <a href="http://tclap.sourceforge.net/" target="_blank">TCLAP</a>.  Even though this is not used in the ArcWelder Plugin plugin, I want to give this library some much deserved love!</p>
 
 </script>
diff --git a/setup.py b/setup.py
@@ -49,7 +49,7 @@
 plugin_name = "Arc Welder"
 # The plugin's fallback version, in case versioneer can't extract the version from _version.py.
 # This can happen if the user installs from one of the .zip links in github, not generated with git archive
-fallback_version = "1.0.1.rc1.dev2"
+fallback_version = "1.0.1rc1.dev2"
 plugin_version = versioneer.get_version()
 if plugin_version == "0+unknown" or NumberedVersion(plugin_version) < NumberedVersion(
     fallback_version