Skip to content

Commit 50ae697

Browse files
committed
Cleaned up Code, better way to check for zenity, fixed stop button on linux as well, much better way to keep track of running processes, better error handling, better download & and zip extracting on windows installation, beta amd support (nix does not yet have amd), fix bug where images with spaces in file name cause densify point cloud to fail (we copy and rename the files)
1 parent 705d1e4 commit 50ae697

22 files changed

Lines changed: 1584 additions & 1409 deletions

lib/TitleBar/TitleBar.dart

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,23 @@ class TitleBar extends StatelessWidget {
99
color: Colors.grey[900],
1010
child: Row(
1111
children: [
12-
13-
Expanded(child: DragToMoveArea(child: Container(padding: EdgeInsets.only(left: 10), alignment: Alignment.centerLeft, child: Text("Simple Photogrammetry Gui", style: TextStyle(color: Colors.white))))),
14-
15-
12+
Expanded(
13+
child: DragToMoveArea(
14+
child: Container(
15+
padding: EdgeInsets.only(left: 10),
16+
alignment: Alignment.centerLeft,
17+
child: Text("Simple Photogrammetry Gui", style: TextStyle(color: Colors.white)),
18+
),
19+
),
20+
),
21+
1622
IconButton(
1723
icon: const Icon(Icons.minimize, color: Colors.white),
1824
onPressed: () async {
1925
await windowManager.minimize();
2026
},
2127
),
22-
23-
28+
2429
IconButton(
2530
icon: const Icon(Icons.close, color: Colors.white),
2631
onPressed: () async {
@@ -31,4 +36,4 @@ class TitleBar extends StatelessWidget {
3136
),
3237
);
3338
}
34-
}
39+
}

lib/main.dart

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ String gpu_cpu_type = resolveGpuType(Platform.environment);
1515
String poissonExtraFlags = "--pointWeight 10 --samplesPerNode 2 --confidence";
1616
String surfaceTrimmerExtraFlags = "--removeIslands";
1717
String decimationArgs = "-t 1";
18-
String meshingExtraFlags =
19-
"--target-face-num 0 --crop-to-roi 1 --roi-border 10";
18+
String meshingExtraFlags = "--target-face-num 0 --crop-to-roi 1 --roi-border 10";
2019
String meshing_type = "poissonrecon";
21-
String currentVersionTag = "V1.1.5";
20+
String currentVersionTag = "v1.1.6";
2221

2322
void main() async {
2423
WidgetsFlutterBinding.ensureInitialized();
@@ -40,10 +39,7 @@ void main() async {
4039
if (Platform.isWindows) {
4140
final SharedPreferences prefs = await SharedPreferences.getInstance();
4241

43-
gpu_cpu_type = normalizeGpuType(
44-
prefs.getString("gpu_cpu_type"),
45-
fallback: "cuda",
46-
);
42+
gpu_cpu_type = normalizeGpuType(prefs.getString("gpu_cpu_type"), fallback: "cuda");
4743
}
4844

4945
runApp(MaterialApp(home: ScanningScreenView(ScanningScreenModel())));

lib/runCommand.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:io';
22

3-
runCommand(String command, List<String> attr, {String? workingFolder, bool checkOnlyError = false}) async {
3+
runCommandBlocking(String command, List<String> attr, {String? workingFolder, bool checkOnlyError = false}) async {
44
return await (workingFolder == null ? Process.run(command, attr) : Process.run(command, attr,workingDirectory: workingFolder)).then((ProcessResult results) {
55
String err = results.stderr.toString();
66
if(checkOnlyError) {
@@ -16,4 +16,4 @@ runCommand(String command, List<String> attr, {String? workingFolder, bool check
1616
return err == "" ? results.stdout : err;
1717
}
1818
});
19-
}
19+
}

0 commit comments

Comments
 (0)