Skip to content

Commit 7ac61ac

Browse files
committed
Adjusted READMEs
1 parent b4381d1 commit 7ac61ac

File tree

2 files changed

+136
-150
lines changed

2 files changed

+136
-150
lines changed

README

Lines changed: 44 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -40,33 +40,30 @@ One other important point is that SeedWater does NOT run on Python 3.x at this t
4040
== Windows: ==
4141

4242
Download and install Anaconda Python Distribution:
43-
http://continuum.io/downloads
44-
45-
Download either 32 or 64 bit (to match your version of Windows).
46-
Double-click on the downloaded file and install it (you can choose either single-user of system-wide).
43+
http://continuum.io/downloads
44+
45+
Download either 32 or 64 bit (to match your version of Windows).
46+
Double-click on the downloaded file and install it (you can choose either single-user of system-wide).
4747

4848
Install wxPython and SeedWater Segmenter:
49-
Now, from the Start Menu (aka, the Windows Button) select the Anaconda Command Prompt inside the Anaconda folder
50-
Here, run these two commands:
51-
49+
Now, from the Start Menu (aka, the Windows Button) select the Anaconda Command Prompt inside the Anaconda folder
50+
Here, run these two commands:
5251

5352
{{{
5453
conda install wxpython
5554
pip install SeedWaterSegmenter
5655
}}}
5756

5857
Run SeedWater:
59-
Now, from this same Anaconda command prompt, you can run SeedWater with the following command:
60-
58+
Now, from this same Anaconda command prompt, you can run SeedWater with the following command:
6159

6260
{{{
6361
python -m SeedWaterSegmenter.SeedWaterSegmenter
6462
}}}
6563

6664
Make a desktop launcher (with an icon):
67-
To make running SeedWater easier, you can install a desktop shortcut with the included script.
68-
Just run one of these two command from the Anaconda Command Prompt (depending on whether you did a single-user or system-wide install):
69-
65+
To make running SeedWater easier, you can install a desktop shortcut with the included script.
66+
Just run one of these two command from the Anaconda Command Prompt (depending on whether you did a single-user or system-wide install):
7067

