diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6ab745e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/50_reprap_python_beanshell.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..89ab43d --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Dead upstream and Python 2 only, use slic3r, cura, cura-lulzbot or prusa-slicer instead diff --git a/skeinforge b/skeinforge deleted file mode 100755 index 651b566..0000000 --- a/skeinforge +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exec INTERPRETER SITELIB/skeinforge/skeinforge_application/skeinforge.py "$@" diff --git a/skeinforge-comb.patch b/skeinforge-comb.patch deleted file mode 100644 index 53b653f..0000000 --- a/skeinforge-comb.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py b/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py -index fd0277a..72603e9 100644 ---- a/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py -+++ b/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py -@@ -146,7 +146,7 @@ class BoundarySegment: - nextBegin = nextBoundarySegment.segment[0] - end = getJumpPointIfInside(self.boundary, nextBegin, edgeWidth, runningJumpSpace) - if end == None: -- end = self.boundary.segment[1] -+ end = self.segment[1] - nextBegin = getJumpPointIfInside(nextBoundarySegment.boundary, end, edgeWidth, runningJumpSpace) - if nextBegin != None: - nextBoundarySegment.segment[0] = nextBegin diff --git a/skeinforge-cool.patch b/skeinforge-cool.patch deleted file mode 100644 index c333f58..0000000 --- a/skeinforge-cool.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py b/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py -index da871f2..9337550 100644 ---- a/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py -+++ b/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py -@@ -144,21 +144,27 @@ class CoolRepository: - self.openWikiManualHelpPage = settings.HelpPage().getOpenFromAbsolute( - 'http://fabmetheus.crsndoo.com/wiki/index.php/Skeinforge_Cool') - self.activateCool = settings.BooleanSetting().getFromValue('Activate Cool', self, True) -- self.bridgeCool = settings.FloatSpin().getFromValue(0.0, 'Bridge Cool (Celcius):', self, 10.0, 1.0) -+ settings.LabelDisplay().getFromName('- Fan settings (priority: top-down) -', self ) -+ self.fanmaxPWM = settings.IntSpin().getFromValue(0, 'Full Fan Speed (0 - 255):', self, 255, 200) -+ self.turnFanOnAtBeginning = settings.BooleanSetting().getFromValue('Turn Fan On at Beginning', self, True) -+ self.fanFirstLayer = settings.IntSpin().getFromValue(0, 'Do Not Use Fan Before Layer (integer):', self, 100, 5) -+ self.bridgeFan = settings.BooleanSetting().getFromValue('Force Fan on Bridge Layers', self, False) -+ self.maximumFanLayerTime = settings.FloatSpin().getFromValue(0.0, 'Maximum Layer Time for Fan use (seconds):', self, 240.0, 40.0) -+ self.fullFanLayerTime = settings.FloatSpin().getFromValue(0.0, 'Full Fan Speed Below Layer Time (seconds):', self, 240.0, 20.0) -+ settings.LabelSeparator().getFromRepository(self) - self.coolType = settings.MenuButtonDisplay().getFromName('Cool Type:', self) - self.orbit = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Orbit', self, False) - self.slowDown = settings.MenuRadio().getFromMenuButtonDisplay(self.coolType, 'Slow Down', self, True) - self.maximumCool = settings.FloatSpin().getFromValue(0.0, 'Maximum Cool (Celcius):', self, 10.0, 2.0) - self.minimumLayerTime = settings.FloatSpin().getFromValue(0.0, 'Minimum Layer Time (seconds):', self, 120.0, 60.0) -- self.minimumOrbitalRadius = settings.FloatSpin().getFromValue( -- 0.0, 'Minimum Orbital Radius (millimeters):', self, 20.0, 10.0) -+ self.minimumOrbitalRadius = settings.FloatSpin().getFromValue(0.0, 'Minimum Orbital Radius (millimeters):', self, 20.0, 10.0) - settings.LabelSeparator().getFromRepository(self) - settings.LabelDisplay().getFromName('- Name of Alteration Files -', self ) - self.nameOfCoolEndFile = settings.StringSetting().getFromValue('Name of Cool End File:', self, 'cool_end.gcode') - self.nameOfCoolStartFile = settings.StringSetting().getFromValue('Name of Cool Start File:', self, 'cool_start.gcode') - settings.LabelSeparator().getFromRepository(self) -+ self.bridgeCool = settings.FloatSpin().getFromValue(0.0, 'Bridge Cool (Celcius):', self, 10.0, 1.0) - self.orbitalOutset = settings.FloatSpin().getFromValue(1.0, 'Orbital Outset (millimeters):', self, 5.0, 2.0) -- self.turnFanOnAtBeginning = settings.BooleanSetting().getFromValue('Turn Fan On at Beginning', self, True) - self.turnFanOffAtEnding = settings.BooleanSetting().getFromValue('Turn Fan Off at Ending', self, True) - self.executeTitle = 'Cool' - -@@ -330,7 +336,7 @@ class CoolSkein: - elif firstWord == '(': - self.edgeWidth = float(splitLine[1]) - if self.repository.turnFanOnAtBeginning.value: -- self.distanceFeedRate.addLine('M106') -+ self.distanceFeedRate.addLine('M106 S%d' % (self.repository.fanmaxPWM.value) ) - elif firstWord == '()': - self.distanceFeedRate.addTagBracketedProcedure('cool') - return -@@ -366,9 +372,23 @@ class CoolSkein: - self.boundaryLoop.append(gcodec.getLocationFromSplitLine(None, splitLine).dropAxis()) - elif firstWord == '(': - self.layerCount.printProgressIncrement('cool') -+ "print 'Layer %d' % (self.layerCount.layerIndex)" - self.distanceFeedRate.addLine(line) - self.distanceFeedRate.addLinesSetAbsoluteDistanceMode(self.coolStartLines) - layerTime = self.getLayerTime() -+ "print 'Layer time : %5.3f' % (layerTime)" -+ if not self.repository.turnFanOnAtBeginning.value and self.layerCount.layerIndex >= self.repository.fanFirstLayer.value: -+ if (self.repository.bridgeFan.value and self.isBridgeLayer) or layerTime <= self.repository.fullFanLayerTime.value: -+ self.distanceFeedRate.addLine( 'M106 S%d' % (self.repository.fanmaxPWM.value) ) -+ "print 'Full Fan Speed ! (Layer time is under %5.3f' % (self.repository.fullFanLayerTime.value)" -+ elif layerTime <= self.repository.maximumFanLayerTime.value: -+ fanPWMArea = ( self.repository.maximumFanLayerTime.value - self.repository.fullFanLayerTime.value ) -+ fanPWM = round( ( ( self.repository.maximumFanLayerTime.value - layerTime ) / fanPWMArea ) * self.repository.fanmaxPWM.value ) -+ self.distanceFeedRate.addLine( 'M106 S%d' % (fanPWM) ) -+ "print 'PWM Fan Speed (fanPWMArea : %5.3f / fanPWM : %d)' % (fanPWMArea, fanPWM)" -+ else: -+ self.distanceFeedRate.addLine( 'M107' ) -+ "print 'Fan Off (Layer time is above %5.3f)' % (self.repository.maximumFanLayerTime.value)" - remainingOrbitTime = max(self.repository.minimumLayerTime.value - layerTime, 0.0) - self.addCoolTemperature(remainingOrbitTime) - if self.repository.orbit.value: diff --git a/skeinforge-craft b/skeinforge-craft deleted file mode 100755 index eff802d..0000000 --- a/skeinforge-craft +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -if [ -z "$1" ]; then - echo "You have to specify one argument with STL file" - echo "To see Skeinforge settings, run skeinforge instead" - exit 1 -fi -exec INTERPRETER SITELIB/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py "$@" diff --git a/skeinforge-remove-tkinter-warning.patch b/skeinforge-remove-tkinter-warning.patch deleted file mode 100644 index 47bbffc..0000000 --- a/skeinforge-remove-tkinter-warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/fabmetheus_utilities/miscellaneous/nophead/preview.py b/fabmetheus_utilities/miscellaneous/nophead/preview.py -index e48a6d4..8f53f51 100644 ---- a/fabmetheus_utilities/miscellaneous/nophead/preview.py -+++ b/fabmetheus_utilities/miscellaneous/nophead/preview.py -@@ -2,8 +2,7 @@ import sys - try: - import Tkinter - except: -- print('You do not have Tkinter, which is needed for the graphical interface.') -- print('Information on how to download Tkinter is at:\nwww.tcl.tk/software/tcltk/') -+ pass - try: - from layers import * - from gRead import * -diff --git a/fabmetheus_utilities/settings.py b/fabmetheus_utilities/settings.py -index d000774..1ca3c07 100644 ---- a/fabmetheus_utilities/settings.py -+++ b/fabmetheus_utilities/settings.py -@@ -20,8 +20,7 @@ import webbrowser - try: - import Tkinter - except: -- print('You do not have Tkinter, which is needed for the graphical interface, you will only be able to use the command line.') -- print('Information on how to download Tkinter is at:\nwww.tcl.tk/software/tcltk/') -+ pass - - - __author__ = 'Enrique Perez (perez_enrique@yahoo.com)' diff --git a/skeinforge.desktop b/skeinforge.desktop deleted file mode 100644 index 00914fd..0000000 --- a/skeinforge.desktop +++ /dev/null @@ -1,9 +0,0 @@ - -[Desktop Entry] -Name=Skeinforge -GenericName=Slicing tool -Exec=skeinforge %f -Icon=development_section -Terminal=false -Type=Application -Categories=Graphics; diff --git a/skeinforge.spec b/skeinforge.spec deleted file mode 100644 index 3017e4a..0000000 --- a/skeinforge.spec +++ /dev/null @@ -1,254 +0,0 @@ -Name: skeinforge -Version: 12.03.14 -Release: 38%{?dist} -Summary: Converts 3D model into G-Code for RepRap -# Asked author for LICENSE file - will be in next release -# Dev version for check: http://members.axion.net/~enrique/reprap_python_beanshell.zip -# Don't ask me, why the dev version isn't on the same website :( -License: AGPLv3 -URL: http://fabmetheus.crsndoo.com/wiki/index.php/Skeinforge -Source0: http://fabmetheus.crsndoo.com/files/50_reprap_python_beanshell.zip -Source1: %{name}.desktop -Source2: %{name} -Source3: %{name}-craft -Patch0: %{name}-remove-tkinter-warning.patch -Patch1: %{name}-comb.patch -Patch2: %{name}-cool.patch - -# Cannot be noarch, as pypy_sitelib differs on arches -# Aslo, on aarch64, no pypy, so this will get nasty -# BuildArch: noarch -%global debug_package %{nil} - -%ifarch aarch64 %{power64} -# does not support pypy - -BuildRequires: python2-devel -Requires: python2 -Requires: tkinter - -%global pypy 0 -%global interpreter %{__python2} -%global sitelib %{python2_sitelib} - -%else # arch - -BuildRequires: pypy2-devel -Requires: pypy2(abi) == %{pypy2_pypy_version} - -# Turn off the brp-python-bytecompile postprocessing script -# We manually invoke it later on, using pypy -%global __os_install_post \ - %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') - - -%global pypy 1 -%global interpreter %{__pypy2} -%global sitelib %{pypy_sitelib} - -%endif # arch - -BuildRequires: desktop-file-utils - - -%description -Skeinforge is a tool chain composed of Python scripts that converts your -3D model into G-Code instructions for RepRap. - -%package doc -Requires: %{name} = %{version}-%{release} -Summary: Documentation for %{name} -BuildArch: noarch - -%description doc -Skeinforge is a tool chain composed of Python scripts that converts your -3D model into G-Code instructions for RepRap. -This is the documentation. - -%prep -%setup -cq -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -# Removing stupid useless files -rm -rf %{name}_application/*.sh %{name}_application/*.stl - -# Removing shebangs -cd %{name}_application/%{name}_plugins/craft_plugins/ -for FILE in preface.py alteration.py bottom.py dimension.py fill.py inset.py limit.py scale.py widen.py; do - awk 'FNR>1' $FILE > $FILE.nobang && mv -f $FILE.nobang $FILE -done -cd - - -cd fabmetheus_utilities/miscellaneous/fabricate/ -for FILE in example.py send.py RepRapArduinoSerialSender.py; do - awk 'FNR>1' $FILE > $FILE.nobang && mv -f $FILE.nobang $FILE -done -chmod +x frank_davies/t.sh -cd - - -cd %{name}_application/ -for FILE in %{name}.py; do - awk 'FNR>1' $FILE > $FILE.nobang && mv -f $FILE.nobang $FILE - chmod -x $FILE -done -cd - -cp -a %{SOURCE2} %{SOURCE3} . -sed -i -e 's@INTERPRETER@%{interpreter}@' -e 's@SITELIB@%{sitelib}@' skeinforge{,-craft} - -%build - -%install -mkdir -p %{buildroot}%{sitelib}/%{name} -mkdir -p %{buildroot}%{_bindir} -cp -ar [fs_]* %{buildroot}%{sitelib}/%{name} -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} # desktop file -cp -a skeinforge{,-craft} %{buildroot}%{_bindir} # launchers -rm %{buildroot}%{sitelib}/%{name}/skeinforge{,-craft} - -%if 0%{?pypy} -# Bytecompile it by running it -echo "Ignore the TclError and warning" -pypy %{buildroot}%{pypy_sitelib}/%{name}/%{name}_application/%{name}.py || : -echo "Ignore the TclError and warning" -%endif # pypy - -%files -%doc -%{sitelib}/%{name}/ -%{_datadir}/applications/%{name}.desktop -%{_bindir}/%{name}* - -%files doc -%doc documentation - -%changelog -* Fri Jul 26 2019 Fedora Release Engineering - 12.03.14-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jun 19 2019 Miro Hrončok - 12.03.14-37 -- Rebuilt for pypy 7.1.1 - -* Mon Mar 04 2019 Miro Hrončok - 12.03.14-36 -- Rebuilt for new PyPy - -* Sat Feb 02 2019 Fedora Release Engineering - 12.03.14-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Aug 27 2018 Miro Hrončok - 12.03.14-34 -- Stop uisng pypy on power (#1619690) - -* Sat Jul 14 2018 Fedora Release Engineering - 12.03.14-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Apr 30 2018 Miro Hrončok - 12.03.14-32 -- Rebuilt for new pypy 6.0 -- Use the new pypy2(abi) provide and %%pypy2_pypy_version macro - -* Wed Apr 11 2018 Miro Hrončok - 12.03.14-31 -- Rebuilt for new pypy 5.10 (again) - -* Tue Apr 10 2018 Miro Hrončok - 12.03.14-30 -- Rebuilt for new pypy 5.10 -- Use pypy2 where possible - -* Fri Feb 09 2018 Fedora Release Engineering - 12.03.14-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 21 2017 Miro Hrončok - 12.03.14-28 -- Rebuilt for new pypy 5.9.0 - -* Thu Aug 03 2017 Fedora Release Engineering - 12.03.14-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 12.03.14-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jul 04 2017 Miro Hrončok - 12.03.14-25 -- Rebuilt for new pypy 5.8.0 - -* Fri Mar 24 2017 Miro Hrončok - 12.03.14-24 -- Rebuilt for new pypy 5.7.0 - -* Sat Feb 11 2017 Fedora Release Engineering - 12.03.14-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Nov 15 2016 Miro Hrončok - 12.03.14-22 -- Rebuilt for new pypy, arch condition updated according to pypy - -* Tue Sep 20 2016 Miro Hrončok - 12.03.14-21 -- Make it pure pypy or pure python2 depending on the arch - -* Tue Jul 19 2016 Fedora Release Engineering - 12.03.14-20 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Feb 05 2016 Fedora Release Engineering - 12.03.14-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 12.03.14-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 12.03.14-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Oct 23 2013 Miro Hrončok - 12.03.14-16 -- Add patches by Neil Darlow -- Modify launchers a bit - -* Sun Aug 25 2013 Miro Hrončok - 12.03.14-15 -- Remove the patch to remove hep button -- Added patch to remove Tkinter warning -- Use %%{name} instead of the real name - -* Sun Aug 04 2013 Fedora Release Engineering - 12.03.14-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 12.03.14-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jan 13 2013 Miro Hrončok - 12.03.14-12 -- Comment macros in changelog -- Remove shebangs from nonexecutable files -- Move deleting files from %%install to %%prep -- Added bash launchers to /usr/bin -- Modified .desktop file to use that launcher -- Moved documentation to %%doc (help button in the app doesn't work anyway) -- Patch0: Remove non-working help button -- Require pypy (used in craft launcher) - -* Tue Jan 08 2013 Miro Hrončok - 12.03.14-11 -- Don't add license.txt as a separate source - -* Mon Dec 31 2012 Miro Hrončok - 12.03.14-10 -- Changed location of the app from %%{_datadir}/%%{name}/ - to %%{python_sitelib}/%%{name} - -* Sun Dec 30 2012 Miro Hrončok - 12.03.14-9 -- Do not download the desktop file from my GitHub. - -* Mon Oct 29 2012 Miro Hrončok - 12.03.14-8 -- Added desktop file -- Don't use macros for rm and cp -- Removed license file from doc package - -* Tue Oct 09 2012 Miro Hrončok - 12.03.14-7 -- Do not install directly to printrun dir - -* Sun Oct 07 2012 Miro Hrončok - 12.03.14-6 -- Include license file - -* Fri Sep 21 2012 Miro Hrončok - 12.03.14-5 -- Noarch - -* Fri Sep 21 2012 Miro Hrončok - 12.03.14-4 -- Owns %%{_datadir}/printrun/ - -* Fri Sep 21 2012 Miro Hrončok - 12.03.14-3 -- Splited documentation - -* Fri Sep 21 2012 Miro Hrončok - 12.03.14-2 -- Added tkinter and python2 to requires - -* Fri Sep 21 2012 Miro Hrončok - 12.03.14-1 -- New package diff --git a/sources b/sources deleted file mode 100644 index dd2242d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -95e2a34660106d727411fdfaba404513 50_reprap_python_beanshell.zip