diff --git a/src/avgimg/avgimg.go b/img/avgimg/avgimg.go similarity index 100% rename from src/avgimg/avgimg.go rename to img/avgimg/avgimg.go diff --git a/src/blurimg/blur.go b/img/blurimg/blur.go similarity index 100% rename from src/blurimg/blur.go rename to img/blurimg/blur.go diff --git a/src/diffimg/diff_image.go b/img/diffimg/diff_image.go similarity index 100% rename from src/diffimg/diff_image.go rename to img/diffimg/diff_image.go diff --git a/src/imgutils/clamp.go b/img/imgutils/clamp.go similarity index 100% rename from src/imgutils/clamp.go rename to img/imgutils/clamp.go diff --git a/src/imgutils/copy.go b/img/imgutils/copy.go similarity index 100% rename from src/imgutils/copy.go rename to img/imgutils/copy.go diff --git a/src/imgutils/gif.go b/img/imgutils/gif.go similarity index 100% rename from src/imgutils/gif.go rename to img/imgutils/gif.go diff --git a/src/labelimg/glasbey.go b/img/labelimg/glasbey.go similarity index 100% rename from src/labelimg/glasbey.go rename to img/labelimg/glasbey.go diff --git a/src/labelimg/glasbey.sh b/img/labelimg/glasbey.sh similarity index 100% rename from src/labelimg/glasbey.sh rename to img/labelimg/glasbey.sh diff --git a/src/labelimg/label.go b/img/labelimg/label.go similarity index 100% rename from src/labelimg/label.go rename to img/labelimg/label.go diff --git a/src/labelimg/label_test.go b/img/labelimg/label_test.go similarity index 100% rename from src/labelimg/label_test.go rename to img/labelimg/label_test.go diff --git a/src/labelimg/labelimg.go b/img/labelimg/labelimg.go similarity index 100% rename from src/labelimg/labelimg.go rename to img/labelimg/labelimg.go diff --git a/src/labelimg/labelimg_test.go b/img/labelimg/labelimg_test.go similarity index 100% rename from src/labelimg/labelimg_test.go rename to img/labelimg/labelimg_test.go diff --git a/src/wand/wand.go b/img/wand/wand.go similarity index 100% rename from src/wand/wand.go rename to img/wand/wand.go diff --git a/src/lib/vz_project/calibration.go b/internal/project/calibration.go similarity index 100% rename from src/lib/vz_project/calibration.go rename to internal/project/calibration.go diff --git a/src/lib/vz_project/data_uri.go b/internal/project/data_uri.go similarity index 100% rename from src/lib/vz_project/data_uri.go rename to internal/project/data_uri.go diff --git a/src/lib/vz_project/frame_analysis.go b/internal/project/frame_analysis.go similarity index 94% rename from src/lib/vz_project/frame_analysis.go rename to internal/project/frame_analysis.go index 230d77c..7a101eb 100644 --- a/src/lib/vz_project/frame_analysis.go +++ b/internal/project/frame_analysis.go @@ -6,11 +6,11 @@ import ( "log" "time" - "blurimg" - "diffimg" + "github.com/jehiah/TrafficSpeed/img/blurimg" + "github.com/jehiah/TrafficSpeed/img/diffimg" + "github.com/jehiah/TrafficSpeed/img/imgutils" + "github.com/jehiah/TrafficSpeed/img/labelimg" "github.com/nfnt/resize" - "imgutils" - "labelimg" ) const analysFrameCount = 60 diff --git a/src/lib/vz_project/mask.go b/internal/project/mask.go similarity index 100% rename from src/lib/vz_project/mask.go rename to internal/project/mask.go diff --git a/src/lib/vz_project/open_speed_data.go b/internal/project/open_speed_data.go similarity index 100% rename from src/lib/vz_project/open_speed_data.go rename to internal/project/open_speed_data.go diff --git a/src/lib/vz_project/points.go b/internal/project/points.go similarity index 100% rename from src/lib/vz_project/points.go rename to internal/project/points.go diff --git a/src/lib/vz_project/points_test.go b/internal/project/points_test.go similarity index 100% rename from src/lib/vz_project/points_test.go rename to internal/project/points_test.go diff --git a/src/lib/vz_project/position.go b/internal/project/position.go similarity index 98% rename from src/lib/vz_project/position.go rename to internal/project/position.go index 22dfbc4..fbaf668 100644 --- a/src/lib/vz_project/position.go +++ b/internal/project/position.go @@ -6,7 +6,7 @@ import ( "math" "time" - "labelimg" + "github.com/jehiah/TrafficSpeed/img/labelimg" ) // Position matches Position in position.jl diff --git a/src/lib/vz_project/project.go b/internal/project/project.go similarity index 99% rename from src/lib/vz_project/project.go rename to internal/project/project.go index 0b6af6b..827f8da 100644 --- a/src/lib/vz_project/project.go +++ b/internal/project/project.go @@ -16,9 +16,9 @@ import ( "strings" "time" - "avgimg" "github.com/anthonynsimon/bild/transform" - "imgutils" + "github.com/jehiah/TrafficSpeed/img/avgimg" + "github.com/jehiah/TrafficSpeed/img/imgutils" ) // roughly 7s of frames diff --git a/src/lib/vz_project/save_img.go b/internal/project/save_img.go similarity index 100% rename from src/lib/vz_project/save_img.go rename to internal/project/save_img.go diff --git a/src/lib/vz_project/templates.go b/internal/project/templates.go similarity index 100% rename from src/lib/vz_project/templates.go rename to internal/project/templates.go diff --git a/src/lib/vz_project/video_iterator.go b/internal/project/video_iterator.go similarity index 100% rename from src/lib/vz_project/video_iterator.go rename to internal/project/video_iterator.go diff --git a/speed_camera/.gitignore b/speed_camera/.gitignore new file mode 100644 index 0000000..88b0387 --- /dev/null +++ b/speed_camera/.gitignore @@ -0,0 +1 @@ +speed_camera diff --git a/src/cmd/vz_speed_camera/cmd/config_project.go b/speed_camera/cmd/config_project.go similarity index 96% rename from src/cmd/vz_speed_camera/cmd/config_project.go rename to speed_camera/cmd/config_project.go index afdc718..dfeab09 100644 --- a/src/cmd/vz_speed_camera/cmd/config_project.go +++ b/speed_camera/cmd/config_project.go @@ -5,8 +5,8 @@ import ( "log" "path/filepath" + "github.com/jehiah/TrafficSpeed/internal/project" "github.com/spf13/cobra" - project "lib/vz_project" ) func configProjectCmd() *cobra.Command { diff --git a/src/cmd/vz_speed_camera/cmd/new_project.go b/speed_camera/cmd/new_project.go similarity index 97% rename from src/cmd/vz_speed_camera/cmd/new_project.go rename to speed_camera/cmd/new_project.go index c89c109..d65d821 100644 --- a/src/cmd/vz_speed_camera/cmd/new_project.go +++ b/speed_camera/cmd/new_project.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" + "github.com/jehiah/TrafficSpeed/internal/project" "github.com/spf13/cobra" - project "lib/vz_project" ) func newProjectCmd() *cobra.Command { diff --git a/src/cmd/vz_speed_camera/cmd/root.go b/speed_camera/cmd/root.go similarity index 68% rename from src/cmd/vz_speed_camera/cmd/root.go rename to speed_camera/cmd/root.go index 301f8a5..0800f28 100644 --- a/src/cmd/vz_speed_camera/cmd/root.go +++ b/speed_camera/cmd/root.go @@ -14,9 +14,9 @@ func init() { } var RootCmd = &cobra.Command{ - Use: "vz_speed_camera", - Short: "VZ Speed Camera measure traffic speed", - Long: "Vision Zero Speed Camera is a tool to measure vehicle speed from video footage.", + Use: "speed_camera", + Short: "Speed Camera measure traffic speed", + Long: "Speed Camera is a tool to measure vehicle speed from video footage.", Run: func(cmd *cobra.Command, args []string) { if len(args) == 0 { cmd.Usage() diff --git a/src/cmd/vz_speed_camera/cmd/thumbnails.go b/speed_camera/cmd/thumbnails.go similarity index 97% rename from src/cmd/vz_speed_camera/cmd/thumbnails.go rename to speed_camera/cmd/thumbnails.go index fa64477..4f323e6 100644 --- a/src/cmd/vz_speed_camera/cmd/thumbnails.go +++ b/speed_camera/cmd/thumbnails.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" + "github.com/jehiah/TrafficSpeed/internal/project" "github.com/spf13/cobra" - project "lib/vz_project" ) func extractFramesCmd() *cobra.Command { diff --git a/src/cmd/vz_speed_camera/cmd/version.go b/speed_camera/cmd/version.go similarity index 62% rename from src/cmd/vz_speed_camera/cmd/version.go rename to speed_camera/cmd/version.go index 21b4220..eed5ca1 100644 --- a/src/cmd/vz_speed_camera/cmd/version.go +++ b/speed_camera/cmd/version.go @@ -8,8 +8,8 @@ import ( var versionCmd = &cobra.Command{ Use: "version", - Short: "Print the version number of vz_speed_camera", + Short: "Print the version number of speed_camera", Run: func(cmd *cobra.Command, args []string) { - fmt.Println("vz_speed_camera v0.1 -- HEAD") + fmt.Println("speed_camera v0.1 -- HEAD") }, } diff --git a/src/cmd/vz_speed_camera/main.go b/speed_camera/main.go similarity index 86% rename from src/cmd/vz_speed_camera/main.go rename to speed_camera/main.go index f838083..a0f2e08 100644 --- a/src/cmd/vz_speed_camera/main.go +++ b/speed_camera/main.go @@ -5,7 +5,7 @@ import ( "log" "os" - "cmd/vz_speed_camera/cmd" + "github.com/jehiah/TrafficSpeed/speed_camera/cmd" ) // #cgo LDFLAGS="-L/usr/local/Cellar/ffmpeg/3.3/lib" diff --git a/vendor.sh b/vendor.sh old mode 100644 new mode 100755