diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..cd96426
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,347 @@
+# Created by .ignore support plugin (hsz.mobi)
+### VisualStudio template
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
diff --git a/Harmonograph/Harmonograph.csproj b/Harmonograph/Harmonograph.csproj
index d50d4eb..1019aa5 100644
--- a/Harmonograph/Harmonograph.csproj
+++ b/Harmonograph/Harmonograph.csproj
@@ -60,25 +60,22 @@
-
+
Always
-
+
Always
-
+
Always
-
+
Always
-
+
Always
-
- Always
-
-
+
Always
diff --git a/Harmonograph/Program.cs b/Harmonograph/Program.cs
index 9573f88..fedf0ff 100644
--- a/Harmonograph/Program.cs
+++ b/Harmonograph/Program.cs
@@ -12,7 +12,7 @@ namespace Harmonograph
if (f == "-")
{
Console.Write("input file.\n>>> ");
- f = Console.ReadLine() + ".json";
+ f = $"presets\\{Console.ReadLine()}.json";
}
using (var w = new GraphWindow(f))
{
diff --git a/Harmonograph/bow2.json b/Harmonograph/bow2.json
deleted file mode 100644
index 8683cbe..0000000
--- a/Harmonograph/bow2.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "back": "0x10ffffff",
- "front": "0x10000000",
- "displayRate": 1000,
- "cycles": 500,
- "viewHeight": 3,
- "pendulums": [
- {
- "amplitude": { "x": 2, "y": 0 },
- "period": 3.001,
- "friction": 0.001
- },
- {
- "amplitude": { "x": 0, "y": 1 },
- "period": 4,
- "friction": 0.001
- },
- {
- "amplitude": { "x": .5, "y": .5 },
- "period": 1,
- "friction": 0.001
- },
- {
- "amplitude": { "x": -.5, "y": .5 },
- "period": 3,
- "friction": 0.001
- }
- ]
-}
\ No newline at end of file
diff --git a/Harmonograph/whiteonblack.json b/Harmonograph/presets/blackonwhite.json
similarity index 100%
rename from Harmonograph/whiteonblack.json
rename to Harmonograph/presets/blackonwhite.json
diff --git a/Harmonograph/presets/blackonwhite.png b/Harmonograph/presets/blackonwhite.png
new file mode 100644
index 0000000..9f64241
Binary files /dev/null and b/Harmonograph/presets/blackonwhite.png differ
diff --git a/Harmonograph/rainbowroad.json b/Harmonograph/presets/rainbowroad.json
similarity index 100%
rename from Harmonograph/rainbowroad.json
rename to Harmonograph/presets/rainbowroad.json
diff --git a/Harmonograph/sparse.json b/Harmonograph/presets/sparse.json
similarity index 100%
rename from Harmonograph/sparse.json
rename to Harmonograph/presets/sparse.json
diff --git a/Harmonograph/presets/sparse.png b/Harmonograph/presets/sparse.png
new file mode 100644
index 0000000..0b160b0
Binary files /dev/null and b/Harmonograph/presets/sparse.png differ
diff --git a/Harmonograph/presets/sparse2.json b/Harmonograph/presets/sparse2.json
new file mode 100644
index 0000000..79e7e34
--- /dev/null
+++ b/Harmonograph/presets/sparse2.json
@@ -0,0 +1,23 @@
+{
+ "back": "0xffffffff",
+ "front": "0xff000000",
+ "displayRate": 500,
+ "viewHeight": 3,
+ "pendulums": [
+ {
+ "amplitude": { "x": 1.5, "y": 0 },
+ "period": 2,
+ "friction": 0.02
+ },
+ {
+ "amplitude": { "x": 0, "y": 1 },
+ "period": 1,
+ "friction": 0.02
+ },
+ {
+ "amplitude": { "x": 1, "y": 1 },
+ "period": .5,
+ "friction": .01
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Harmonograph/presets/sparse2.png b/Harmonograph/presets/sparse2.png
new file mode 100644
index 0000000..4a5d036
Binary files /dev/null and b/Harmonograph/presets/sparse2.png differ
diff --git a/Harmonograph/presets/test.json b/Harmonograph/presets/test.json
new file mode 100644
index 0000000..79e7e34
--- /dev/null
+++ b/Harmonograph/presets/test.json
@@ -0,0 +1,23 @@
+{
+ "back": "0xffffffff",
+ "front": "0xff000000",
+ "displayRate": 500,
+ "viewHeight": 3,
+ "pendulums": [
+ {
+ "amplitude": { "x": 1.5, "y": 0 },
+ "period": 2,
+ "friction": 0.02
+ },
+ {
+ "amplitude": { "x": 0, "y": 1 },
+ "period": 1,
+ "friction": 0.02
+ },
+ {
+ "amplitude": { "x": 1, "y": 1 },
+ "period": .5,
+ "friction": .01
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Harmonograph/blackonwhite.json b/Harmonograph/presets/whiteonblack.json
similarity index 100%
rename from Harmonograph/blackonwhite.json
rename to Harmonograph/presets/whiteonblack.json
diff --git a/Harmonograph/spring.json b/Harmonograph/spring.json
deleted file mode 100644
index 4726d76..0000000
--- a/Harmonograph/spring.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "back": "0x10ffffff",
- "front": "0x70000000",
- "displayRate": 1,
- "cycles": 10,
- "viewHeight": 3,
- "pendulums": [
- {
- "amplitude": { "x": 2, "y": -.5 },
- "period": 5.01,
- "friction": 0.01
- },
- {
- "amplitude": { "x": 0, "y": .5 },
- "period": 4.01,
- "friction": 0.01
- },
- {
- "amplitude": { "x": .5, "y": .5 },
- "period": 1,
- "friction": 0.01
- },
- {
- "amplitude": { "x": -.5, "y": .5 },
- "period": 3,
- "friction": 0.01
- }
- ]
-}
\ No newline at end of file
diff --git a/Harmonograph/test.json b/Harmonograph/test.json
deleted file mode 100644
index 24c2f10..0000000
--- a/Harmonograph/test.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "back": "0x10ffffff",
- "front": "0x20000000",
- "displayRate": 01,
- "cycles": 10,
- "viewHeight": 3,
- "pendulums": [
- {
- "amplitude": { "x": 1, "y": -.5 },
- "period": 5.005,
- "friction": 0.001
- },
- {
- "amplitude": { "x": .5, "y": 1 },
- "period": 4.01,
- "friction": 0.001
- },
- {
- "amplitude": { "x": .5, "y": 0 },
- "period": 3.01,
- "friction": 0.001
- }
- ]
-}
\ No newline at end of file