denny 9 months ago
parent
commit
d9a0cd9875

+ 2 - 1
Tools/Flyinsono.DBCopy.Tool/ClientTestManager.cs

@@ -37,7 +37,8 @@ namespace Flyinsono.DBCopy.Tool
         public void ConnectDb(string dbPath)
         {
             Console.WriteLine($"Database path: {dbPath}");
-            string mongodPath = @"DBCopy.Packages\4.2earlier\mongod_4.2.exe";
+            //string mongodPath = @"DBCopy.Packages\4.2earlier\mongod_4.2.exe";
+            string mongodPath = @"DBCopy.Packages\3.6.20\mongod_3.6.20.exe";
             int port = 8333;
             StartLocalMongoDbServer(mongodPath, dbPath, port);
             CommonConfigManager.IsLocalHost = true;

+ 4 - 0
Tools/Flyinsono.DBCopy.Tool/Config/Language/chinese.json

@@ -11315,6 +11315,10 @@
         "key": "CursorColor",
         "value": "大十字卡尺颜色(M/D模式)"
       },
+      {
+        "key": "MeasureColor",
+        "value": "Cursor color(M/D mode)"
+      },
       {
         "key": "Yellow",
         "value": "黄色"

+ 4 - 0
Tools/Flyinsono.DBCopy.Tool/Config/Language/english.json

@@ -14514,6 +14514,10 @@
         "key": "CursorColor",
         "value": "Cursor color(M/D mode)"
       },
+      {
+        "key": "MeasureColor",
+        "value": "Cursor color(M/D mode)"
+      },
       {
         "key": "LineWeightOfBigCross",
         "value": "Cursor line weight(M/D mode)"

BIN
Tools/Flyinsono.DBCopy.Tool/DBCopy.Packages/3.6.20/mongod


BIN
Tools/Flyinsono.DBCopy.Tool/DBCopy.Packages/3.6.20/mongod_3.6.20.exe


+ 6 - 0
Tools/Flyinsono.DBCopy.Tool/Flyinsono.DBCopy.Tool.csproj

@@ -39,6 +39,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<None Update="DBCopy.Packages\3.6.20\mongod">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+		<None Update="DBCopy.Packages\3.6.20\mongod_3.6.20.exe">
+		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
 		<None Update="DBCopy.Packages\4.2earlier\mongod_4.2.exe">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</None>

+ 1 - 1
Tools/Flyinsono.DBCopy.Tool/ViewModels/MainWindowViewModel.cs

@@ -783,7 +783,7 @@ namespace Flyinsono.DBCopy.Tool
             var service = AppManager.Instance.GetManager<IClientTestManager>();
             if (string.IsNullOrEmpty(DbPath))
             {
-                DbPath = "E:\\Arthur\\20230420175958";
+                DbPath = "F:\\BaiduNetdiskDownload\\Database0708\\Database";
             }
             service.ConnectDb(DbPath);
         }

+ 2 - 1
src/Resource/Measure/MeasureSystemSetting.json

@@ -19,5 +19,6 @@
     "AreaUnit": "cm2",
     "VelocityUnit": "cms",
     "TimeUnit": "ms",
-    "URMDistanceUnit": "mm"
+    "URMDistanceUnit": "mm",
+    "MeasureColor":"Lime"
 }

+ 4 - 0
src/vCloudProxyService/vCloudServer/Resource/Language/chinese.json

@@ -11315,6 +11315,10 @@
         "key": "CursorColor",
         "value": "大十字卡尺颜色(M/D模式)"
       },
+      {
+        "key": "MeasureColor",
+        "value": "Cursor color(M/D mode)"
+      },
       {
         "key": "Yellow",
         "value": "黄色"

+ 4 - 0
src/vCloudProxyService/vCloudServer/Resource/Language/english.json

@@ -14514,6 +14514,10 @@
         "key": "CursorColor",
         "value": "Cursor color(M/D mode)"
       },
+      {
+        "key": "MeasureColor",
+        "value": "Cursor color(M/D mode)"
+      },
       {
         "key": "LineWeightOfBigCross",
         "value": "Cursor line weight(M/D mode)"