Compare commits
29 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
18c831a1d2 | ||
|
|
08b017b868 | ||
|
|
22f27be926 | ||
|
|
c4e81c1a1a | ||
|
|
9747c0b8b0 | ||
| b0bc766449 | |||
|
|
d340581360 | ||
|
|
9723042f53 | ||
|
|
5454e0553b | ||
|
|
224d8243b7 | ||
|
|
e539441b0e | ||
|
|
64e35cb558 | ||
|
|
b4fcecf779 | ||
|
|
9903e73304 | ||
|
|
7a51169aa6 | ||
|
|
8cb96eaaa8 | ||
|
|
2192630b6f | ||
|
|
013c7f6227 | ||
|
|
194af68163 | ||
|
|
7d857d5b3f | ||
|
|
6d8b07b825 | ||
|
|
41f782d3c4 | ||
|
|
b61e752724 | ||
|
|
5911c12a14 | ||
|
|
e11bd56882 | ||
|
|
be82383c18 | ||
|
|
e618c43df4 | ||
|
|
5201a8a28e | ||
|
|
65ded09603 |
13 changed files with 1 additions and 193 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
/sfact-0.0-bc56c68.tar.gz
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Dead upstream and Python 2 only, use slic3r, cura, cura-lulzbot or prusa-slicer instead
|
||||
3
sfact
3
sfact
|
|
@ -1,3 +0,0 @@
|
|||
#!/bin/bash
|
||||
exec python /usr/lib/python2.7/site-packages/sfact/sfact.py "$@"
|
||||
exit $?
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
echo "Using pypy, you can ignore Tkinter warnings"
|
||||
exec pypy /usr/lib/python2.7/site-packages/sfact/skeinforge_application/skeinforge_utilities/skeinforge_craft.py "$@"
|
||||
exit $?
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
Add an empty CSV file to avoid a runtime error on referencing
|
||||
skeinforge/skeinforge_application/profiles/cutting/Default directory.
|
||||
|
||||
--- /dev/null
|
||||
+++ b/skeinforge_application/profiles/cutting/Default/skeinforge.csv
|
||||
@@ -0,0 +1,2 @@
|
||||
+Format is tab separated skeinforge settings.
|
||||
+_Name Value
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
Add an empty CSV file to avoid a runtime error on referencing
|
||||
skeinforge/skeinforge_application/profiles/extrusion/Default directory.
|
||||
|
||||
--- /dev/null
|
||||
+++ b/skeinforge_application/profiles/extrusion/Default/skeinforge.csv
|
||||
@@ -0,0 +1,2 @@
|
||||
+Format is tab separated skeinforge settings.
|
||||
+_Name Value
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
Add an empty CSV file to avoid a runtime error on referencing
|
||||
skeinforge/skeinforge_application/profiles/milling/Default directory.
|
||||
|
||||
--- /dev/null
|
||||
+++ b/skeinforge_application/profiles/milling/Default/skeinforge.csv
|
||||
@@ -0,0 +1,2 @@
|
||||
+Format is tab separated skeinforge settings.
|
||||
+_Name Value
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
Add an empty CSV file to avoid a runtime error on referencing
|
||||
skeinforge/skeinforge_application/profiles/winding/Free_Wire directory.
|
||||
|
||||
--- /dev/null
|
||||
+++ b/skeinforge_application/profiles/winding/Free_Wire/skeinforge.csv
|
||||
@@ -0,0 +1,2 @@
|
||||
+Format is tab separated skeinforge settings.
|
||||
+_Name Value
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff -ru a/fabmetheus_utilities/settings.py b/fabmetheus_utilities/settings.py
|
||||
--- a/fabmetheus_utilities/settings.py 2012-01-21 10:09:53.000000000 +0100
|
||||
+++ b/fabmetheus_utilities/settings.py 2013-01-13 18:22:30.931700616 +0100
|
||||
@@ -2013,9 +2013,6 @@
|
||||
executeButton = Tkinter.Button( root, activebackground = 'black', activeforeground = 'blue', text = repository.executeTitle, command = self.gridPosition.execute )
|
||||
executeButton.grid( row = self.gridPosition.row, column = columnIndex, columnspan = 2, sticky = Tkinter.W )
|
||||
columnIndex += 2
|
||||
- self.helpButton = Tkinter.Button( root, activebackground = 'black', activeforeground = 'white', text = "?", command = HelpPageRepository(self.repository).openPage )
|
||||
- self.helpButton.grid( row = self.gridPosition.row, column = columnIndex, sticky = Tkinter.W )
|
||||
- self.closeListener.listenToWidget( self.helpButton )
|
||||
columnIndex += 6
|
||||
cancelButton = Tkinter.Button( root, activebackground = 'black', activeforeground = 'orange', command = self.cancel, fg = 'orange', text = 'Cancel')
|
||||
cancelButton.grid( row = self.gridPosition.row, column = columnIndex )
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
Use ~/.sfact directory to store settings, not sfact_profiles in current pwd
|
||||
|
||||
diff -ru a/fabmetheus_utilities/archive.py b/fabmetheus_utilities/archive.py
|
||||
--- a/fabmetheus_utilities/archive.py 2013-01-27 15:29:27.828406000 +0100
|
||||
+++ b/fabmetheus_utilities/archive.py 2013-01-27 15:41:23.123273283 +0100
|
||||
@@ -18,9 +18,9 @@
|
||||
__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html'
|
||||
|
||||
|
||||
-globalTemporarySettingsPath = os.path.join(os.getcwd(), 'sfact_profiles')#(os.path.expanduser('~'), '.skeinforge')#thats default sfact way in own dir
|
||||
+#globalTemporarySettingsPath = os.path.join(os.getcwd(), 'sfact_profiles')#thats default sfact way in own dir
|
||||
#globalTemporarySettingsPath = os.path.join(os.path.expanduser('~'), '.skeinforge')#thats default sf way in home dir
|
||||
-#globalTemporarySettingsPath = os.path.join(os.path.expanduser('~'), '.sfact')#thats repetier compatible way in home dir
|
||||
+globalTemporarySettingsPath = os.path.join(os.path.expanduser('~'), '.sfact')#thats repetier compatible way in home dir
|
||||
|
||||
|
||||
def addToNamePathDictionary(directoryPath, namePathDictionary):
|
||||
diff -ru a/fabmetheus_utilities/settings.py b/fabmetheus_utilities/settings.py
|
||||
--- a/fabmetheus_utilities/settings.py 2013-01-27 15:29:27.841406000 +0100
|
||||
+++ b/fabmetheus_utilities/settings.py 2013-01-27 16:25:31.395040468 +0100
|
||||
@@ -301,7 +301,7 @@
|
||||
if repository.baseNameSynonym != None:
|
||||
text = archive.getFileText(archive.getProfilesPath(getProfileName(repository.baseNameSynonym, repository)), False)
|
||||
if text == '':
|
||||
- print('The default %s will be written in the .skeinforge folder in the home directory.' % repository.title.lower() )
|
||||
+ print('The default %s will be written in the .sfact folder in the home directory.' % repository.title.lower() )
|
||||
text = archive.getFileText(getProfilesDirectoryInAboveDirectory(getProfileBaseName(repository)), False)
|
||||
if text != '':
|
||||
readSettingsFromText(repository, text)
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
|
||||
[Desktop Entry]
|
||||
Name=SFACT
|
||||
GenericName=New slicing tool
|
||||
Exec=sfact %f
|
||||
Icon=development_section
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Graphics;
|
||||
101
sfact.spec
101
sfact.spec
|
|
@ -1,101 +0,0 @@
|
|||
%global commit bc56c6882269fb14e36bc7bd6582c19be6114c06
|
||||
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||
%global snapshot 20130128git%{shortcommit}
|
||||
Name: sfact
|
||||
Version: 0.0
|
||||
Release: 3.%{snapshot}%{?dist}
|
||||
Summary: Converts 3D model into G-Code for RepRap
|
||||
License: AGPLv3
|
||||
Group: Applications/Engineering
|
||||
URL: http://www.reprapfordummies.net/
|
||||
Source0: https://github.com/ahmetcemturan/SFACT/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
|
||||
Source1: %{name}.desktop
|
||||
Source2: %{name}
|
||||
Source3: %{name}-craft
|
||||
Patch0: %{name}-remove-help-button.patch
|
||||
Patch1: %{name}-setting-dir.patch
|
||||
Patch2: %{name}-empty-extrusion-profile.patch
|
||||
Patch3: %{name}-empty-winding-profile.patch
|
||||
Patch4: %{name}-empty-cutting-profile.patch
|
||||
Patch5: %{name}-empty-milling-profile.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
Requires: python2
|
||||
Requires: pypy
|
||||
Requires: tkinter
|
||||
|
||||
%description
|
||||
SFACT is the new Skeinforge, it 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}
|
||||
|
||||
%description doc
|
||||
SFACT is the new Skeinforge, it 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 -qn SFACT-%{commit}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
chmod +x sfact.py
|
||||
chmod -x fabmetheus_utilities/settings.py
|
||||
|
||||
# Removing stupid useless files
|
||||
rm -rf skeinforge_application/*.sh skeinforge_application/*.stl skFrontend.py *.sh
|
||||
|
||||
# Removing shebangs
|
||||
cd skeinforge_application/skeinforge_plugins/craft_plugins/
|
||||
for FILE in alteration.py bottom.py dimension.py fill.py inset.py limit.py preface.py scale.py widen.py ../../profiles/dimension2.py ../../skeinforge.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 -
|
||||
|
||||
%build
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{python_sitelib}/%{name}
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
cp -ar [fs_]* %{buildroot}%{python_sitelib}/%{name}
|
||||
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} # desktop file
|
||||
cp -a %{SOURCE2} %{SOURCE3} %{buildroot}%{_bindir} # launchers
|
||||
|
||||
%files
|
||||
%doc SFACT?Readme.txt COPYING
|
||||
%{python_sitelib}/%{name}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_bindir}/%{name}*
|
||||
|
||||
%files doc
|
||||
%doc documentation
|
||||
|
||||
%changelog
|
||||
* Fri Feb 01 2013 Miro Hrončok <mhroncok@redhat.com> - 0.0-3.20130128gitbc56c68
|
||||
- Corrected version in %%changelog
|
||||
- Use exec in launchers
|
||||
|
||||
* Tue Jan 29 2013 Miro Hrončok <mhroncok@redhat.com> - 0.0-2.20130128gitbc56c68
|
||||
- SFACT?Readme.txt instead of SFACT\ Readme.txt in %%doc to make this work in rawhide
|
||||
- New commit including COPYING
|
||||
|
||||
* Sun Jan 27 2013 Miro Hrončok <mhroncok@redhat.com> - 0.0-1.20121114git89e1e76
|
||||
- Started as a fork of skeinforge.spec
|
||||
- Updated source to GitHub, SFACT has no tarballs
|
||||
- Added patches from Debain
|
||||
- Added patch to keep setting in HOME
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
ff1dc9d6735605e83c08b170c7d5ee0c sfact-0.0-bc56c68.tar.gz
|
||||
Reference in a new issue