semicolin/totte
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't hard-code aspect ratio

Browse Source
This commit is contained in:
Colin McMillen 2023-08-30 15:39:04 -04:00
parent 3d4ad61f5e
commit c1ed48b917
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Program.cs
View File

@ -186,20 +186,20 @@ public class CropTool : ITool {
// left, right, top, bottom // left, right, top, bottom
(int, int, int, int) GetCrop() { (int, int, int, int) GetCrop() {
// FIXME: allow for unconstrained crop, 1:1, etc.
float aspectRatio = 1f * photo.Size.X / photo.Size.Y;
Vector2i start = mouseDragStart; Vector2i start = mouseDragStart;
Vector2i end = mouseDragEnd; Vector2i end = mouseDragEnd;
int width = Math.Abs(end.X - start.X); int width = Math.Abs(end.X - start.X);
int height = Math.Abs(end.Y - start.Y); int height = Math.Abs(end.Y - start.Y);
int heightChange = Math.Min(height, (int) (width / CameraInfo.AspectRatio)); int heightChange = Math.Min(height, (int) (width / aspectRatio));
int widthChange = (int) (heightChange * CameraInfo.AspectRatio); int widthChange = (int) (heightChange * aspectRatio);
if (end.X < start.X) { if (end.X < start.X) {
widthChange *= -1; widthChange *= -1;
} }
if (end.Y < start.Y) { if (end.Y < start.Y) {
heightChange *= -1; heightChange *= -1;
} }
// FIXME: choose the aspect ratio based on the original image aspect ratio.
// FIXME: allow for unconstrained crop, 1:1, etc.
end.Y = start.Y + heightChange; end.Y = start.Y + heightChange;
end.X = start.X + widthChange; end.X = start.X + widthChange;
int left = Math.Min(start.X, end.X); int left = Math.Min(start.X, end.X);
@ -684,11 +684,11 @@ public class Game : GameWindow {
false, 5 * sizeof(float), 3 * sizeof(float)); false, 5 * sizeof(float), 3 * sizeof(float));
// Load photos from a directory. // Load photos from a directory.
// string[] files = Directory.GetFiles(@"c:\users\colin\desktop\photos-test\"); string[] files = Directory.GetFiles(@"c:\users\colin\desktop\photos-test\");
// string[] files = Directory.GetFiles(@"c:\users\colin\pictures\photos\2023\07\14\"); // string[] files = Directory.GetFiles(@"c:\users\colin\pictures\photos\2023\07\14\");
// string[] files = Directory.GetFiles(@"c:\users\colin\pictures\photos\2023\07\23\"); // string[] files = Directory.GetFiles(@"c:\users\colin\pictures\photos\2023\07\23\");
// string[] files = Directory.GetFiles(@"G:\DCIM\100EOSR6\"); // string[] files = Directory.GetFiles(@"G:\DCIM\100EOSR6\");
string[] files = Directory.GetFiles(@"c:\users\colin\desktop\totte-output\2023\08\29"); // string[] files = Directory.GetFiles(@"c:\users\colin\desktop\totte-output\2023\08\29");
// string[] files = Directory.GetFiles(@"c:\users\colin\desktop\import"); // string[] files = Directory.GetFiles(@"c:\users\colin\desktop\import");
// string[] files = Directory.GetFiles(@"C:\Users\colin\Pictures\photos\2018\06\23"); // string[] files = Directory.GetFiles(@"C:\Users\colin\Pictures\photos\2018\06\23");
// string[] files = Directory.GetFiles(@"C:\Users\colin\Desktop\Germany all\104D7000"); // string[] files = Directory.GetFiles(@"C:\Users\colin\Desktop\Germany all\104D7000");
@ -804,8 +804,6 @@ public class Game : GameWindow {
// $ identify -verbose image.jpg | grep Quality: // $ identify -verbose image.jpg | grep Quality:
// FIXME: don't ExportPhotos() if another export is already active. // FIXME: don't ExportPhotos() if another export is already active.
// FIXME: show a progress bar or something. // FIXME: show a progress bar or something.
// FIXME: if there's a photo missing GPS information, copy the information
// from the previous photo in the export.
private async void ExportPhotos() { private async void ExportPhotos() {
JpegEncoder encoder = new JpegEncoder() { Quality = 100 }; JpegEncoder encoder = new JpegEncoder() { Quality = 100 };
foreach (Photo p in photos) { foreach (Photo p in photos) {