Skip to content

Commit

Permalink
Remove old cut surface after project change, Ask user to open .xml pr…
Browse files Browse the repository at this point in the history
…oject file if it exists, Added link to online help, Completed user manual
  • Loading branch information
jcoffland committed Mar 24, 2014
1 parent efb5a01 commit 7963033
Show file tree
Hide file tree
Showing 176 changed files with 1,000 additions and 355 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# OpenSCAM Changelog

## v0.2.2:
- Remove old cut surface after project change.
- Ask user to open .xml project file if it exists.
- Added link to online help.

## v0.2.1:

2014-03-22

- Generate tool paths in background.
- Added icon to indicate run status.
- Moved simulation control buttons to bottom of sim view.
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if not os.environ.get('CBANG_HOME'): os.environ['CBANG_HOME'] = './cbang'
cbang = os.environ.get('CBANG_HOME')

# Version
version = '0.2.1'
version = '0.2.2'
major, minor, revision = version.split('.')

# Setup
Expand Down
10 changes: 0 additions & 10 deletions doc/web/Makefile

This file was deleted.

28 changes: 0 additions & 28 deletions doc/web/build.sh

This file was deleted.

25 changes: 0 additions & 25 deletions doc/web/config.json

This file was deleted.

Binary file removed doc/web/images/manual/dock-estimates.png
Binary file not shown.
Binary file removed doc/web/images/manual/dock-project.png
Binary file not shown.
Binary file removed doc/web/images/manual/dock-status.png
Binary file not shown.
Binary file removed doc/web/images/manual/dock-tool-path-bounds.png
Binary file not shown.
Binary file removed doc/web/images/manual/dock-tool-position.png
Binary file not shown.
Binary file removed doc/web/images/manual/dock-workpiece-bounds.png
Binary file not shown.
Binary file removed doc/web/images/manual/overview.png
Binary file not shown.
Binary file removed doc/web/images/manual/resolution.png
Binary file not shown.
Binary file removed doc/web/images/manual/thumbs/overview.png
Binary file not shown.
Binary file removed doc/web/images/manual/thumbs/view-simulation.png
Binary file not shown.
Binary file removed doc/web/images/manual/toolbar-export.png
Binary file not shown.
Binary file removed doc/web/images/manual/toolbar-perspective.png
Binary file not shown.
Binary file removed doc/web/images/manual/toolbar-project.png
Binary file not shown.
Binary file removed doc/web/images/manual/toolbar-simulation.png
Binary file not shown.
Binary file removed doc/web/images/manual/toolbar-tool-path.png
Binary file not shown.
Binary file removed doc/web/images/manual/toolbar-view.png
Binary file not shown.
Binary file removed doc/web/images/manual/view-simulation.png
Binary file not shown.
Binary file removed doc/web/images/screenshots/simulation_view.png
Binary file not shown.
Binary file not shown.
Binary file removed doc/web/images/screenshots/thumbs/tool_path_view.png
Binary file not shown.
Binary file removed doc/web/images/screenshots/thumbs/tool_view.png
Binary file not shown.
Binary file removed doc/web/images/screenshots/thumbs/workpiece_view.png
Binary file not shown.
Binary file removed doc/web/images/screenshots/tool_path_view.png
Binary file not shown.
Binary file removed doc/web/images/screenshots/tool_view.png
Binary file not shown.
Binary file removed doc/web/images/screenshots/workpiece_view.png
Binary file not shown.
Binary file removed doc/web/images/support_ribbon.png
Diff not rendered.
Binary file removed doc/web/images/support_ribbon_highlight.png
Diff not rendered.
40 changes: 0 additions & 40 deletions doc/web/jade/main/downloads.jade

This file was deleted.

13 changes: 0 additions & 13 deletions doc/web/jade/main/screenshots.jade

This file was deleted.

9 changes: 0 additions & 9 deletions doc/web/jade/manual/docks.jade

This file was deleted.

6 changes: 0 additions & 6 deletions doc/web/jade/manual/export.jade

This file was deleted.

7 changes: 0 additions & 7 deletions doc/web/jade/manual/layout.jade