7168
{{{
7269
python C:\Users\<your username>\Anaconda\Scripts\create_sws_shortcut.py -install
@@ -78,88 +75,81 @@ That's it!
7875
== Mac OS X: ==
7976

8077
Obtain a C compiler:
81-
Download XCode from the Mac App Store or from https://developer.apple.com/xcode/
82-
83-
Install it and run it
84-
85-
To get gcc, you must install command line tools, a package for XCode. You can access this from: XCode menu > Preferences > Downloads. Check "command line tools" and install.
86-
87-
Reboot your system to make sure everything is loaded.
88-
78+
Download XCode from the Mac App Store or from https://developer.apple.com/xcode/
79+
80+
Install it and run it
81+
82+
To get gcc, you must install command line tools, a package for XCode. You can access this from: XCode menu > Preferences > Downloads. Check "command line tools" and install.
83+
84+
Reboot your system to make sure everything is loaded.
85+
8986
Download and install Anaconda Python Distribution:
90-
http://continuum.io/downloads
91-
92-
Download either the bash installer or the GUI installer.
93-
To run the bash installer, download the file to the Downloads folder and run this command in the Terminal:
94-
87+
http://continuum.io/downloads
88+
89+
Download either the bash installer or the GUI installer.
90+
To run the bash installer, download the file to the Downloads folder and run this command in the Terminal:
9591

9692
{{{
9793
bash Anaconda*.sh
9894
}}}
9995

100-
If you used the "pkg" download, just double-click it to install. You can then choose either single-user of system-wide.
96+
If you used the "pkg" download, just double-click it to install. You can then choose either single-user of system-wide.
10197

10298
Install wxPython:
103-
Now, open a *new* Terminal window, and run this command to install wxPython:
104-
99+
Now, open a *new* Terminal window, and run this command to install wxPython:
105100

106101
{{{
107102
conda install wxpython
108103
}}}
109104

110-
This failed for me on Mac OS X Snow Leopard, so I had to download this file:
111-
http://repo.continuum.io/pkgs/free/osx-64/wxpython-3.0-py27_0.tar.bz2
112-
to the Downloads folder, and then run these commands:
113-
105+
This failed for me on Mac OS X Snow Leopard, so I had to download this file:
106+
http://repo.continuum.io/pkgs/free/osx-64/wxpython-3.0-py27_0.tar.bz2
107+
to the Downloads folder, and then run these commands:
114108

115109
{{{
116110
cd ~/Downloads
117111
conda install wxpython-3.0-py27_0.tar.bz2
118112
}}}
119113

120-
Install SeedWater Semgnter:
121-
In the Terminal, run the following:
122-
114+
Install SeedWater Segmenter:
115+
In the Terminal, run the following:
123116

124117
{{{
125118
pip install SeedWaterSegmenter
126119
}}}
127120

128121
Run SeedWater:
129-
Now, from this same Anaconda command prompt, you can run SeedWater with the following command, noting that you HAVE to use "pythonw" and not just "python":
130-
122+
Now, from this same Anaconda command prompt, you can run SeedWater with the following command, noting that you HAVE to use "pythonw" and not just "python":
131123

132124
{{{
133125
pythonw -m SeedWaterSegmenter.SeedWaterSegmenter
134126
}}}
135127

136128
Download the App:
137-
Now also, thanks to Sveinbjorn Thordarson's Platypus tool, a packaged app is available for download at:
138-
https://github.com/davidmashburn/SeedWaterSegmenter/blob/master/MacOSX/SeedWaterSegmenterApp.zip
139-
Just extract the zip file and place the App on the Desktop or in the Applications folder
140-
141-
Be aware that this is only a link to the python scripts and will not work by itself without the above installation.
142-
143-
There is also a ".command" file that can serve the same purpose if the App does not work:
144-
https://github.com/davidmashburn/SeedWaterSegmenter/blob/master/MacOSX/SeedWaterSegementer.command
129+
Now also, thanks to Sveinbjorn Thordarson's Platypus tool, a packaged app is available for download at:
130+
https://github.com/davidmashburn/SeedWaterSegmenter/blob/master/MacOSX/SeedWaterSegmenterApp.zip
131+
Just extract the zip file and place the App on the Desktop or in the Applications folder
132+
133+
Be aware that this is only a link to the python scripts and will not work by itself without the above installation.
134+
135+
There is also a ".command" file that can serve the same purpose if the App does not work:
136+
https://github.com/davidmashburn/SeedWaterSegmenter/blob/master/MacOSX/SeedWaterSegementer.command
145137

146138

147139
That's it!
148140

149141
== Ubuntu/Debian: ==
150142

151143
Install:
152-
Run these two commands in the terminal:
153-
144+
Run these two commands in the terminal:
154145

155146
{{{
156147
sudo apt-get install python-setuptools python-wxtools python-numpy python-scipy python-matplotlib python-imaging python-xlrd python-xlwt
157148
sudo easy_install -U SeedWaterSegmenter
158149
}}}
159150

160151
Run SeedWater:
161-
In the terminal, run:
162-
152+
In the terminal, run:
163153

164154
{{{
165155
python2.7 -m SeedWaterSegmenter.SeedWaterSegmenter
@@ -168,12 +158,11 @@ python2.7 -m SeedWaterSegmenter.SeedWaterSegmenter
168158
(just "python" may also work, depending on your system)
169159

170160
Make a desktop launcher:
171-
Look at this to get you started:
172-
173-
https://github.com/davidmashburn/SeedWaterSegmenter/blob/master/desktop/SeedWaterSegmenter.desktop
174-
175-
This is how I created the symlinks that make this work:
176-
161+
Look at this to get you started:
162+
163+
https://github.com/davidmashburn/SeedWaterSegmenter/blob/master/desktop/SeedWaterSegmenter.desktop
164+
165+
This is how I created the symlinks that make this work:
177166

178167
{{{
179168
ln -s /usr/local/lib/python2.7/dist-packages/SeedWaterSegmenter*/seedwatersegmenter/SeedWaterSegmenter.py /usr/local/bin/seedwatersegmenter

0 commit comments

Comments
 (0)