This file was deleted.

5 changes: 0 additions & 5 deletions doc/web/jade/manual/nc-files.jade

This file was deleted.

5 changes: 0 additions & 5 deletions doc/web/jade/manual/playback.jade

This file was deleted.

44 changes: 0 additions & 44 deletions doc/web/jade/manual/projects.jade

This file was deleted.

56 changes: 0 additions & 56 deletions doc/web/jade/manual/simulation.jade

This file was deleted.

10 changes: 0 additions & 10 deletions doc/web/jade/manual/toolbars.jade

This file was deleted.

10 changes: 0 additions & 10 deletions doc/web/jade/manual/tools.jade

This file was deleted.

6 changes: 0 additions & 6 deletions doc/web/jade/manual/workpiece.jade

This file was deleted.

3 changes: 0 additions & 3 deletions doc/web/jade/mixins.jade

This file was deleted.

10 changes: 10 additions & 0 deletions doc/www/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
all: http

http: $(shell find jade) config.json
./build.sh

clean:
rm -rf http jade/{manual,main,download}/{template,menu}.jade

publish: http
rsync -Lav http/ [email protected]:/var/www/openscam.org/http/
37 changes: 37 additions & 0 deletions doc/www/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash

declare -A PAGES

PAGES[main]="about quick-start mission screenshots status donate community "
PAGES[main]+="legal contact"
PAGES[download]="current install run source debug previous"
PAGES[manual]="overview projects simulation layout playback nc-files tools "
PAGES[manual]+="workpiece export docks toolbars"

# Create Menus
for PAGE in ${!PAGES[@]}; do
"$(dirname "$0")"/create_menu.sh $PAGE ${PAGES[$PAGE]} \
>jade/$PAGE/menu.jade
done

# Create Templates
for PAGE in ${!PAGES[@]}; do
"$(dirname "$0")"/create_template.sh $PAGE ${PAGES[$PAGE]} \
>jade/$PAGE/template.jade
done

mkdir -p http

for PAGE in ${!PAGES[@]}; do
TEMPLATE=jade/$PAGE/template.jade
TARGET=http/$PAGE.html
echo Building $TARGET from $TEMPLATE...
jade -P -p $TEMPLATE -O "$(cat config.json)" <$TEMPLATE >$TARGET
done

jade -P <jade/notfound.jade >http/notfound.html

ln -sf main.html http/index.html
ln -sf ../css ../js ../images http/

touch http
33 changes: 33 additions & 0 deletions doc/www/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
pages: {
main: {
titleText:
'<div><img src="images/banner.png" alt="OpenSCAM"/></div>',
subtext: 'Open-Source Simulation & Computer Aided Machining',
},
download: {
titleText: "<h1>Downloads</h1>",
subtext: 'OpenSCAM installers and packages.',
},
manual: {
titleText: "<h1>User's Manual</h1>",
subtext: 'A guide to using OpenSCAM v0.2.1 or newer.',
}
},
version: '0.2.1 beta',
repoURL: 'https://github.com/CauldronDevelopmentLLC/OpenSCAM',
releases: [
['Windows', ['windows-128.png'],
'windows-xp-32bit', 'openscam_0.2.1_x86.exe'],
['Mac OS-X', ['osx-128.png'],
'osx-10.6.4-64bit', 'openscam_0.2.1_x86_64.pkg'],
['Debian Linux 64-bit', ['debian-128.png', 'mint-128.png'],
'debian-testing-64bit', 'openscam_0.2.1_amd64.deb'],
['Debian Linux 32-bit', ['debian-128.png', 'mint-128.png'],
'debian-testing-32bit', 'openscam_0.2.1_i386.deb'],
['Ubuntu Precise Penguin 64-bit', ['ubuntu-128.png'],
'ubuntu-precise-64bit', 'openscam_0.2.1_amd64.deb'],
['LinuxCNC 10.04', ['ubuntu-128.png'],
'linuxcnc-10.04-32bit', 'openscam_0.2.1_i386.deb']
]
}
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 7963033

Please sign in to comment.