diff --git a/Default Data/VACC/Bus.vacc b/Default Data/VACC/Bus.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..7abf8eb10ad97a1ca8a0a05427537479b8abd8f9
--- /dev/null
+++ b/Default Data/VACC/Bus.vacc
@@ -0,0 +1,23 @@
+c v,acc,dec
+c [km/h],[m/s²],[m/s²]
+0,1.01570922360353,-0.243137391053393
+5,1.38546581120225,-0.660815080435473
+10,1.34993329755465,-0.697805375020862
+15,1.21026714002479,-0.703434814668512
+20,1.08369598822194,-0.677703399378421
+25,0.960244171563553,-0.63631961226452
+30,0.830278494884728,-0.548894523516266
+35,0.705875078338323,-0.453995336940216
+40,0.61560012996407,-0.385460695652016
+45,0.54934680060935,-0.349181329186105
+50,0.506759643818294,-0.309125096967231
+55,0.475339640114064,-0.296716093796643
+60,0.443179073790072,-0.270229542673924
+65,0.402073380967498,-0.256408113084341
+70,0.354058549774571,-0.217808535739946
+75,0.307424130491395,-0.18609307386602
+80,0.26769036830267,-0.142683384645006
+85,0.223947186420069,-0.117950211164234
+90,0.198040479041662,-0.102997621205622
+95,0.182725799001603,-0.102997621205622
+100,0.180785716979631,-0.102997621205622
diff --git a/Default Data/VACC/Coach.vacc b/Default Data/VACC/Coach.vacc
new file mode 100644
index 0000000000000000000000000000000000000000..f8c8e4b3053516a0482938085f8f8a450fe3df99
--- /dev/null
+++ b/Default Data/VACC/Coach.vacc
@@ -0,0 +1,27 @@
+c v,acc,dec
+c [km/h],[m/s²],[m/s²]
+0,1.01570922360353,-0.231742702878269
+5,1.38546581120225,-0.45346198022574
+10,1.34993329755465,-0.565404125020508
+15,1.29026714002479,-0.703434814668512
+20,1.16369598822194,-0.677703399378421
+25,1.04024417156355,-0.63631961226452
+30,0.910278494884728,-0.548894523516266
+35,0.785875078338323,-0.453995336940216
+40,0.69560012996407,-0.385460695652016
+45,0.648984223443223,-0.349181329186105
+50,0.594249623931624,-0.309125096967231
+55,0.559156929181929,-0.296716093796643
+60,0.541508805860806,-0.270229542673924
+65,0.539582904761905,-0.256408113084341
+70,0.539103523809524,-0.217808535739946
+75,0.529581598997494,-0.18609307386602
+80,0.496418462064251,-0.142683384645006
+85,0.453932619248656,-0.117950211164234
+90,0.397824554210839,-0.102997621205622
+95,0.33969661577071,-0.102997621205622
+100,0.289428370365158,-0.102997621205622
+105,0.256471472751248,-0.102997621205622
+110,0.24,-0.102997621205622
+115,0.22,-0.102997621205622
+120,0.2,-0.102997621205622
diff --git a/Demo Data/40t Demo/Truck_Default.vacc b/Default Data/VACC/Truck.vacc
similarity index 92%
rename from Demo Data/40t Demo/Truck_Default.vacc
rename to Default Data/VACC/Truck.vacc
index ae4b968aa5f165dc63745546aaa9f6040e7f053f..079038386195388277fda926fd4b482c83897b8f 100644
--- a/Demo Data/40t Demo/Truck_Default.vacc
+++ b/Default Data/VACC/Truck.vacc
@@ -1,5 +1,5 @@
-c v,a_desmax,a_brake
-c [km/h],[m/s²],[m/s²]
+c v,acc,dec
+c [km/h],[m/s²],[m/s²]
0,1.01570922360353,-0.231742702878269
5,1.38546581120225,-0.414230217967212
10,1.34993329755465,-0.469050310026691
diff --git a/Demo Data/12t Demo/Declaration/Demo_CrosswindCorrection.vcdv b/Default Data/VCDV/Truck.vcdv
similarity index 100%
rename from Demo Data/12t Demo/Declaration/Demo_CrosswindCorrection.vcdv
rename to Default Data/VCDV/Truck.vcdv
diff --git a/Default Data/Cycles/Citybus_Heavy_Urban.vdri b/Default Data/VDRI/Citybus_Heavy_Urban.vdri
similarity index 100%
rename from Default Data/Cycles/Citybus_Heavy_Urban.vdri
rename to Default Data/VDRI/Citybus_Heavy_Urban.vdri
diff --git a/Default Data/Cycles/Citybus_Suburban.vdri b/Default Data/VDRI/Citybus_Suburban.vdri
similarity index 100%
rename from Default Data/Cycles/Citybus_Suburban.vdri
rename to Default Data/VDRI/Citybus_Suburban.vdri
diff --git a/Default Data/Cycles/Citybus_Urban.vdri b/Default Data/VDRI/Citybus_Urban.vdri
similarity index 100%
rename from Default Data/Cycles/Citybus_Urban.vdri
rename to Default Data/VDRI/Citybus_Urban.vdri
diff --git a/Default Data/Cycles/Coach.vdri b/Default Data/VDRI/Coach.vdri
similarity index 100%
rename from Default Data/Cycles/Coach.vdri
rename to Default Data/VDRI/Coach.vdri
diff --git a/Default Data/Cycles/Construction_Cycle.vdri b/Default Data/VDRI/Construction_Cycle.vdri
similarity index 100%
rename from Default Data/Cycles/Construction_Cycle.vdri
rename to Default Data/VDRI/Construction_Cycle.vdri
diff --git a/Default Data/Cycles/Interurban_Bus.vdri b/Default Data/VDRI/Interurban_Bus.vdri
similarity index 100%
rename from Default Data/Cycles/Interurban_Bus.vdri
rename to Default Data/VDRI/Interurban_Bus.vdri
diff --git a/Default Data/Cycles/Long_Haul.vdri b/Default Data/VDRI/Long_Haul.vdri
similarity index 100%
rename from Default Data/Cycles/Long_Haul.vdri
rename to Default Data/VDRI/Long_Haul.vdri
diff --git a/Default Data/Cycles/Municipal_Utility.vdri b/Default Data/VDRI/Municipal_Utility.vdri
similarity index 100%
rename from Default Data/Cycles/Municipal_Utility.vdri
rename to Default Data/VDRI/Municipal_Utility.vdri
diff --git a/Default Data/Cycles/Regional_Delivery.vdri b/Default Data/VDRI/Regional_Delivery.vdri
similarity index 100%
rename from Default Data/Cycles/Regional_Delivery.vdri
rename to Default Data/VDRI/Regional_Delivery.vdri
diff --git a/Default Data/Cycles/Urban_Delivery.vdri b/Default Data/VDRI/Urban_Delivery.vdri
similarity index 100%
rename from Default Data/Cycles/Urban_Delivery.vdri
rename to Default Data/VDRI/Urban_Delivery.vdri
diff --git a/Demo Data/12t Demo/Declaration/ACEA_RegionalDelivery_AuxDemo.vdri b/Demo Data/12t Demo/Declaration/ACEA_RegionalDelivery_AuxDemo.vdri
index 63eae8a53982807f4f21acc780fbd6abfe62bc5c..e26f83d09080110dde6630c5dff331aeb4bfdb8b 100644
--- a/Demo Data/12t Demo/Declaration/ACEA_RegionalDelivery_AuxDemo.vdri
+++ b/Demo Data/12t Demo/Declaration/ACEA_RegionalDelivery_AuxDemo.vdri
@@ -25835,4 +25835,4 @@ c [m],[km/h],[%],[s],[kW],[kW],[kW]
25833,40,0.484438915,0,0.5,2.376,2.97
25834,40,0.484438915,0,0.5,2.376,2.97
25835,40,0.484438915,0,0.5,2.376,2.97
-25836,0,0.484438915,0,0.5,2.376,2.97
+25836,0,0.484438915,2,0.5,2.376,2.97
diff --git a/Demo Data/12t Demo/Declaration/ACEA_UrbanDelivery_AuxDemo.vdri b/Demo Data/12t Demo/Declaration/ACEA_UrbanDelivery_AuxDemo.vdri
index 6afc0cc1e59719ed69357ed8a382f4fbf58a83d5..df9f0f8ae0470e371aae5030dfb5805b3347dca0 100644
--- a/Demo Data/12t Demo/Declaration/ACEA_UrbanDelivery_AuxDemo.vdri
+++ b/Demo Data/12t Demo/Declaration/ACEA_UrbanDelivery_AuxDemo.vdri
@@ -27816,4 +27816,4 @@ c [m],[km/h],[%],[s],[kW],[kW],[kW]
27813,51,0.450840618,0,0.5,2.376,2.97
27814,51,0.450840618,0,0.5,2.376,2.97
27815,51,0.450840618,0,0.5,2.376,2.97
-27816,0,0.450840618,0,0.5,2.376,2.97
+27816,0,0.450840618,2,0.5,2.376,2.97
diff --git a/Demo Data/12t Demo/Declaration/Demo.vacc b/Demo Data/12t Demo/Declaration/Demo.vacc
deleted file mode 100644
index 02699b0a38b1d4a2434b758d2fd221d52e79aabf..0000000000000000000000000000000000000000
--- a/Demo Data/12t Demo/Declaration/Demo.vacc
+++ /dev/null
@@ -1,13 +0,0 @@
-c v,a_desmax,a_brake
-c [km/h],[m/s²],[m/s²]
-0,4,-0.49
-10,3.625,-0.985299321
-20,3.25,-1.007016046
-30,2.875,-0.973245282
-40,2.5,-0.898828018
-50,2.4,-0.845186182
-60,2.3,-0.782065661
-70,2.2,-0.700634022
-80,2.1,-0.62182988
-90,2,-0.554912104
-100,2,-0.49
diff --git a/Demo Data/12t Demo/Declaration/Demo_Declaration.vecto b/Demo Data/12t Demo/Declaration/Demo_Declaration.vecto
index 775f7b3687d18694323bec07813e015334d99b2b..31705a4b5a5560ef53f29cd6e63a304c3b75825f 100644
--- a/Demo Data/12t Demo/Declaration/Demo_Declaration.vecto
+++ b/Demo Data/12t Demo/Declaration/Demo_Declaration.vecto
@@ -1,6 +1,6 @@
c VECTO Input File
-c VECTO 1.3
-c 02.05.2013 09:11:10
+c VECTO 1.4 RC1
+c 04.09.2013 14:05:57
c Vehicle (.vveh):
Demo_VehicleDeclaration.vveh
c Engine (.veng):
@@ -17,7 +17,7 @@ ALT,Alternator,..\Demo_AuxAlternator.vaux
DEMO,Demo,..\Demo_AuxDevice.vaux
<//>
c Speed Dependent Desired Acceleration and Braking (.vacc)
-Demo.vacc
+..\..\..\Default Data\VACC\Truck.vacc
c Engine Only Mode (1/0)
0
c ICE Auto-Start/Stop (1/0) - Non HEV only
@@ -42,3 +42,5 @@ c Allowed UnderSpeed [km/h]
5
c Minimum target speed for Look-Ahead with Coasting [km/h]
50
+c Start/Stop activation delay time [s]
+0
diff --git a/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh b/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh
index 040f307f9c8e1c3827bf23337f1c123a62341c28..0456dd030c98a93bbb781bb5508bfda032f45638 100644
--- a/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh
+++ b/Demo Data/12t Demo/Declaration/Demo_VehicleDeclaration.vveh
@@ -1,6 +1,6 @@
c VECTO Vehicle Input File
-c VECTO 1.0 Beta 1
-c 23.10.2012 17:36:07
+c VECTO 1.4 RC1
+c 04.09.2013 14:05:37
c Curb weight vehicle [kg]
7750
c Curb weight extra trailer/body [kg]
@@ -11,12 +11,12 @@ c Cd value [-]
0.6
c Cross sectional area [m^2]
8.8
-c Wheels equivalent rotational inertia [kg] (= I_wheel/rdyn^2)
+c Wheels inertia [kgm^2]
216
c Wheel effective diameter [m]
0.849
c Cd Mode, Input File
-1,Demo_CrosswindCorrection.vcdv
+1,..\..\..\Default Data\VCDV\Truck.vcdv
c Retarder Type (0=None, 1=Primary, 2=Secondary)
0
c Retarder Ratio
@@ -24,6 +24,7 @@ c Retarder Ratio
c Retarder File
<NOFILE>
c Axle configurations
+c Max. axle weight [kg], RRC [N/N]
6000,0.009
6000,0.009
<//>
diff --git a/Demo Data/12t Demo/Demo_Engine.veng b/Demo Data/12t Demo/Demo_Engine.veng
index d6baa5cd6c61969667300e8a31ff1dfa260f6453..3356ba7b1200685540b0f9d52060955ac524361b 100644
--- a/Demo Data/12t Demo/Demo_Engine.veng
+++ b/Demo Data/12t Demo/Demo_Engine.veng
@@ -1,6 +1,6 @@
c VECTO Engine Input File
-c VECTO 1.0 Beta 1
-c 23.10.2012 18:02:37
+c VECTO 1.4 RC1
+c 04.09.2013 14:06:31
c Make & Model
Demo Engine
c Rated power [kW]
@@ -13,8 +13,9 @@ c Idling speed [rpm]
600
c Inertia [kgm2]
2.8
-c Full load curve
-Demo_EngineFullload.vfld
+c Full load curves
+Demo_EngineFullload.vfld,0 - 99
+<//>
c Fuel map
Demo_EngineFcmap.vmap
c WHTC test results
diff --git a/Demo Data/12t Demo/Demo_Gearbox.vgbx b/Demo Data/12t Demo/Demo_Gearbox.vgbx
index 3a63ee4b5d55ca5f8fc6245ff6eed2fe5d9ae900..00a69d2078d27c14a5198b147824e78067b44979 100644
--- a/Demo Data/12t Demo/Demo_Gearbox.vgbx
+++ b/Demo Data/12t Demo/Demo_Gearbox.vgbx
@@ -1,47 +1,29 @@
c VECTO Gearbox Input File
-c VECTO 1.1 beta 3
-c 21.03.2013 09:49:47
+c VECTO 1.4 RC1
+c 04.09.2013 14:06:29
c Make & Model
Demo
c Gearbox rotational inertia [kgm2]
0
c Traction Interruption
1
-c Ratio [-], Loss Map or Efficiency
+c Gears (0=axle)
+c Ratio [-], Loss Map or Efficiency, Is TC gear
c Gear 0
-4.3,0.96
+4.3,0.96,0
c Gear 1
-6.696,0.96
+6.696,0.96,0
c Gear 2
-3.806,0.96
+3.806,0.96,0
c Gear 3
-2.289,0.96
+2.289,0.96,0
c Gear 4
-1.48,0.96
+1.48,0.96,0
c Gear 5
-1,0.98
+1,0.98,0
c Gear 6
-0.728,0.96
-c Gear 7
-0,<NOFILE>
-c Gear 8
-0,<NOFILE>
-c Gear 9
-0,<NOFILE>
-c Gear 10
-0,<NOFILE>
-c Gear 11
-0,<NOFILE>
-c Gear 12
-0,<NOFILE>
-c Gear 13
-0,<NOFILE>
-c Gear 14
-0,<NOFILE>
-c Gear 15
-0,<NOFILE>
-c Gear 16
-0,<NOFILE>
+0.728,0.96,0
+<//>
c Gear shift polygons file
ShiftPolygons.vgbs
c Torque Reserve [%]
diff --git a/Demo Data/12t Demo/ProofOfConcept/Demo_ChassisDyno.vecto b/Demo Data/12t Demo/ProofOfConcept/Demo_ChassisDyno.vecto
index cf632cf7ceae9c2d2aa3f31da91c32bbdfd1c466..7f049cd0d38c81a6dece7bb4891501cb73c0edca 100644
--- a/Demo Data/12t Demo/ProofOfConcept/Demo_ChassisDyno.vecto
+++ b/Demo Data/12t Demo/ProofOfConcept/Demo_ChassisDyno.vecto
@@ -1,6 +1,6 @@
c VECTO Input File
-c VECTO 1.3
-c 30.04.2013 16:49:03
+c VECTO 1.4 RC1
+c 04.09.2013 14:06:18
c Vehicle (.vveh):
Demo_Vehicle_ChassisDyno.vveh
c Engine (.veng):
@@ -41,3 +41,5 @@ c Allowed UnderSpeed [km/h]
0
c Minimum target speed for Look-Ahead with Coasting [km/h]
50
+c Start/Stop activation delay time [s]
+0
diff --git a/Demo Data/12t Demo/ProofOfConcept/Demo_TestTrackCycle.vecto b/Demo Data/12t Demo/ProofOfConcept/Demo_TestTrackCycle.vecto
index 2b0049b313368263ecfa1857f3ae94544af40248..0b1feb5a3954217e28d6201d0944b3cc43985090 100644
--- a/Demo Data/12t Demo/ProofOfConcept/Demo_TestTrackCycle.vecto
+++ b/Demo Data/12t Demo/ProofOfConcept/Demo_TestTrackCycle.vecto
@@ -1,6 +1,6 @@
c VECTO Input File
-c VECTO 1.3
-c 30.04.2013 14:52:04
+c VECTO 1.4 RC1
+c 04.09.2013 14:06:33
c Vehicle (.vveh):
Demo_Vehicle_TestTrack.vveh
c Engine (.veng):
@@ -39,3 +39,5 @@ c Allowed UnderSpeed [km/h]
0
c Minimum target speed for Look-Ahead with Coasting [km/h]
50
+c Start/Stop activation delay time [s]
+0
diff --git a/Demo Data/12t Demo/ProofOfConcept/Dummy.vacc b/Demo Data/12t Demo/ProofOfConcept/Dummy.vacc
index 4d9642b8d0ae3530dd092304cebeb5cedbfb7190..cb8174bab86dd0ded89ff8c58ab75c7a3d828e83 100644
--- a/Demo Data/12t Demo/ProofOfConcept/Dummy.vacc
+++ b/Demo Data/12t Demo/ProofOfConcept/Dummy.vacc
@@ -1,4 +1,4 @@
c v,a_desmax,a_brake
c [km/h],[m/s²],[m/s²]
-0,10,-10
-1000,10,-10
\ No newline at end of file
+0,100,-100
+1000,100,-100
\ No newline at end of file
diff --git a/Demo Data/40t Demo/Demo_CrosswindCorrection.vcdv b/Demo Data/40t Demo/Demo_CrosswindCorrection.vcdv
deleted file mode 100644
index 22cb214f24887aa7f40fe946a95fad3d58ee0341..0000000000000000000000000000000000000000
--- a/Demo Data/40t Demo/Demo_CrosswindCorrection.vcdv
+++ /dev/null
@@ -1,26 +0,0 @@
-c Demo data
-c Cross-wind sensitivity for rigid vehicle (Mitschke)
-c average cross wind: 3m/s
-c v_veh,cdx_rel
-c [km/h],[-]
-0,1.09879105165478
-5,1.09879105165478
-10,1.09879105165478
-15,1.09879105165478
-20,1.09879105165478
-25,1.09879105165478
-30,1.09879105165478
-35,1.09879105165478
-40,1.09879105165478
-45,1.09879105165478
-50,1.09879105165478
-55,1.09879105165478
-60,1.09879105165478
-65,1.08880328691127
-70,1.08053379303156
-75,1.07361197884146
-80,1.06774118921044
-85,1.0627044915251
-90,1.05833988168619
-95,1.05452412535638
-100,1.05116194011008
diff --git a/Demo Data/40t Demo/VehClass5_40t.veng b/Demo Data/40t Demo/VehClass5_40t.veng
index fd7b1a9828ea6b0ab29b99d0d35a59caef73b131..c247e96dd7bb94fd58c734933071ffa269fa6bf7 100644
--- a/Demo Data/40t Demo/VehClass5_40t.veng
+++ b/Demo Data/40t Demo/VehClass5_40t.veng
@@ -1,6 +1,6 @@
c VECTO Engine Input File
-c VECTO 1.2
-c 23.04.2013 14:06:21
+c VECTO 1.4 RC1
+c 04.09.2013 14:06:37
c Make & Model
Demo engine
c Rated power [kW]
@@ -13,8 +13,9 @@ c Idling speed [rpm]
620
c Inertia [kgm2]
3.8
-c Full load curve
-VehClass5_40t.vfld
+c Full load curves
+VehClass5_40t.vfld,0 - 99
+<//>
c Fuel map
VehClass5_40t.vmap
c WHTC test results
diff --git a/Demo Data/40t Demo/VehClass5_40t.vgbx b/Demo Data/40t Demo/VehClass5_40t.vgbx
index 1a1d13dc85af2dcba5a0f13ddf06e626e98526ee..097ff0a2b6828ef5f2fcd216cdc94e7839451f94 100644
--- a/Demo Data/40t Demo/VehClass5_40t.vgbx
+++ b/Demo Data/40t Demo/VehClass5_40t.vgbx
@@ -1,47 +1,41 @@
c VECTO Gearbox Input File
-c VECTO 1.2
-c 23.04.2013 13:55:37
+c VECTO 1.4 RC1
+c 04.09.2013 14:06:39
c Make & Model
Demo Gearbox Long Haul
c Gearbox rotational inertia [kgm2]
0
c Traction Interruption
0.8
-c Ratio [-], Loss Map or Efficiency
+c Gears (0=axle)
+c Ratio [-], Loss Map or Efficiency, Is TC gear
c Gear 0
-3.066,0.97
+3.066,0.97,0
c Gear 1
-14.93,0.96
+14.93,0.96,0
c Gear 2
-11.64,0.96
+11.64,0.96,0
c Gear 3
-9.02,0.96
+9.02,0.96,0
c Gear 4
-7.04,0.96
+7.04,0.96,0
c Gear 5
-5.64,0.96
+5.64,0.96,0
c Gear 6
-4.4,0.96
+4.4,0.96,0
c Gear 7
-3.39,0.96
+3.39,0.96,0
c Gear 8
-2.65,0.96
+2.65,0.96,0
c Gear 9
-2.05,0.96
+2.05,0.96,0
c Gear 10
-1.6,0.96
+1.6,0.96,0
c Gear 11
-1.28,0.96
+1.28,0.96,0
c Gear 12
-1,0.98
-c Gear 13
-0,<NOFILE>
-c Gear 14
-0,<NOFILE>
-c Gear 15
-0,<NOFILE>
-c Gear 16
-0,<NOFILE>
+1,0.98,0
+<//>
c Gear shift polygons file
VehClass5_40t.vgbs
c Torque Reserve [%]
diff --git a/Demo Data/40t Demo/VehClass5_40t.vveh b/Demo Data/40t Demo/VehClass5_40t.vveh
index af6e268e91b9843524be61c60e6d6c8c2f6902a4..f10e472cf995675fc3f75c3c3bef0c3f800f789a 100644
--- a/Demo Data/40t Demo/VehClass5_40t.vveh
+++ b/Demo Data/40t Demo/VehClass5_40t.vveh
@@ -1,6 +1,6 @@
c VECTO Vehicle Input File
-c VECTO 1.2
-c 23.04.2013 14:06:11
+c VECTO 1.4 RC1
+c 04.09.2013 14:13:21
c Curb weight vehicle [kg]
14000
c Curb weight extra trailer/body [kg]
@@ -16,7 +16,7 @@ c Wheels inertia [kgm^2]
c Wheel effective diameter [m]
0.975
c Cd Mode, Input File
-1,Demo_CrosswindCorrection.vcdv
+1,..\..\Default Data\VCDV\Truck.vcdv
c Retarder Type (0=None, 1=Primary, 2=Secondary)
0
c Retarder Ratio
diff --git a/Demo Data/40t Demo/VehClass5_40t_LongHaul.vecto b/Demo Data/40t Demo/VehClass5_40t_LongHaul.vecto
index a700f6d0c036535251ced670ea4afb851df3c90c..0ddead0a5116e92a9cc913a32639476988b38a00 100644
--- a/Demo Data/40t Demo/VehClass5_40t_LongHaul.vecto
+++ b/Demo Data/40t Demo/VehClass5_40t_LongHaul.vecto
@@ -1,6 +1,6 @@
c VECTO Input File
-c VECTO 1.3
-c 30.04.2013 16:49:20
+c VECTO 1.4 RC1
+c 04.09.2013 14:12:01
c Vehicle (.vveh):
VehClass5_40t.vveh
c Engine (.veng):
@@ -14,7 +14,7 @@ c Auxiliaries (.vaux)
ALT,Alternator,Demo_AuxAlternator.vaux
<//>
c Speed Dependent Desired Acceleration and Braking (.vacc)
-Truck_Default.vacc
+..\..\Default Data\VACC\Truck.vacc
c Engine Only Mode (1/0)
0
c ICE Auto-Start/Stop (1/0) - Non HEV only
@@ -39,3 +39,5 @@ c Allowed UnderSpeed [km/h]
0
c Minimum target speed for Look-Ahead with Coasting [km/h]
50
+c Start/Stop activation delay time [s]
+0
diff --git a/Demo Data/Cycles/20120815_acea_long_haul_1m_DemoAux.vdri b/Demo Data/Cycles/20120815_acea_long_haul_1m_DemoAux.vdri
index ec771025d49446cca19dcdcaeb9bc7a4031d5b4c..9ae33518edbacf3d1da721828e4d05d9cfc6ff7d 100644
--- a/Demo Data/Cycles/20120815_acea_long_haul_1m_DemoAux.vdri
+++ b/Demo Data/Cycles/20120815_acea_long_haul_1m_DemoAux.vdri
@@ -1,6 +1,6 @@
<s>,<v>,<grad>,<stop>,<Aux_Alt>,<Padd>
c [m],[km/h],[%],[s],[kW],[kW]
-0,0,2.95016969,0,0.5,1.3
+0,0,2.95016969,2,0.5,1.3
1,60,2.95016969,0,0.5,1.3
2,60,2.95016969,0,0.5,1.3
3,60,2.95016969,0,0.5,1.3
@@ -108191,4 +108191,4 @@ c [m],[km/h],[%],[s],[kW],[kW]
108188,60,-2.982225506,0,0.5,1.3
108189,60,-2.982225506,0,0.5,1.3
108190,60,-2.982225506,0,0.5,1.3
-108191,0,-2.982225506,0,0.5,1.3
+108191,0,-2.982225506,2,0.5,1.3
diff --git a/User Manual Source/Update Notes.pptx b/User Manual Source/Update Notes.pptx
index c6e41166443fc97810a29e340df9235839273d9d..8ea1319541c6d8a9cbd9878db111f851453d9ff4 100644
Binary files a/User Manual Source/Update Notes.pptx and b/User Manual Source/Update Notes.pptx differ
diff --git a/VECTO/ADVANCE/cADV.vb b/VECTO/ADVANCE/cADV.vb
deleted file mode 100644
index 5098ac7718bc68060c195560d9a7d4f868bfe14e..0000000000000000000000000000000000000000
--- a/VECTO/ADVANCE/cADV.vb
+++ /dev/null
@@ -1,216 +0,0 @@
-Imports System.Collections.Generic
-
-Public Class cADV
-
- Private sFilePath As String
-
- Private MyPath As String
-
- Private fFZPpath As cSubPath
- Private fFLTpath As cSubPath
- Private fTEMpath As cSubPath
- Private fSTRpaths As List(Of cSubPath)
- Public SD3out As Boolean
- Public STRfilter As Boolean
- Public STRSUMdistflt As Single
- Public RndSeed As Short
-
-
- Public Sub New()
-
- sFilePath = ""
- MyPath = ""
-
- fFZPpath = New cSubPath
- fFLTpath = New cSubPath
- fTEMpath = New cSubPath
- fSTRpaths = New List(Of cSubPath)
-
- End Sub
-
- Public Function ReadFile() As Boolean
- Dim file As cFile_V3
- Dim SubPath As cSubPath
-
- If sFilePath = "" Then Return False
- If Not IO.File.Exists(sFilePath) Then Return False
-
- file = New cFile_V3
-
- SetDefault()
-
- If Not file.OpenRead(sFilePath) Then
- file = Nothing
- Return False
- End If
-
-
- fFZPpath.Init(MyPath, file.ReadLine(0))
-
- fFLTpath.Init(MyPath, file.ReadLine(0))
-
- fTEMpath.Init(MyPath, file.ReadLine(0))
-
- RndSeed = CShort(file.ReadLine(0))
-
- SD3out = CBool(file.ReadLine(0))
-
- STRfilter = CBool(file.ReadLine(0))
-
- STRSUMdistflt = CSng(file.ReadLine(0))
-
- Do While Not file.EndOfFile
- SubPath = New cSubPath
- SubPath.Init(MyPath, file.ReadLine(0))
- fSTRpaths.Add(SubPath)
- Loop
-
-
-lbClose:
-
- file.Close()
- file = Nothing
-
- Return True
-
- End Function
-
- Public Function SaveFile() As Boolean
- Dim fADV As New cFile_V3
- Dim SubPath As cSubPath
-
- If Not fADV.OpenWrite(sFilePath) Then Return False
-
- 'Line 1: FZP file
- fADV.WriteLine(fFZPpath.PathOrDummy)
-
- 'Line 2: FLT file
- fADV.WriteLine(fFLTpath.PathOrDummy)
-
- 'Line 3: TEM file
- fADV.WriteLine(fTEMpath.PathOrDummy)
-
- 'Line 4: RndSeed
- fADV.WriteLine(RndSeed.ToString)
-
- 'Line 5: MISKAMout True/False|
- fADV.WriteLine(Math.Abs(CInt(SD3out)))
-
- 'Line 6: STRfilter True/False
- fADV.WriteLine(Math.Abs(CInt(STRfilter)))
-
- 'Line 7: Distance filters for SUM.STR
- fADV.WriteLine(STRSUMdistflt.ToString)
-
- 'Line 8 +: STR files
- For Each SubPath In fSTRpaths
- fADV.WriteLine(SubPath.PathOrDummy)
- Next
-
- fADV.Close()
- fADV = Nothing
-
- Return True
-
- End Function
-
- Private Sub SetDefault()
-
- SD3out = False
- STRfilter = False
- STRSUMdistflt = 85
- RndSeed = 0
-
- STRpathsClear()
-
- End Sub
-
- Public Property FilePath() As String
- Get
- Return sFilePath
- End Get
- Set(ByVal value As String)
- sFilePath = value
- MyPath = IO.Path.GetDirectoryName(sFilePath) & "\"
- End Set
- End Property
-
- Public Property FZPpath(Optional ByVal Original As Boolean = False) As String
- Get
- If Original Then
- Return fFZPpath.OriginalPath
- Else
- Return fFZPpath.FullPath
- End If
- End Get
- Set(ByVal value As String)
- fFZPpath.Init(MyPath, value)
- End Set
- End Property
-
- Public Property FLTpath(Optional ByVal Original As Boolean = False) As String
- Get
- If Original Then
- Return fFLTpath.OriginalPath
- Else
- Return fFLTpath.FullPath
- End If
- End Get
- Set(ByVal value As String)
- fFLTpath.Init(MyPath, value)
- End Set
- End Property
-
- Public Property TEMpath(Optional ByVal Original As Boolean = False) As String
- Get
- If Original Then
- Return fTEMpath.OriginalPath
- Else
- Return fTEMpath.FullPath
- End If
- End Get
- Set(ByVal value As String)
- fTEMpath.Init(MyPath, value)
- End Set
- End Property
-
-#Region "STR-Dateien"
- Public ReadOnly Property STRpaths(ByVal index As Short, Optional ByVal Original As Boolean = False) As String
- Get
- If Original Then
- Return fSTRpaths(index).OriginalPath
- Else
- Return fSTRpaths(index).FullPath
- End If
- End Get
- End Property
-
- Public Sub STRpathsAdd(ByVal path As String)
- Dim SubPath As cSubPath
-
- SubPath = New cSubPath
-
- SubPath.Init(MyPath, path)
-
- fSTRpaths.Add(SubPath)
-
- End Sub
-
- Public Sub STRpathsClear()
- fSTRpaths.Clear()
- End Sub
-
- Public ReadOnly Property STRcount As Integer
- Get
- Return fSTRpaths.Count
- End Get
- End Property
-
-#End Region
-
-
-
-
-
-
-End Class
diff --git a/VECTO/ADVANCE/cADVANCE.vb b/VECTO/ADVANCE/cADVANCE.vb
deleted file mode 100644
index 7b03cbaf3b8e2f852ee5756b23fa2bfe4d28f96b..0000000000000000000000000000000000000000
--- a/VECTO/ADVANCE/cADVANCE.vb
+++ /dev/null
@@ -1,2437 +0,0 @@
-Imports System.Collections.Generic
-
-Public Class cADVANCE_V3
-
- Public FadvSUM As System.IO.StreamWriter
- Public RndSeed As Int16
- Public MISKAMout As Boolean
-
- Public ADVANCEdone As Boolean
-
- 'TEM (TODO)
- Public ADVkalt As Boolean
- Public ADVtkw As Single
- Public ADVtkat As Single
- Public vtumg As Single
-
- 'ADV
- Private FLTpath As String
- Private TEMpath As String
- Private STRfilter As Boolean
- Private STRroute As Boolean
-
- 'FLT-Collection
- Private FLTfleet As Dictionary(Of String, cFLTfleet)
-
- Public iadvance As Integer
- Public aVehNr As Int32
- Public aVehType As String
- Public aWorldX As List(Of Single)
- Public aWorldY As List(Of Single)
- Public aStrId As List(Of Int32)
-
-
- Private EMlist As List(Of String)
- Private EMdim As Integer
-
- Private AusgVisInit As Boolean
-
-
-#Region "FZP Variablen"
- Private FZPpath As String
- Private FZPlen As Int32
- Private FZPsortPath As String
- Private vt() As Int32 '<< Bei Int16: musste Sim-Zeit unter 32767s (~9h) sein => Bei Kreisverkehr-Projekt zu wenig!
- Private t0 As Int32
- Private vX() As Single
- Private vY() As Single
- Private vNr() As Int32 '<< Int16 zu klein (EkoZara: vNr's bis ~ 48000). Möglich wäre allerdings Int16 von -32767 bis +32767 verwenden d.h. Max = 65534
- Private vNrSub() As Int16 '<< Evtl. weghaun...?
- Private vVm() As Single
- Private vStg() As Single
- Private vID() As Int16
- Private vSID() As Int32 '<< Int16 zu klein. (Int16 mit negativem Bereich (2*32767) wahrscheinlich auch noch zu klein)
- Private FZProwT As Int16 = 0
- Private FZProwWeltX As Int16 = 1
- Private FZProwWeltY As Int16 = 2
- Private FZProwFzNr As Int16 = 3
- Private FZProwV As Int16 = 4
- Private FZProwSteig As Int16 = 5
- Private FZProwTyp As Int16 = 6
- Private FZProwStr As Int16 = 7
-#End Region
-
-#Region "STR Variablen"
-
- Private sSIDdim As Int16
- Private STRpaths As List(Of String) 'Liste der STR-Dateien
- Private sSIDlist As List(Of Int32) 'Streckennummer-Liste, aufsteigend sortiert, keine Duplikate
- Private sSIDfiles As List(Of Int32) 'Dateinummern, gleich sortiert wie sSIDlist
-
- 'Felder für Streckennummer, Spur und Koordinaten für alle STR-Dateien |@@| Fields for Route-number, Track and Coordinates for all STR files
- Private STRlen As Int32
- Private sStr As List(Of Int32)
- Private sSp As List(Of Int16)
- Private sSegAnX As List(Of Single)
- Private sSegEnX As List(Of Single)
- Private sSegAnY As List(Of Single)
- Private sSegEnY As List(Of Single)
-
- 'STR.SUM
- Private STRerg As List(Of cSTRerg)
- Private STRdistTol As Single
-
-
-#End Region
-
-#Region "SD3 Variablen"
- Private SD3path As String
- Private sFC() As Single
- Private sNOx() As Single
- Private sCO() As Single
- Private sHC() As Single
- Private sPM() As Single
- Private sBe() As Single
- Private sRu() As Single
- Private sSO2() As Single
- Private ala() As Single
- Private vDTV() As Single
- Private ALKW() As Single
-#End Region
-
-
- 'Calculation
- Private zFZP As Int32 'Globale FZP-Zeile
- Private LastGen As String 'Letzte .gen-Datei
- Private VehStrAlt As String 'VehStr = Fahrzeug ID: bestehend aus Fahrzeugnummer (aus VISSIM) und SubNr um Zeitlücken zu korrigieren
- Private vNrAlt As Int32
- Private fzpL10 As Int32
- Private fzpL As Int32
-
- Private SUMpath As String
-
- 'ADVANCE initialization
- Public Function ADVANCE_V2_Init() As Boolean
-
- Dim msgtext As String
- Dim FZPs As Boolean
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Init"
-
- AusgVisInit = False
- ADVANCEdone = False
- FZPs = Cfg.FZPsort
-
- 'Read ADV-File
- If Not ADVread() Then Return False
-
- 'Check whether FLT is available
- If Not IO.File.Exists(FLTpath) Then
- WorkerMsg(tMsgID.Err, "Fleet composition file not found! (" & FLTpath & ")", MsgSrc)
- Return False
- End If
-
- 'Check whether FZP is sorted
- If FZPs And Cfg.FZPsortExp Then
- If STRfilter Then
- FZPsortPath = IO.Path.GetDirectoryName(FZPpath) & "\" & IO.Path.GetFileNameWithoutExtension(FZPpath) & "_" & IO.Path.GetFileNameWithoutExtension(STRpaths(0)) & ".sfzp"
- Else
- FZPsortPath = IO.Path.GetDirectoryName(FZPpath) & "\" & IO.Path.GetFileNameWithoutExtension(FZPpath) & ".sorted" & fEXT(FZPpath)
- End If
- If IO.File.Exists(FZPsortPath) Then
- msgtext = "File '" & IO.Path.GetFileName(FZPsortPath).ToString & "' already exists!"
- Select Case F_ADVfzp.Answer(msgtext)
- Case 0
- WorkerMsg(tMsgID.Warn, "New Traffic Data path: " & FZPsortPath, MsgSrc)
- WorkerMsg(tMsgID.Warn, "Traffic Data Sort/Export temporarily disabled.", MsgSrc)
- FZPpath = FZPsortPath
- FZPs = False
- Case 1
- 'GO!
- Case 2
- ADVANCEdone = True
- Return True
- End Select
- End If
- End If
-
- 'FLT einlesen (muss vor STR sein wegen cSTRerg) |@@| Read FLT (must be done before STR because of cSTRerg)
- If Not FLTread() Then Return False
-
- If Not FLTcheck() Then Return False
-
- 'Create EMlist
- EMlist = New List(Of String)
-
- If EVcheck() Then
- EMlist.Add("\\EC")
- Else
- EMlist.Add(sKey.MAP.FC)
- EMlist.Add(sKey.MAP.NOx)
- EMlist.Add(sKey.MAP.CO)
- EMlist.Add(sKey.MAP.HC)
- EMlist.Add(sKey.MAP.PM)
- EMlist.Add(sKey.MAP.PN)
- EMlist.Add(sKey.MAP.NO)
- End If
-
- EMdim = EMlist.Count - 1
-
-
-
- 'STR read
- If STRfilter Then
-
- If Not STRread() Then Return False
-
- SD3path = fFileWoExt(JobFile) & ".sd3" 'fPATH(JobFile) & fFILE(JobFile, False) & ".sd3"
- If MISKAMout Then
- ReDim sFC(STRlen)
- ReDim sNOx(STRlen)
- ReDim sCO(STRlen)
- ReDim sHC(STRlen)
- ReDim sPM(STRlen)
- ReDim sBe(STRlen)
- ReDim sRu(STRlen)
- ReDim sSO2(STRlen)
- ReDim ala(STRlen)
- ReDim vDTV(STRlen)
- ReDim ALKW(STRlen)
- End If
- End If
-
- 'Create Lists
- aWorldX = New List(Of Single)
- aWorldY = New List(Of Single)
- aStrId = New List(Of Int32)
-
- 'Read FZP
- If Not FZPread() Then Return False
- If PHEMworker.CancellationPending Then Return True
-
- 'FZP sort (and export)
- If FZPs Then
- ProgBarCtrl.ProgJobInt = 0
- FZPsortieren()
- If Cfg.FZPsortExp Then
- If Not FZPexport() Then Return False
- End If
- If PHEMworker.CancellationPending Then Return True
- End If
-
- 'FZP Check
- FZPcheck()
-
- 'TEM (TODO)
- ADVkalt = False
-
- 'Random-Init
- Rnd(-1)
- Randomize(RndSeed)
-
- 'For Output-Vis
- iadvance = FZPlen
-
- 'Dump-initialization
-
- ' Filename
- SUMpath = fFileWoExt(JobFile) & ".vehicle.sum" 'fPATH(JobFile) & fFILE(JobFile, False) & ".sum"
-
- ' Dump Modal
- If Cfg.ModOut Then
- If Not AusgMOD_Init() Then Return False
- End If
-
- 'Start-values
- zFZP = 0
- VehStrAlt = vNr(1) & "_" & vNrSub(1)
- vNrAlt = -1
- LastGen = ""
- fzpL10 = Math.Max(FZPlen / 100, 1000)
- fzpL = 0
- ProgBarCtrl.ProgJobInt = 0
- WorkerMsg(tMsgID.Normal, "Calculation running... ", MsgSrc)
-
- Return True
-
- End Function
-
- 'ADVANCE memory release
- Public Sub ADVANCE_V2_Close()
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Close"
-
- ProgBarCtrl.ProgJobInt = 0
-
- WorkerMsg(tMsgID.Normal, "Finalizing... ", MsgSrc)
-
- 'Dump
- AusgVis_V3_Close()
-
- 'Free memory
- vt = Nothing 'ReDim vt(-1)
- vX = Nothing
- vY = Nothing
- vNr = Nothing
- vNrSub = Nothing
- vVm = Nothing
- vStg = Nothing
- vID = Nothing
- vSID = Nothing
- sStr = Nothing
- sSIDlist = Nothing
- sSIDfiles = Nothing
- sSp = Nothing
- sSegAnX = Nothing
- sSegEnX = Nothing
- sSegAnY = Nothing
- sSegEnY = Nothing
- 'ReDim vX(-1)
- 'ReDim vY(-1)
- 'ReDim vNr(-1)
- 'ReDim vNrSub(-1)
- 'ReDim vVm(-1)
- 'ReDim vStg(-1)
- 'ReDim vID(-1)
- 'ReDim vSID(-1)
- 'ReDim sStr(-1)
- 'ReDim sSIDlist(-1)
- 'ReDim sSp(-1)
- 'ReDim sSegAnX(-1)
- 'ReDim sSegEnX(-1)
- 'ReDim sSegAnY(-1)
- 'ReDim sSegEnY(-1)
- FLTfleet = Nothing 'ReDim FLTfleet(-1)
- If MISKAMout Then
- sFC = Nothing
- sNOx = Nothing
- sCO = Nothing
- sHC = Nothing
- sPM = Nothing
- sBe = Nothing
- sRu = Nothing
- sSO2 = Nothing
- ala = Nothing
- vDTV = Nothing
- ALKW = Nothing
- 'ReDim sFC(-1)
- 'ReDim sNOx(-1)
- 'ReDim sCO(-1)
- 'ReDim sHC(-1)
- 'ReDim sPM(-1)
- 'ReDim sBe(-1)
- 'ReDim sRu(-1)
- 'ReDim sSO2(-1)
- 'ReDim ala(-1)
- 'ReDim vDTV(-1)
- 'ReDim ALKW(-1)
- End If
- iadvance = 0
-
- 'Delete Lists
- aWorldX = Nothing
- aWorldY = Nothing
- aStrId = Nothing
-
- AusgVisInit = False
-
- 'Garbage Collection - Soll "System Out of Memory" Exception verhindern (tut's aber nicht!) |@@| Garbage Collection - If "System Out of Memory" Exception prevents it (but does not do it!)
- GC.Collect()
-
-
- End Sub
-
- 'ADVANCE Vehicle calculation
- Public Function ADVANCE_V2_Next() As Boolean
-
- Dim VehStr As String
- Dim vNrAkt As Int32
- Dim vIDi As Int16
- Dim z As Int32
- Dim vList As System.Collections.Generic.List(Of Double)
- Dim stgList As System.Collections.Generic.List(Of Double)
- Dim MsgSrc As String
-
- MsgSrc = "ADV"
-
-lbStart:
-
- 'Check whether finished
- If zFZP = FZPlen Then
- ADVANCEdone = True
- WorkerMsg(tMsgID.Normal, "Calculation done", MsgSrc)
- Return True
- End If
-
- 'Initialize Cycle-class
- DRI = New cDRI
- DRI.ADVinit()
- vList = DRI.Values(tDriComp.V)
- stgList = DRI.Values(tDriComp.Grad)
-
- 'Fahzeugnummer und Typ definieren (bleibt hier konstant) |@@| Vehicle-number and Type definition (here remains constant)
- ' Old Vehicle is VehStrAlt, New is VehStr
- vNrAkt = vNr(zFZP + 1)
- vIDi = vID(zFZP + 1)
- VehStr = vNr(zFZP + 1) & "_" & vNrSub(zFZP + 1)
-
- 'Create Lists
- aWorldX.Clear()
- aWorldY.Clear()
- aStrId.Clear()
-
- 't0
- DRI.t0 = vt(zFZP + 1)
-
- 'Define Fields for Vehicle-calculations
- z = -1
- Do
- 'Check whether it is a new Vehicle
- If VehStr <> vNr(zFZP + 1) & "_" & vNrSub(zFZP + 1) Then Exit Do
- z += 1
- zFZP += 1
-
- 'General(Allgemeiner) Vehicle-Cycle
- vList.Add(vVm(zFZP) / 3.6)
- stgList.Add(vStg(zFZP))
-
- 'ADVANCE
- ' Strecken-Auswertung (MISKAM) |@@| Road-Distance evaluation (MISKAM)
- aWorldX.Add(vX(zFZP))
- aWorldY.Add(vY(zFZP))
- aStrId.Add(vSID(zFZP))
-
- fzpL += 1
- If fzpL = fzpL10 Then
- ''StatusMSG(7, "Calculation running... " & CInt(zFZP / FZPlen * 100).ToString("00") & "%", False)
- ProgBarCtrl.ProgJobInt = zFZP / FZPlen * 100
- fzpL = 0
- End If
-
- Loop Until zFZP = FZPlen
-
- ' Vehicle identification
- aVehNr = vNrAkt
- aVehType = CStr(vIDi)
-
- 'Check whether Cycle too short => skip
- If z < 1 Then GoTo lbStart
-
- 'Increase number of Vehicles per each Type
- FLTfleet(aVehType).VehCount += 1
-
- DRI.tDim = z
-
- 'Check whethert last GEN-file to use is new, otherwise occupied(Belegung ) by FLT
- If vNrAlt = vNrAkt Then
- GenFile = LastGen
- Else
- Try
- GenFile = FLTfleet(key:=CStr(vIDi)).GetGenFile
- If GenFile = "" Then Return False
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, vIDi & " is no valid vehicle type!", MsgSrc)
- Return False
- End Try
- End If
-
- 'VehStr is now ALT
- VehStrAlt = VehStr
- vNrAlt = vNrAkt
- LastGen = GenFile
-
- Return True
-
- End Function
-
- 'Section by section calculation
- Public Sub STRcalc()
- Dim t As Integer
- Dim STR0 As Integer
- Dim STR1 As Integer
- Dim t0 As Integer
- Dim dist0 As Double
- Dim time0 As Single
- Dim STRergRef As cSTRerg
- Dim e As Integer
- Dim EMsum() As Double
-
- If Not STRfilter Then Exit Sub
-
- STR0 = -1
- t0 = -1
- dist0 = 0
- time0 = 0
- ReDim EMsum(EMdim)
-
- 'Zyklus durchschleifen |@@| through Cycle-loop
- For t = 0 To MODdata.tDim
-
- 'No. of STR-file
- STR1 = getSTRfileNr(aStrId(t))
-
- 'If STR-No has changed:
- ' Finish with Old STR-No.
- If STR0 <> STR1 Then
-
- If t0 > -1 Then ' STR0 > -1 Then
-
- STRergRef = STRerg(STR0)
-
- If dist0 >= STRdistTol * STRergRef.Distance Then
-
- 'Distance (km driven)
- STRergRef.VehDist(aVehType) += dist0
-
- 'Travel-Time in h
- STRergRef.VehTime(aVehType) += time0 / 3600
-
- 'Vehicle(KFZ) No.
- STRergRef.VehCount(aVehType) += 1
-
- 'Cumulative emissions
- For e = 0 To EMdim
- STRergRef.EMsum(aVehType)(e) += EMsum(e) / 3600
- Next
-
- End If
-
- End If
-
- t0 = t
- STR0 = STR1
- dist0 = 0
- time0 = 0
- For e = 0 To EMdim
- EMsum(e) = 0
- Next
-
- End If
-
- 'Add up
- dist0 += MODdata.Vh.V(t) / 1000
- time0 += 1
- If GEN.VehMode = tVehMode.EV Then
- EMsum(0) += MODdata.Px.PiBat(t)
- Else
- For e = 0 To EMdim
- EMsum(e) += Math.Max(MODdata.Em.EmComp(EMlist(e)).FinalVals(t), 0)
- Next
- End If
-
-
- Next
-
- 'Last STR completed
- If t0 > -1 Then
-
- STRergRef = STRerg(STR0)
-
- If dist0 >= STRdistTol * STRergRef.Distance Then
-
- 'Distance (km driven)
- STRergRef.VehDist(aVehType) += dist0
-
- 'Time in h
- STRergRef.VehTime(aVehType) += time0 / 3600
-
- 'Vehicle(KFZ) No.
- STRergRef.VehCount(aVehType) += 1
-
- 'Cumulative emissions
- For e = 0 To EMdim
- STRergRef.EMsum(aVehType)(e) += EMsum(e) / 3600
- Next
-
- End If
-
- End If
-
-
-
-
- End Sub
-
- Private Function getSTRfileNr(ByVal SID As Integer) As Integer
- Dim x As Integer
- For x = 0 To sSIDdim
- If sSIDlist(x) = SID Then Return sSIDfiles(x)
- Next
- Return -1
- End Function
-
- 'Read FLT
- Private Function FLTread() As Boolean
-
- Dim fFLT As cFile_V3
- Dim ArP() As Single
- Dim ArGen() As String
- Dim FLTdim As Int16
- Dim IDstr As String
- Dim lastIDstr As String
- Dim ft As cFLTfleet
- Dim lA As String()
-
- Dim path0 As String
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Init/FLTread"
-
-
-
- WorkerMsg(tMsgID.Normal, "Reading FLT file...", MsgSrc)
-
- fFLT = New cFile_V3
- If Not fFLT.OpenRead(FLTpath) Then
- WorkerMsg(tMsgID.Err, "Failed to open .flt file (" & FLTpath & ")", MsgSrc)
- fFLT = Nothing
- Return False
- End If
-
- ReDim ArP(999)
- ReDim ArGen(999)
- FLTfleet = New Dictionary(Of String, cFLTfleet)
- lastIDstr = ""
- path0 = fPATH(FLTpath)
-
- Do While Not fFLT.EndOfFile
- lA = fFLT.ReadLine
- IDstr = Trim(lA(0))
- If IDstr <> lastIDstr Then
- If lastIDstr <> "" Then
- ft = New cFLTfleet(lastIDstr)
- If Not ft.Init(ArGen, ArP, FLTdim) Then Return False
- FLTfleet.Add(lastIDstr, ft)
- End If
- lastIDstr = IDstr
- FLTdim = -1
- End If
- FLTdim += 1
- ArGen(FLTdim) = fFileRepl(lA(1), path0)
- ArP(FLTdim) = CSng(lA(2))
- Loop
- If lastIDstr <> "" Then
- ft = New cFLTfleet(lastIDstr)
- If Not ft.Init(ArGen, ArP, FLTdim) Then Return False
- FLTfleet.Add(lastIDstr, ft)
- End If
- ft = Nothing
-
- fFLT.Close()
- fFLT = Nothing
-
- ArP = Nothing
- ArGen = Nothing
- FLTdim = Nothing
-
- Return True
-
- End Function
-
- Private Function FLTcheck() As Boolean
- Dim FLTref As cFLTfleet
- Dim check As Boolean
-
- check = True
-
- For Each FLTref In FLTfleet.Values
- If Not FLTref.FileCheck() Then check = False
- Next
-
- Return check
-
- End Function
-
- Private Function EVcheck() As Boolean
- Dim GEN0 As cGEN
- Dim flt0 As cFLTfleet
-
- GEN0 = New cGEN
-
- For Each flt0 In FLTfleet.Values
-
- GEN0.FilePath = flt0.GetGenFile
-
- If Not GEN0.ReadFile Then Return False
-
- Return (GEN0.VehMode = tVehMode.EV)
-
- Next
-
- Return False
-
- End Function
-
- 'Read FZP
- Private Function FZPread() As Boolean
-
- Dim fReader As Microsoft.VisualBasic.FileIO.TextFieldParser
- Dim f As System.IO.StreamReader
- Dim l As Int32
- Dim lc As Int32
- Dim lc10 As Int32
- Dim line() As String
- Dim line0 As String
- Dim ComDone As Boolean
- Dim x As Int32
- Dim LineSkip As Int16
- Dim lastSID As Int32
- Dim SIDisBad As Boolean
- Dim s As Int32
- Dim FZPlenOgl As Int32
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Init/TFread"
-
- If Not IO.File.Exists(FZPpath) Then
- WorkerMsg(tMsgID.Err, "Traffic File not found (" & FZPpath & ")", MsgSrc)
- Return False
- End If
-
- WorkerMsg(tMsgID.Normal, "Traffic File: Counting lines...", MsgSrc)
-
-
- 'Determine File-length
- Try
- f = New System.IO.StreamReader(FZPpath)
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "Cannot access Traffic File (" & FZPpath & ")", MsgSrc)
- Return False
- End Try
-
- x = 0
- LineSkip = 0
- ComDone = False
- Do While Not f.EndOfStream
- line0 = f.ReadLine()
- If Not ComDone Then
- If LineSkip > 200 Then
- WorkerMsg(tMsgID.Err, "Error in Traffic File: Number of Columns < 8", MsgSrc)
- Return False
- End If
- If IsNumeric(line0.Split(";")(0)) And UBound(line0.Split(";")) > 6 Then
- ComDone = True
- Else
- LineSkip += 1
- Continue Do
- End If
- End If
- x += 1
- Loop
- FZPlen = x
- f.Close()
- f.Dispose()
- f = Nothing
-
- If PHEMworker.CancellationPending Then Return True
-
- 'Dimension arrays
- ReDim vt(FZPlen)
- ReDim vX(FZPlen)
- ReDim vY(FZPlen)
- ReDim vNr(FZPlen)
- ReDim vNrSub(FZPlen)
- ReDim vVm(FZPlen)
- ReDim vStg(FZPlen)
- ReDim vID(FZPlen)
- ReDim vSID(FZPlen)
-
- FZPlenOgl = FZPlen
-
-
- If STRfilter Then
- WorkerMsg(tMsgID.Normal, "Traffic File: Reading & Filtering...", MsgSrc)
- Else
- WorkerMsg(tMsgID.Normal, "Traffic File: Reading...", MsgSrc)
- End If
-
- 'Import File
- fReader = New Microsoft.VisualBasic.FileIO.TextFieldParser(FZPpath, FileFormat)
- fReader.TextFieldType = Microsoft.VisualBasic.FileIO.FieldType.Delimited
- fReader.Delimiters = New String() {";"}
-
- 'Skip Comments
- For l = 1 To LineSkip
- fReader.ReadLine()
- Next
- l = 0
- lc = 0
- lastSID = -1
- lc10 = Math.Max(FZPlen / 100, 1000)
- Do While Not fReader.EndOfData
- line = fReader.ReadFields()
- 'Strecken die nicht in der STR Datei aufgeführt sind werden hier entfernt |@@| Routes that are not listed in the STR file, are ignoted(?) here
- If STRfilter Then
- If line(FZProwStr) <> lastSID Then
- lastSID = line(FZProwStr)
- SIDisBad = True
- For s = 0 To sSIDdim
- If sSIDlist(s) = lastSID Then
- SIDisBad = False
- Exit For
- End If
- Next
- End If
- If SIDisBad Then
- FZPlen -= 1
- lc10 = Math.Max(FZPlen / 100, 1000)
- GoTo lbProg1 'Continue Do
- End If
- End If
- 'Show Arrays
- l += 1
- vt(l) = line(FZProwT)
- vX(l) = line(FZProwWeltX)
- vY(l) = line(FZProwWeltY)
- vNr(l) = line(FZProwFzNr)
- vVm(l) = line(FZProwV)
- vStg(l) = line(FZProwSteig)
- vID(l) = CInt(line(FZProwTyp))
- vSID(l) = line(FZProwStr)
- vNrSub(l) = 0
- 'Display Progress
-lbProg1:
- lc += 1
- If lc >= lc10 Then
- ProgBarCtrl.ProgJobInt = l / FZPlen * 100
- lc = 0
- If PHEMworker.CancellationPending Then Return True
- End If
- Loop
-
- 'Free memory
- fReader.Close()
- fReader.Dispose()
- fReader = Nothing
-
- If FZPlenOgl <> FZPlen Then
- If FZPlen = 0 Then
- WorkerMsg(tMsgID.Err, "Street ID's in traffic file not found in segment file.", MsgSrc)
- Return False
- End If
- 'Newly dimensioned arrays
- ReDim Preserve vt(FZPlen)
- ReDim Preserve vX(FZPlen)
- ReDim Preserve vY(FZPlen)
- ReDim Preserve vNr(FZPlen)
- ReDim Preserve vNrSub(FZPlen)
- ReDim Preserve vVm(FZPlen)
- ReDim Preserve vStg(FZPlen)
- ReDim Preserve vID(FZPlen)
- ReDim Preserve vSID(FZPlen)
- End If
-
- Return True
-
- End Function
-
- 'Sort FZP
- Private Sub FZPsortieren()
-
- 'Dim x0 As Int32
- Dim x1 As Int32
- Dim x2 As Int32
- Dim vNri As Int16
- Dim vNrAnz As Int16
- Dim vNr1 As Int32
- Dim vNr2 As Int32
- Dim vNrSort() As Int32
- Dim vts As Int32
- Dim vXs As Single
- Dim vYs As Single
- Dim vNrs As Int32
- Dim vVms As Single
- Dim vStgs As Single
- Dim vIDs As Int16
- Dim vSIDs As Int32
- Dim lc As Int32
- Dim lc10 As Int32
-
- Dim x0 As Int32
- Dim xx1 As Int32
- Dim xx2 As Int32
- Dim t1 As Int32
- Dim t2 As Int32
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Init/TFsort"
-
- WorkerMsg(tMsgID.Normal, "Sorting traffic data...", MsgSrc)
-
- ReDim Preserve vNr(FZPlen)
- vNrSort = vNr.Clone
- Array.Sort(vNrSort)
-
- x1 = 1
- lc10 = Math.Max(FZPlen / 100, 1000)
- lc = 0
- x0 = 1
- Do
- 'Current Vehicle is vNr1
- vNr1 = vNrSort(x1)
- 'Count vehicles with vNr = vNr1
- x2 = x1
- vNrAnz = 0
- Do
- x2 += 1
- vNrAnz += 1
- If x2 > FZPlen Then Exit Do
- vNr2 = vNrSort(x2)
- Loop Until vNr1 <> vNr2
- 'vNrAnz = Number of Vehicles with vNr = vNr1
- 'Sort all vehicles with vNr = vNr1 by Vehicle-number
- x2 = x1 - 1
- vNri = 0
- Do
- x2 += 1
- vNr2 = vNr(x2)
- If vNr2 = vNr1 Then
- If x1 <> x2 Then
- 'Cache = line x1
- vts = vt(x1)
- vXs = vX(x1)
- vYs = vY(x1)
- vNrs = vNr(x1)
- vVms = vVm(x1)
- vStgs = vStg(x1)
- vIDs = vID(x1)
- vSIDs = vSID(x1)
- 'Linex1 = line x2
- vt(x1) = vt(x2)
- vX(x1) = vX(x2)
- vY(x1) = vY(x2)
- vNr(x1) = vNr2
- vVm(x1) = vVm(x2)
- vStg(x1) = vStg(x2)
- vID(x1) = vID(x2)
- vSID(x1) = vSID(x2)
- 'Line x2 = cache
- vt(x2) = vts
- vX(x2) = vXs
- vY(x2) = vYs
- vNr(x2) = vNrs
- vVm(x2) = vVms
- vStg(x2) = vStgs
- vID(x2) = vIDs
- vSID(x2) = vSIDs
- End If
- vNri += 1
- x1 += 1
- End If
- Loop Until vNri = vNrAnz
- 'vNr1 sorted by time
- If x0 < FZPlen Then
- For xx1 = x0 To x1 - 2
- t1 = vt(xx1)
- For xx2 = xx1 + 1 To x1 - 1
- t2 = vt(xx2)
- If t2 < t1 Then
- 'Cache = line xx1
- vXs = vX(xx1)
- vYs = vY(xx1)
- vVms = vVm(xx1)
- vStgs = vStg(xx1)
- vIDs = vID(xx1)
- vSIDs = vSID(xx1)
- 'Line xx1 = Line xx2
- vt(xx1) = t2
- vX(xx1) = vX(xx2)
- vY(xx1) = vY(xx2)
- vVm(xx1) = vVm(xx2)
- vStg(xx1) = vStg(xx2)
- vID(xx1) = vID(xx2)
- vSID(xx1) = vSID(xx2)
- 'Line x2 = Cache
- vt(xx2) = t1
- vX(xx2) = vXs
- vY(xx2) = vYs
- vVm(xx2) = vVms
- vStg(xx2) = vStgs
- vID(xx2) = vIDs
- vSID(xx2) = vSIDs
- t1 = vt(xx1)
- End If
- Next
- Next
- End If
- x0 = x1
- 'Display Status
- lc += 1
- If lc >= lc10 Then
- '' StatusMSG(7, "Sorting FZP..." & CInt(x1 / FZPlen * 100).ToString("00") & "%", False)
- ProgBarCtrl.ProgJobInt = x1 / FZPlen * 100
- lc = 0
- If PHEMworker.CancellationPending Then Exit Sub
- End If
- Loop Until x1 > FZPlen
-
- vNrSort = Nothing
-
- End Sub
-
- 'FZP export
- Private Function FZPexport() As Boolean
-
- Dim f As System.IO.StreamWriter
- Dim x As Int32
- Dim line() As String
- Dim line0 As String
- Dim s As Int16
- Dim FZPsDim As Int16 = 7
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Init/TFexport"
-
-
- WorkerMsg(tMsgID.Normal, "Exporting sorted traffic data...", MsgSrc)
-
- Try
- f = My.Computer.FileSystem.OpenTextFileWriter(FZPsortPath, False, FileFormat)
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "Cannot write to " & FZPsortPath, MsgSrc)
- Return False
- End Try
-
- ReDim line(FZPsDim)
-
- line(FZProwT) = "t"
- line(FZProwWeltX) = "WeltX"
- line(FZProwWeltY) = "WeltY"
- line(FZProwFzNr) = "FzNr"
- line(FZProwV) = "v"
- line(FZProwSteig) = "Steig"
- line(FZProwTyp) = "Typ"
- line(FZProwStr) = "Str"
-
- line0 = line(0)
- For s = 1 To FZPsDim
- line0 &= ";" & line(s)
- Next
-
- 'Header
- f.WriteLine(line0)
-
- 'Data
- For x = 1 To FZPlen
- line(FZProwT) = vt(x)
- line(FZProwWeltX) = vX(x)
- line(FZProwWeltY) = vY(x)
- line(FZProwFzNr) = vNr(x)
- line(FZProwV) = vVm(x)
- line(FZProwSteig) = vStg(x)
- line(FZProwTyp) = vID(x)
- line(FZProwStr) = vSID(x)
- line0 = line(0)
- For s = 1 To FZPsDim
- line0 &= ";" & line(s)
- Next
- f.WriteLine(line0)
- 'f.WriteLine(vt(x) & ";" & vX(x) & ";" & vY(x) & ";" & vNr(x) & ";" & vVm(x) & ";" & vStg(x) & ";" & vID(x) & ";" & vSID(x))
- Next
-
- f.Close()
- f.Dispose()
- f = Nothing
-
- Return True
-
- End Function
-
- 'Read STR
- Private Function STRread() As Boolean
- Dim fReader As Microsoft.VisualBasic.FileIO.TextFieldParser
- Dim line() As String
- Dim ComDone As Boolean
- Dim s As Int32
- Dim x As Int32
- Dim path As String
- Dim path0 As String
- Dim pathADV As String
- Dim StrClone As Int32()
- Dim StrFileClone As Int16()
- Dim sSTRfile As List(Of Int16)
-
- Dim STRerg0 As cSTRerg
- Dim STRdist As Double
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Init/SFread"
-
- WorkerMsg(tMsgID.Normal, "Reading segment files...", MsgSrc)
-
- pathADV = fPATH(JobFile)
-
- sSTRfile = New List(Of Short)
- sStr = New List(Of Integer)
- sSp = New List(Of Short)
- sSegAnX = New List(Of Single)
- sSegEnX = New List(Of Single)
- sSegAnY = New List(Of Single)
- sSegEnY = New List(Of Single)
- sSIDlist = New List(Of Integer)
- sSIDfiles = New List(Of Integer)
- STRlen = -1
- x = -1
-
- STRerg = New List(Of cSTRerg)
-
- For Each path0 In STRpaths
-
- path = fFileRepl(path0, pathADV)
-
- If Not IO.File.Exists(path) Then
- WorkerMsg(tMsgID.Err, "Segments File not found (" & path & ")", MsgSrc)
- Return False
- End If
-
- x += 1
- STRerg0 = New cSTRerg
- STRerg0.Init()
- STRerg0.MySTRpath = path
-
- STRdist = 0
-
- fReader = New Microsoft.VisualBasic.FileIO.TextFieldParser(path, FileFormat)
- fReader.TextFieldType = Microsoft.VisualBasic.FileIO.FieldType.Delimited
- fReader.Delimiters = New String() {";"}
-
- ComDone = False
- Do While Not fReader.EndOfData
- line = fReader.ReadFields
- If Not ComDone Then
- If IsNumeric(line(0)) Then
- ComDone = True
- Else
- Continue Do
- End If
- End If
- STRlen += 1
- sStr.Add(line(0))
- sSp.Add(line(1))
- sSegAnX.Add(line(2))
- sSegEnX.Add(line(3))
- sSegAnY.Add(line(4))
- sSegEnY.Add(line(5))
- sSTRfile.Add(x)
-
- STRdist += ((sSegEnY(STRlen) - sSegAnY(STRlen)) ^ 2 + (sSegEnX(STRlen) - sSegAnX(STRlen)) ^ 2) ^ 0.5
-
- Loop
-
- fReader.Close()
- fReader.Dispose()
-
- STRerg0.Distance = CSng(STRdist / 1000)
- STRerg.Add(STRerg0)
-
- Next
-
- fReader = Nothing
-
- 'Create SID-List
- ReDim StrClone(STRlen)
- ReDim StrFileClone(STRlen)
- sStr.CopyTo(StrClone)
- sSTRfile.CopyTo(StrFileClone)
-
- Array.Sort(StrClone, StrFileClone)
-
- s = StrClone(0)
- sSIDlist.Add(s)
- sSIDfiles.Add(StrFileClone(0))
- sSIDdim = 0
- For x = 1 To STRlen
- If s <> StrClone(x) Then
- s = StrClone(x)
- sSIDdim += 1
- sSIDlist.Add(s)
- sSIDfiles.Add(StrFileClone(x))
- End If
- Next
-
- sSTRfile = Nothing
-
- Return True
-
- End Function
-
-
- 'FZP Check:
- ' ...Fahrzeuge aufteilen, die Lücke im Zeitverlauf haben |@@| Vehicles divisions, have the bridge the gap over time
- Private Sub FZPcheck()
-
- Dim z As Int32
- Dim t1 As Int32
- Dim vnr1 As Int32
- Dim SubNr As Int16
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Init/TFcheck"
-
- WorkerMsg(tMsgID.Normal, "Searching for time gaps > 1s...", MsgSrc)
-
- t1 = vt(1)
- vnr1 = vNr(1)
- SubNr = 0
- For z = 2 To FZPlen
- If vNr(z) = vnr1 Then
- If vt(z) - t1 > 1.1 Then
- WorkerMsg(tMsgID.Warn, "Time gap found! Vehicle " & vnr1 & " at t= " & vt(z), MsgSrc)
- SubNr += 1
- End If
- If SubNr > 0 Then vNrSub(z) = SubNr
- Else
- SubNr = 0
- End If
- vnr1 = vNr(z)
- t1 = vt(z)
- Next
-
- End Sub
-
- 'Read ADV
- Private Function ADVread() As Boolean
-
- Dim fADV As cADV
- Dim line As String = ""
- Dim s As String = ""
- Dim i As Integer
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Init/ADVread"
-
- fADV = New cADV
- fADV.FilePath = JobFile
-
- '********** .Read ADV-file ********
- If Not fADV.ReadFile Then
- WorkerMsg(tMsgID.Err, "Failed to open .adv file (" & JobFile & ")", MsgSrc)
- fADV = Nothing
- Return False
- End If
-
- STRpaths = New List(Of String)
-
- 'Line 1: FZP file
- FZPpath = fADV.FZPpath
-
- 'Line 2: FLT file
- FLTpath = fADV.FLTpath
-
- 'Line 3: TEM file
- TEMpath = fADV.TEMpath
-
- 'Line 4: RndSeed
- RndSeed = fADV.RndSeed
-
- 'Line 5: MISKAMout True/False
- MISKAMout = fADV.SD3out
-
- 'Line 6: strFilter True/False
- STRfilter = fADV.STRfilter
-
- 'Zeile 7: STR.SUM Streckenfilter |@@| Line 7: STR.SUM Route-filter
- STRdistTol = fADV.STRSUMdistflt / 100
-
- 'Line 8+: STR files
- For i = 1 To fADV.STRcount
- STRpaths.Add(fADV.STRpaths(i - 1))
- Next
-
- '*****************************************
-
- fADV = Nothing
-
- Return True
-
- End Function
-
- Private Function AusgMOD_Init() As Boolean
-
- Dim f As cFile_V3
- Dim VehType As String
-
- For Each VehType In FLTfleet.Keys
-
- 'Define Output-path
- MODdata.ModOutpName = fFileWoExt(JobFile)
-
- f = New cFile_V3
-
- If Not f.OpenWrite(MODdata.ModOutpName & "_" & VehType & ".mod") Then Return False
-
- 'Header:
- f.WriteLine("VECTO " & VECTOvers)
- f.WriteLine(Now.ToString)
- f.WriteLine("Input File: " & JobFile)
- f.WriteLine("Modal Results For Type " & VehType)
- f.WriteLine(" ")
-
- f.Close()
-
- Next
-
- Return True
-
- End Function
-
- Private Function AusgSUM_Init() As Boolean
- Dim MsgSrc As String
-
- MsgSrc = "ADV/OutpInit/SumInit"
-
- ' *********************************** .sum *************************************
- 'File results with sums over all Vehicles(KFZs):
- Try
- FadvSUM = My.Computer.FileSystem.OpenTextFileWriter(SUMpath, False, FileFormat)
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "Cannot access .sum file (" & SUMpath & ")", MsgSrc)
- Return False
- End Try
- FadvSUM.AutoFlush = True
-
- 'Header
- FadvSUM.WriteLine("VECTO ADVANCE Average results per vehicle")
- FadvSUM.WriteLine("VECTO " & VECTOvers)
- FadvSUM.WriteLine("Inputfile: " & JobFile)
- FadvSUM.WriteLine(ERG.ERGinfo)
- FadvSUM.WriteLine("VehNr,VehType,GEN," & ERG.ErgHead())
- FadvSUM.WriteLine("[-],[-],[-]," & ERG.ErgUnits())
- FadvSUM.Close()
-
- Return True
-
- End Function
-
- 'Close Output
- Private Function AusgVis_V3_Close() As Boolean
- Dim F611 As New cFile_V3
- Dim secvis As Single
- Dim j As Int32
- Dim js As Int32, ivd As Int32
- Dim axi As Single, ayi As Single
- Dim amaz As Int32
- Dim amiz As Int32
-
- FadvSUM.Dispose()
- FadvSUM = Nothing
-
- If MISKAMout Then
- amaz = vt(1)
- amiz = vt(1)
- For j = 2 To FZPlen
- If vt(j) > amaz Then amaz = vt(j)
- If vt(j) < amiz Then amiz = vt(j)
- Next
- secvis = amaz - amiz
-
- 'C
- 'C Convert Emissions to g per second and Vehicle(KFZ)/day
- For j = 1 To STRlen
- sFC(j) = sFC(j) / secvis
- sNOx(j) = sNOx(j) / secvis
- sCO(j) = sCO(j) / secvis
- sHC(j) = sHC(j) / secvis
- sPM(j) = sPM(j) / secvis
- sBe(j) = sBe(j) / secvis
- sRu(j) = sRu(j) / secvis
- sSO2(j) = sSO2(j) / secvis
- vDTV(j) = vDTV(j) * 86400 / secvis
- ALKW(j) = ALKW(j) * 86400 / secvis
- 'C
- Next j
- 'C
- 'C Convert Emissions to mg per Meter
- 'C Streckenlaenge [m] wird aus Gerade zwischen Anfangs- und Endpunkt berechnet: |@@| Route-length [m] is calculated from straight line between start and end points:
- 'C
- For j = 1 To STRlen
- axi = (sSegEnX(j) - sSegAnX(j)) ^ 2
- ayi = (sSegEnY(j) - sSegAnY(j)) ^ 2
- ala(j) = (axi + ayi) ^ 0.5
- sFC(j) = 1000 * sFC(j) / ala(j)
- sNOx(j) = 1000 * sNOx(j) / ala(j)
- sCO(j) = 1000 * sCO(j) / ala(j)
- sHC(j) = 1000 * sHC(j) / ala(j)
- sPM(j) = 1000 * sPM(j) / ala(j)
- sBe(j) = 1000 * sBe(j) / ala(j)
- sRu(j) = 1000 * sRu(j) / ala(j)
- sSO2(j) = 1000 * sSO2(j) / ala(j)
- Next j
- 'C
- 'C Dump Results
- 'C
- 'C Filename for ResultFile = Input-filename but with *.sd3:
- 'C
-
- 'C
- 'C File mit Summen Ergebnissen ueber alle Streckenstuecke: |@@| File with sums over all results Route-sections:
- Call F611.OpenWrite(SD3path, ";")
- 'C
- Call F611.WriteLine("Results from VECTO ADVANCE") ' Format 630
- Call F611.WriteLine("VECTO " & VECTOvers) ' Format '(a25)'
- Call F611.WriteLine("Average results per line over total time interval [sec]:", secvis) ' Format 640
- Call F611.WriteLine("Cold start extra emissions are included") ' Format *
- Call F611.WriteLine("lfd.; x1; y1; x2; y2;Strassen;; mittl.Emiss. [mg/(m*s)];;; ; ; ; ; ; ; ;DTV;Lkw-An-; Fahr-; Qh/;Typ; S_z0;Str-;; lNfz; lBus; F; L; W;Abschn.-") ' Format '(A150)'
- Call F611.WriteLine("Nr.;[m];[m];[m];[m];Breite[m];Höhe[m];NOx;BENZOL;RUSS;PM10;KW;CO;CO2;SO2;Stoff 9; Stoff 10;[Kfz/d];teil[-];muster;SBr[m];[-];[m];Nr;Strassenkategorie;[-];[-]; S; N; O;Laenge[m]") ' Format '(A180)'
- 'C
- For js = 1 To STRlen
- ivd = Math.Round(vDTV(js), 0, MidpointRounding.AwayFromZero)
- Call F611.WriteLine(js, sSegAnX(js), sSegAnY(js), sSegEnX(js), sSegEnY(js), -99.9, -99.9, sNOx(js), sBe(js), sRu(js), sPM(js), sHC(js), sCO(js), sFC(js) * 3.14, sSO2(js), "-99", "-99", ivd, ALKW(js), " ", "-99", "-99", "-99", sStr(js), " ", " ", " ", " ", " ", " ", ala(js)) ' Format 620
- Next js
-
- Call F611.Close()
- F611 = Nothing
- End If
-
- If STRfilter Then
- If Not AusgSTRerg() Then Return False
- End If
-
- Return True
-
- End Function
-
- Public Function AusgVis_V3() As Boolean
- Dim sumNr As Int32
- Dim ie As Short
- Dim MsgSrc As String
-
- MsgSrc = "ADV/OutpInit"
-
-
- If Not AusgVisInit Then
- AusgVisInit = True
- If Not AusgSUM_Init() Then Return False
- End If
-
- If MISKAMout Then Call AusMISK_V2()
-
- sumNr = 0
-
- For ie = 0 To 1
- Try
- FadvSUM = My.Computer.FileSystem.OpenTextFileWriter(SUMpath, True, FileFormat)
- FadvSUM.AutoFlush = True
- Exit For
- Catch ex As Exception
- If ie = 0 Then
- System.Threading.Thread.Sleep(2000)
- Else
- WorkerMsg(tMsgID.Err, "Failed to access .sum file (" & SUMpath & ")", MsgSrc)
- Return False
- End If
- End Try
- Next
-
- FadvSUM.WriteLine(aVehNr & "," & aVehType & "," & fFILE(GenFile, True) & "," & ERG.ErgLine()) ' Format 661
-
- FadvSUM.Close()
- FadvSUM.Dispose()
-
- Return True
-
- End Function
-
-
- Private Sub AusMISK_V2()
- 'C Subroutine of PHEM/Advance for dumping the results of MISKAM Air-Quality-Model of Lohmeyer
- 'C Dump Data separated by Semicolons
- 'C
- 'C
- 'C
- ' include "com.inc"<<<<<<<<<<<<<<<<<<<<<<<<<<
- Dim chari As String = ""
- Dim ami As Single, ax As Single, ay As Single, akabst As Single, C1 As Single, C2 As Single
- Dim jm1 As Long, jist As Long
- Dim j As Int32
- Dim jz As Int32
- 'C -------------------------------------------------------------------------------------------------
- 'C
- 'C Adding up the Emission-data for Route-segments, for every Vehicle over each second
- 'C Caution: There are 2 possible Directions(Richtungen) for each section but only the StrId is given to *.fzp -> the "Closest" assigned Direction(Richtungen)
- 'C Richtung zugewiesen |@@| Direction assigned
- 'C
-
-
- For jz = 0 To MODdata.tDim
- 'C
- ami = 1000000000000
- For j = 0 To STRlen
- 'C
- If (aStrId(jz) = sStr(j)) Then
- 'C Suche nach naechstgelegenem Strassenteilstueck |@@| Find nearest Road-section
- 'C Koordinaten Kfz: |@@| Coordinate vehicle(KFZ):
- ax = aWorldX(jz)
- ay = aWorldY(jz)
- 'C Koordinaten Strecke: sSegAnX(j), sSegEnX(j), sSegAnY(j), sSegEnY(j) aus Eingabe |@@| Route Coordinates: sSegAnX(j), sSegEnX(j), sSegAnY(j), sSegEnY(j) from Input
- 'C Abstandsumme zu Anfang- und Endpunkt des Streckenabschnittes j |@@| Total distance to the beginning and end of the Route-section j
- C1 = ((ax - sSegAnX(j)) ^ 2 + (ay - sSegAnY(j)) ^ 2) ^ 0.5
- C2 = ((ax - sSegEnX(j)) ^ 2 + (ay - sSegEnY(j)) ^ 2) ^ 0.5
- akabst = C1 + C2
- If (akabst <= ami) Then
- ami = akabst
- jist = j
- End If
- End If
- Next j
- 'C Falls Streckennummer auf *.fzp File in *.str File nicht existiert, wird auf naechstgelegenes Stueck zugewiesen (gleiches System wie oben): |@@| If the Route number in *.fzp file not exist in *.str file, it is assigned the nearest section (same method as above):
- If (ami = 1000000000000) Then
- If (STRlen >= 1) Then
- For j = 1 To STRlen
- ax = aWorldX(jz)
- ay = aWorldY(jz)
- C1 = ((ax - sSegAnX(j)) ^ 2 + (ay - sSegAnY(j)) ^ 2) ^ 0.5
- C2 = ((ax - sSegEnX(j)) ^ 2 + (ay - sSegEnY(j)) ^ 2) ^ 0.5
- akabst = C1 + C2
- If (akabst <= ami) Then
- ami = akabst
- jist = j
- End If
- Next j
- End If
- End If
- 'C Aufsummierung der Emissionen auf den jeweils zugehoerigen Streckenabschnitten: |@@| Summation of the emissions to the respective associated sections:
- 'C berechnung sekuendlich in (g/h)/3600 -> g/Strecke ueber gesamte Zeit |@@| calculation in every second (g/h) / 3600 - by> g / haul all the time
- sFC(jist) = sFC(jist) + (MODdata.Em.EmDefComp(tMapComp.FC).FinalVals(jz)) / 3600
- sNOx(jist) = sNOx(jist) + (MODdata.Em.EmDefComp(tMapComp.NOx).FinalVals(jz)) / 3600
- sCO(jist) = sCO(jist) + (MODdata.Em.EmDefComp(tMapComp.CO).FinalVals(jz)) / 3600
- sHC(jist) = sHC(jist) + (MODdata.Em.EmDefComp(tMapComp.HC).FinalVals(jz)) / 3600
- sPM(jist) = sPM(jist) + (MODdata.Em.EmDefComp(tMapComp.PM).FinalVals(jz)) / 3600
-
- 'C Zaehlen der Kfz fuer DTV (nur wenn nicht in voriger Sekunde auch schon auf der Strecke |@@| Counting the Vehicle for DTV (only if not already in previous second on the track
- If (jist <> jm1) Then
- vDTV(jist) = vDTV(jist) + 1
- If Not GEN.PKWja Then
- ALKW(jist) = ALKW(jist)
- End If
- End If
- 'C ,
- 'C Grobe Rechnung Benzol nach GLOBEMI (HBEFA): |@@| Rough calculation for benzene GLOBEMI (HBEFA):
- 'C Distinguish as: Otto, Diesel, HDV(LKW), Car(PKW), before/after EURO 1
- 'C Otto:
- If GEN.ottoJa Then
- If GEN.PKWja Then
- If (GEN.eklasse < 1) Then
- sBe(jist) = sBe(jist) + (MODdata.Em.EmDefComp(tMapComp.HC).FinalVals(jz) * 0.0438) / 3600
- Else
- sBe(jist) = sBe(jist) + (MODdata.Em.EmDefComp(tMapComp.HC).FinalVals(jz) * 0.1293) / 3600
- 'Continue For
- End If
- Else
- sBe(jist) = sBe(jist) + (MODdata.Em.EmDefComp(tMapComp.HC).FinalVals(jz) * 0.05) / 3600
- End If
- 'C Diesel
- Else
- If GEN.PKWja Then
- sBe(jist) = sBe(jist) + (MODdata.Em.EmDefComp(tMapComp.HC).FinalVals(jz) * 0.0167) / 3600
- Else
- sBe(jist) = sBe(jist) + (MODdata.Em.EmDefComp(tMapComp.HC).FinalVals(jz) * 0.0167) / 3600
- End If
- End If
- 'C
- 'C Grobe Rechnung Russ, Anteile Russ an PM derzeit nur Schaetzwerte!!!!: |@@| Rough calculation of Soot, Soot shares of PM currently only Schaetz-values!!:
- 'C Distinguish as: Otto, Diesel, HDV(LKW), Car(PKW), before/after EURO 1
- 'C Diesel:
- If Not GEN.ottoJa Then
- If GEN.PKWja Then
- If (GEN.eklasse < 2) Then
- sRu(jist) = sRu(jist) + (MODdata.Em.EmDefComp(tMapComp.PM).FinalVals(jz) * 0.5) / 3600
- ElseIf (GEN.eklasse > 4) Then
- sRu(jist) = sRu(jist) + (MODdata.Em.EmDefComp(tMapComp.PM).FinalVals(jz) * 0.1) / 3600
- Else
- sRu(jist) = sRu(jist) + (MODdata.Em.EmDefComp(tMapComp.PM).FinalVals(jz) * 0.75) / 3600
- End If
- Else
- If (GEN.eklasse > 3) Then
- sRu(jist) = sRu(jist) + (MODdata.Em.EmDefComp(tMapComp.PM).FinalVals(jz) * 0.7) / 3600
- Else
- sRu(jist) = sRu(jist) + (MODdata.Em.EmDefComp(tMapComp.PM).FinalVals(jz) * 0.5) / 3600
- End If
- End If
- 'C Otto
- Else
- If GEN.PKWja Then
- sRu(jist) = sRu(jist) + (MODdata.Em.EmDefComp(tMapComp.PM).FinalVals(jz) * 0.1) / 3600
- Else
- sRu(jist) = sRu(jist) + (MODdata.Em.EmDefComp(tMapComp.PM).FinalVals(jz) * 0.1) / 3600
- End If
- End If
- 'C
- 'C SO2-Emissionen aus dem im Kraftstoff enthaltenen |@@| SO2-Emissions as contained in the Fuel
- 'C Schwefel gerechnet. Mit Masse SO2 = (Masse% S / 100) * 2 |@@| Sulfur expected. With SO2 mass = (mass% S / 100) * 2
- 'C Diesel_
- If Not GEN.ottoJa Then
- sSO2(jist) = sSO2(jist) + (MODdata.Em.EmDefComp(tMapComp.FC).FinalVals(jz) * 0.001 / 50) / 3600
- 'C Otto:
- Else
- sSO2(jist) = sSO2(jist) + (MODdata.Em.EmDefComp(tMapComp.FC).FinalVals(jz) * 0.0005 / 50) / 3600
- End If
- 'C
- jm1 = jist
- 'C
- Next jz
-
- End Sub
-
- Private Function AusgSTRerg() As Boolean
- Dim s As System.Text.StringBuilder
- Dim Sepp As String = ","
- Dim STRergRef As cSTRerg
- Dim VehType As String
- Dim km As Double
- Dim sum As Double
- Dim e As Integer
- Dim fSSUM As cFile_V3
- Dim Fleet0 As cFLTfleet
- Dim STRSUMpath As String
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Outp/SegSum"
-
- fSSUM = New cFile_V3
- s = New System.Text.StringBuilder
-
- '******** Dump each STR results ' *********
- For Each STRergRef In STRerg
- If Not STRergRef.Ausg() Then Return False
- Next
-
- '********* Dump Totals of all STR's ' *********
-
- STRSUMpath = fFileWoExt(JobFile) & ".segment.sum"
-
- If Not fSSUM.OpenWrite(STRSUMpath) Then
- WorkerMsg(tMsgID.Err, "Failed to write to '" & STRSUMpath & "'!", MsgSrc)
- Return False
- End If
-
-
- '** File Header
- fSSUM.WriteLine("VECTO ADVANCE Sum Results by Segments and Vehicle Types")
- fSSUM.WriteLine("VECTO " & VECTOvers)
- fSSUM.WriteLine(Now.ToString)
- fSSUM.WriteLine("Inputfile: " & JobFile)
-
- '****************************************************************
- '*************************** Em per km ***************************
-
- 'Header
- s.Length = 0
- s.Append("*** Results per km ***,Vehicles,Travel Time,Travelled Distance, Average Speed")
- If GEN.VehMode = tVehMode.EV Then
- s.Append(Sepp & "EC")
- Else
- For e = 0 To EMdim
- s.Append(Sepp & MODdata.Em.EmComp(EMlist(e)).Name)
- Next
- End If
- fSSUM.WriteLine(s.ToString)
-
- 'Untits
- s.Length = 0
- s.Append("Segment / Vehicle Type,[-],[h],[km],[km/h]")
- If GEN.VehMode = tVehMode.EV Then
- s.Append(Sepp & "[kWh/km]")
- Else
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[#/km]")
- s.Append(Sepp & "[g/km]")
- End If
- fSSUM.WriteLine(s.ToString)
-
- '** Em per segment
- For Each STRergRef In STRerg
-
- s.Length = 0
-
- 'Segment-Name
- s.Append(fFILE(STRergRef.MySTRpath, True))
-
- 'Number of Vehicles
- s.Append(Sepp & STRergRef.AllVehCount)
-
- 'Travel time
- sum = STRergRef.AllVehTime
- s.Append(Sepp & sum)
-
- 'km
- km = STRergRef.AllVehDist
- s.Append(Sepp & km)
-
- 'Speed
- If sum = 0 Then
- s.Append(Sepp & "-")
- Else
- s.Append(Sepp & km / sum)
- End If
-
- 'Em per km
- For e = 0 To EMdim
- If km = 0 Then
- s.Append(Sepp & "-")
- Else
- s.Append(Sepp & STRergRef.AllEm(e) / km)
- End If
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- Next
-
- '** Em per Vehicle Type
- For Each VehType In FLTfleet.Keys
-
- s.Length = 0
-
- 'Type
- s.Append("Veh " & VehType)
-
- 'Number of Vehicles
- s.Append(Sepp & FLTfleet(VehType).VehCount)
-
- 'Reisezeit, Strecke, Avg.Speed |@@| Travel time, Route-Distance, Avg. Speed
- sum = 0
- km = 0
- For Each STRergRef In STRerg
- sum += STRergRef.VehTime(VehType)
- km += STRergRef.VehDist(VehType)
- Next
- s.Append(Sepp & sum)
- s.Append(Sepp & km)
- If sum = 0 Then
- s.Append(Sepp & "-")
- Else
- s.Append(Sepp & km / sum)
- End If
-
- 'Em
- For e = 0 To EMdim
- If km = 0 Then
- s.Append(Sepp & "-")
- Else
- sum = 0
- For Each STRergRef In STRerg
- sum += STRergRef.EMsum(VehType)(e)
- Next
- s.Append(Sepp & sum / km)
- End If
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- Next
-
- '** Total
- s.Length = 0
-
- 'Segment
- s.Append("Sum")
-
- 'Number of Vehicles is not calculated from STRerg (makes no sense) but from cFLTfleet-recording
- sum = 0
- For Each Fleet0 In FLTfleet.Values
- sum += Fleet0.VehCount
- Next
- s.Append(Sepp & sum)
-
- 'Travelling time
- sum = 0
- For Each STRergRef In STRerg
- sum += STRergRef.AllVehTime
- Next
- s.Append(Sepp & sum)
-
- 'km
- km = 0
- For Each STRergRef In STRerg
- km += STRergRef.AllVehDist
- Next
- s.Append(Sepp & km)
-
- 'Speed
- If sum = 0 Then
- s.Append(Sepp & "-")
- Else
- s.Append(Sepp & km / sum)
- End If
-
- 'Em per km
- For e = 0 To EMdim
- If km = 0 Then
- s.Append(Sepp & "-")
- Else
- sum = 0
- For Each STRergRef In STRerg
- sum += STRergRef.AllEm(e)
- Next
- s.Append(Sepp & sum / km)
- End If
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- '****************************************************************
- '**************************** Em abs ****************************
-
- fSSUM.WriteLine(" ")
-
- 'Header
- s.Length = 0
- s.Append("*** Absolute Values ***")
- If GEN.VehMode = tVehMode.EV Then
- s.Append(Sepp & "EC")
- Else
- For e = 0 To EMdim
- s.Append(Sepp & MODdata.Em.EmComp(EMlist(e)).Name)
- Next
- End If
- fSSUM.WriteLine(s.ToString)
-
- 'Untits
- s.Length = 0
- s.Append("Segment / Vehicle Type")
- If GEN.VehMode = tVehMode.EV Then
- s.Append(Sepp & "[kWh]")
- Else
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[#]")
- s.Append(Sepp & "[g]")
- End If
- fSSUM.WriteLine(s.ToString)
-
- '** Em per segment
- For Each STRergRef In STRerg
-
- s.Length = 0
-
- 'Segment-Name
- s.Append(fFILE(STRergRef.MySTRpath, True))
-
- 'Em abs
- For e = 0 To EMdim
- s.Append(Sepp & STRergRef.AllEm(e))
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- Next
-
- '** Em per Vehicle Type
- For Each VehType In FLTfleet.Keys
-
- s.Length = 0
-
- 'Type
- s.Append("Veh " & VehType)
-
- 'Em
- For e = 0 To EMdim
- sum = 0
- For Each STRergRef In STRerg
- sum += STRergRef.EMsum(VehType)(e)
- Next
- s.Append(Sepp & sum)
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- Next
-
- '** Total
- s.Length = 0
-
- 'Segment
- s.Append("Sum")
-
- 'Em abs
- For e = 0 To EMdim
- sum = 0
- For Each STRergRef In STRerg
- sum += STRergRef.AllEm(e)
- Next
- s.Append(Sepp & sum)
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- fSSUM.Close()
-
- Return True
-
- End Function
-
- '.Analyze Mod-file
- Public Sub AusgModCut(ByVal InPath As String, ByVal VehList As Int32())
- Dim f As System.IO.StreamReader
- Dim VehNr As Int32
- Dim x As Int16
- Dim x1 As Int16
- Dim fOut As cFile_V3
- Dim laststring As String
- Dim foundNr As Int32
- Dim CheckLast As Boolean
- Dim MsgSrc As String
-
- MsgSrc = "ADV/ModCut"
-
- WorkerMsg(tMsgID.Normal, "Starting .mod split.", MsgSrc)
-
- 'Open Infile
- Try
- f = New System.IO.StreamReader(InPath)
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "Cannot access .mod file (" & InPath & ")", MsgSrc)
- WorkerMsg(tMsgID.Normal, "Aborted!", MsgSrc)
- Exit Sub
- End Try
-
- WorkerMsg(tMsgID.Normal, "File " & InPath, MsgSrc)
- WorkerStatus(".mod split running. File " & fFILE(InPath, True))
-
- fOut = New cFile_V3
- CheckLast = False
-
- 'Anzahl VehNummern |@@| Number of VehNummern
- x1 = 1 + UBound(VehList) - x
- x = 0
- laststring = ""
-
- 'Loop through all VehNummern in list
- For Each VehNr In VehList
-
- 'Abort when User-abort
- If PHEMworker.CancellationPending Then
- WorkerMsg(tMsgID.Normal, "Aborted by User.", MsgSrc)
- GoTo lbDone
- End If
-
- 'Abort when File finished
- If f.EndOfStream Then
- WorkerMsg(tMsgID.Err, "Reached end of file before last vehicle number was found.", MsgSrc)
- WorkerMsg(tMsgID.Normal, "Aborted! (Reached end of file)", MsgSrc)
- GoTo lbDone
- End If
-
- 'Open Output-File / Abort if Error on Opening
- If Not fOut.OpenWrite(fFileWoExt(InPath) & "_Veh" & VehNr & ".mod") Then
- WorkerMsg(tMsgID.Err, "Cannot create output file. Veh.Nr. " & VehNr, MsgSrc)
- GoTo lbDone
- End If
-
- 'Loop through file
- Do While Not f.EndOfStream
-
- 'If string already contains a VehNr do not read again Line (see below)
- If CheckLast Then
- CheckLast = False
- Else
- 'Read Line
- laststring = f.ReadLine
- End If
-
- 'If Line with VehNr found: extract VehNr
- If InStr(laststring, "VehNr:", CompareMethod.Text) > 0 Then
- foundNr = GetVehNr(laststring)
-
- 'If VehNr is the required one: write the Output-file
- If foundNr = VehNr Then
-
- 'First line write ("VehNr: ...")
- fOut.WriteLine(laststring)
-
- 'Read next Line (otherwise Do-While skipped)
- laststring = f.ReadLine
-
- 'Loop until next VehNr / end_of_file
- Do While Not f.EndOfStream
-
- 'If next Vehicle:
- If InStr(laststring, "VehNr:", CompareMethod.Text) > 0 Then
- If GetVehNr(laststring) = VehNr Then
- 'If Vehicle-number is the same: Continue writing File
- 'Skip header and Units
- f.ReadLine()
- f.ReadLine()
- laststring = f.ReadLine
- Else
- 'Otherwise: Get out of loop
- Exit Do
- End If
- End If
-
- 'Write Line
- fOut.WriteLine(laststring)
-
- 'Read line
- laststring = f.ReadLine
-
- Loop
-
- 'If not EndOfStream Set flag so next VehNr is not skipped
- If Not f.EndOfStream Then CheckLast = True
-
- 'Close Output-file
- fOut.Close()
-
- 'Jump out of the VehNr-search-loop
- Exit Do
-
- End If
-
- End If
-
- Loop
-
- 'ProgBar
- x += 1
- ProgBarCtrl.ProgJobInt = CInt(100 * x / x1)
-
- Next
-
- WorkerMsg(tMsgID.Normal, "done", MsgSrc)
-
-lbDone:
-
- f.Close()
- f.Dispose()
- f = Nothing
- fOut.Close()
- fOut = Nothing
-
- End Sub
-
- Private Function GetVehNr(ByVal Str As String) As Integer
- Dim foundStr As String
- foundStr = Str.Split(",")(0)
- Return CInt(Right(foundStr, Len(foundStr) - 7))
- End Function
-
-
- 'FLT-class
- Private Class cFLTfleet
-
- Private MyP() As Single 'Percentage
- Private MyGen() As String 'GEN Datei
- Private MyDim As Int16 'Dim
- Private MyID As String 'Vehicle Type
-
- Public VehCount As Integer 'Anzahl Fahrzeuge
-
- 'New
- Public Sub New(ByVal ID As String)
- MyID = ID
- MyDim = -1
- End Sub
-
- 'Initialize
- Public Function Init(ByVal GenFiles As String(), ByVal Shares As Single(), ByVal ArDim As Int16) As Boolean
- Dim x As Int16
- Dim xsum As Single
- Dim MsgSrc As String
-
- MsgSrc = "ADV/FLT/Init"
-
- MyDim = ArDim
-
- If MyDim > -1 Then
- ReDim MyGen(ArDim)
- ReDim MyP(ArDim)
- xsum = 0
- For x = 0 To ArDim
- MyGen(x) = GenFiles(x)
- MyP(x) = Shares(x)
- xsum += Shares(x)
- Next
- If Math.Abs(1 - xsum) > 0.0001 Then
- WorkerMsg(tMsgID.Err, "Vehicle Type " & MyID & ": Share sum is not 100%!", MsgSrc)
- Return False
- End If
-
- For x = 1 To ArDim
- MyP(x) += MyP(x - 1)
- Next
- End If
-
- Return True
-
- End Function
-
- 'GenFile Random-generator
- Public Function GetGenFile() As String
- Dim r As Single
- Dim x As Int16
- Dim MsgSrc As String
-
- MsgSrc = "ADV/FLT/GetGenFile"
-
- Select Case MyDim
- Case -1
- WorkerMsg(tMsgID.Err, "Vehicle type " & MyID & " is not specified in .FLT file. Cannot assign .GEN file.", MsgSrc)
- Return ""
- Case 0
- Return MyGen(0)
- Case Else
- r = 1 - Rnd()
- x = MyDim
- Do While r <= MyP(x - 1)
- x -= 1
- If x = 0 Then Exit Do
- Loop
- Return MyGen(x)
- End Select
- End Function
-
- Public Function FileCheck() As Boolean
- Dim str As String
- Dim check As Boolean
- Dim MsgSrc As String
-
- MsgSrc = "ADV/FLT/" & MyID
-
- check = True
-
- For Each str In MyGen
- If str = "" OrElse Not IO.File.Exists(str) Then
- WorkerMsg(tMsgID.Err, "File not found (" & str & ")!", MsgSrc)
- check = False
- End If
- Next
-
- Return check
-
- End Function
-
-
-
-
- End Class
-
- 'Klasse für abschnittsweise Auswertung |@@| Class for sections evaluation
- Private Class cSTRerg
-
- Public MySTRpath As String
-
- Public VehCount As Dictionary(Of String, Integer) 'Fahrzeuganzahl je Fahrzeugtyp
- Public VehDist As Dictionary(Of String, Double) 'Verkehrsleistung je Fahrzeugtyp
- Public VehTime As Dictionary(Of String, Double) 'Reisezeit je Fahrzeugtyp
-
- Public EMsum As Dictionary(Of String, List(Of Double)) 'Summen-Emissionen je Fahrzeugtyp und Em-Komponente Absolut [g]
-
- Public Distance As Single 'STR-Länge für Filter in km
-
- Public Sub Init()
- Dim KV As KeyValuePair(Of String, cFLTfleet)
- Dim dic0 As List(Of Double)
- Dim x As Integer
-
- VehCount = New Dictionary(Of String, Integer)
- VehDist = New Dictionary(Of String, Double)
- VehTime = New Dictionary(Of String, Double)
-
- EMsum = New Dictionary(Of String, List(Of Double))
-
- For Each KV In ADV.FLTfleet
- VehCount.Add(KV.Key, 0)
- VehDist.Add(KV.Key, 0)
- VehTime.Add(KV.Key, 0)
-
- dic0 = New List(Of Double)
-
- For x = 0 To ADV.EMdim
- dic0.Add(0)
- Next
-
- EMsum.Add(KV.Key, dic0)
-
- Next
-
- End Sub
-
- Public Function Ausg() As Boolean
- Dim s As System.Text.StringBuilder
- Dim Sepp As String = ","
- Dim VehType As String
- Dim km As Double
- Dim KVl As KeyValuePair(Of String, List(Of Double))
- Dim sum As Double
- Dim e As Integer
- Dim fSSUM As cFile_V3
- Dim STRSUMpath As String
- Dim MsgSrc As String
-
- MsgSrc = "ADV/Outp/Seg"
-
- fSSUM = New cFile_V3
-
- STRSUMpath = fFileWoExt(JobFile) & "_" & fFILE(MySTRpath, False) & ".sum"
-
- If Not fSSUM.OpenWrite(STRSUMpath) Then
- WorkerMsg(tMsgID.Err, "Failed to write to '" & STRSUMpath & "'!", MsgSrc)
- Return False
- End If
-
- s = New System.Text.StringBuilder
-
- 'File Header
- fSSUM.WriteLine("VECTO ADVANCE Sum Results per Segment")
- fSSUM.WriteLine("VECTO " & VECTOvers)
- fSSUM.WriteLine("Inputfile: " & JobFile)
- fSSUM.WriteLine("Segment File: " & MySTRpath)
- fSSUM.WriteLine("Calculated Segment Length: " & Distance * 1000 & "m")
- fSSUM.WriteLine("Minimum Travelled Distance: " & 1000 * ADV.STRdistTol * Distance & "m (" & ADV.STRdistTol * 100 & "%)")
-
- fSSUM.WriteLine(" ")
-
- '****************************************************************
- '*************************** Em per km ***************************
-
- 'Header
- s.Length = 0
- s.Append("*** Results per km ***,Vehicles,Travel Time,Travelled Distance, Average Speed")
- If GEN.VehMode = tVehMode.EV Then
- s.Append(Sepp & "EC")
- Else
- For e = 0 To ADV.EMdim
- s.Append(Sepp & MODdata.Em.EmComp(ADV.EMlist(e)).Name)
- Next
- End If
- fSSUM.WriteLine(s.ToString)
-
- 'Untits
- s.Length = 0
- s.Append("Vehicle Type,[-],[h],[km],[km/h]")
- If GEN.VehMode = tVehMode.EV Then
- s.Append(Sepp & "[kWh/km]")
- Else
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[g/km]")
- s.Append(Sepp & "[#/km]")
- s.Append(Sepp & "[g/km]")
- End If
- fSSUM.WriteLine(s.ToString)
-
- '** Results per Veh-Type
- For Each VehType In ADV.FLTfleet.Keys
-
- s.Length = 0
-
- 'Type
- s.Append(VehType)
-
- 'Number of Vehicles
- s.Append(Sepp & VehCount(VehType))
-
- 'Travellingtime
- sum = VehTime(VehType)
- s.Append(Sepp & sum)
-
- 'km
- km = VehDist(VehType)
- s.Append(Sepp & km)
-
- 'Speed
- If sum = 0 Then
- s.Append(Sepp & "-")
- Else
- s.Append(Sepp & km / sum)
- End If
-
- 'Em
- For e = 0 To ADV.EMdim
- If km = 0 Then
- s.Append(Sepp & "-")
- Else
- s.Append(Sepp & EMsum(VehType)(e) / km)
- End If
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- Next
-
- '** Total
- s.Length = 0
-
- 'Type
- s.Append("Sum")
-
- 'Number of Vehicles
- s.Append(Sepp & CStr(AllVehCount()))
-
- 'Travelling-time
- sum = AllVehTime()
- s.Append(Sepp & CStr(sum))
-
- 'km
- km = AllVehDist()
- s.Append(Sepp & km)
-
- 'Speed
- If sum = 0 Then
- s.Append(Sepp & "-")
- Else
- s.Append(Sepp & km / sum)
- End If
-
- 'Em
- For e = 0 To ADV.EMdim
- If km = 0 Then
- s.Append(Sepp & "-")
- Else
- sum = 0
- For Each KVl In EMsum
- sum += KVl.Value(e)
- Next
- s.Append(Sepp & sum / km)
- End If
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- fSSUM.WriteLine(" ")
-
- '****************************************************************
- '*************************** Em absolut *************************
-
- 'Header
- s.Length = 0
- s.Append("*** Absolute Values ***")
- If GEN.VehMode = tVehMode.EV Then
- s.Append(Sepp & "EC")
- Else
- For e = 0 To ADV.EMdim
- s.Append(Sepp & MODdata.Em.EmComp(ADV.EMlist(e)).Name)
- Next
- End If
- fSSUM.WriteLine(s.ToString)
-
- 'Untits
- s.Length = 0
- s.Append("Vehicle Type")
- If GEN.VehMode = tVehMode.EV Then
- s.Append(Sepp & "[kWh]")
- Else
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[g]")
- s.Append(Sepp & "[#]")
- s.Append(Sepp & "[g]")
- End If
- fSSUM.WriteLine(s.ToString)
-
- '** Results per Veh-Type
- For Each VehType In ADV.FLTfleet.Keys
-
- s.Length = 0
-
- 'Type
- s.Append(VehType)
-
- 'Em
- For e = 0 To ADV.EMdim
- s.Append(Sepp & EMsum(VehType)(e))
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- Next
-
- '** Total
- s.Length = 0
-
- 'Type
- s.Append("Sum")
-
- 'Em
- For e = 0 To ADV.EMdim
- sum = 0
- For Each KVl In EMsum
- sum += KVl.Value(e)
- Next
- s.Append(Sepp & sum)
- Next
-
- 'Writing
- fSSUM.WriteLine(s.ToString)
-
- 'Close file
- fSSUM.Close()
-
- Return True
-
-
- End Function
-
- Public Function AllVehCount() As Integer
- Dim sum As Integer
- Dim KV As KeyValuePair(Of String, Integer)
- sum = 0
- For Each KV In VehCount
- sum += KV.Value
- Next
- Return sum
- End Function
-
- Public Function AllVehDist() As Double
- Dim sum As Double
- Dim KV As KeyValuePair(Of String, Double)
- sum = 0
- For Each KV In VehDist
- sum += KV.Value
- Next
- Return sum
- End Function
-
- Public Function AllVehTime() As Double
- Dim sum As Double
- Dim KV As KeyValuePair(Of String, Double)
- sum = 0
- For Each KV In VehTime
- sum += KV.Value
- Next
- Return sum
- End Function
-
- Public Function AllEm(ByVal EmKompNr As String) As Double
- Dim sum As Double
- Dim KV As KeyValuePair(Of String, List(Of Double))
- sum = 0
- For Each KV In EMsum
- sum += KV.Value(EmKompNr)
- Next
- Return sum
- End Function
-
-
-
- End Class
-
-
-
-
-End Class
-
diff --git a/VECTO/File Browser/FB_Global.vb b/VECTO/File Browser/FB_Global.vb
index c16170b77c4b674122fe17ac4c8196a9b0070952..adc85a3c02f1d6da0f386e96deb9e5e49848205d 100644
--- a/VECTO/File Browser/FB_Global.vb
+++ b/VECTO/File Browser/FB_Global.vb
@@ -7,7 +7,6 @@
'-----------------------------
Public fbWorkDir As cFileBrowser
Public fbGEN As cFileBrowser
- Public fbADV As cFileBrowser
Public fbFileLists As cFileBrowser
Public fbVEH As cFileBrowser
Public fbDRI As cFileBrowser
diff --git a/VECTO/GUI/F_ADV.Designer.vb b/VECTO/GUI/F_ADV.Designer.vb
deleted file mode 100644
index 827b74ea3abd797c5060a948d05f5cbbffe477c6..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ADV.Designer.vb
+++ /dev/null
@@ -1,415 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_ADV
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- <System.Diagnostics.DebuggerNonUserCode()> _
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As System.ComponentModel.IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
- <System.Diagnostics.DebuggerStepThrough()> _
- Private Sub InitializeComponent()
- Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(F_ADV))
- Me.TextBoxTEM = New System.Windows.Forms.TextBox()
- Me.TextBoxFLT = New System.Windows.Forms.TextBox()
- Me.ButtonTEM = New System.Windows.Forms.Button()
- Me.ButtonFLT = New System.Windows.Forms.Button()
- Me.TextBoxFZP = New System.Windows.Forms.TextBox()
- Me.ButtonFZP = New System.Windows.Forms.Button()
- Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
- Me.ToolStripStatusLabelADV = New System.Windows.Forms.ToolStripStatusLabel()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.TBseed = New System.Windows.Forms.TextBox()
- Me.CheckBoxMISKAM = New System.Windows.Forms.CheckBox()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.Label3 = New System.Windows.Forms.Label()
- Me.Label4 = New System.Windows.Forms.Label()
- Me.Label5 = New System.Windows.Forms.Label()
- Me.CheckBoxSTRfilter = New System.Windows.Forms.CheckBox()
- Me.ButOK = New System.Windows.Forms.Button()
- Me.ButCancel = New System.Windows.Forms.Button()
- Me.LbSTR = New System.Windows.Forms.ListBox()
- Me.ButSTRadd = New System.Windows.Forms.Button()
- Me.ButSTRrem = New System.Windows.Forms.Button()
- Me.LbFilter0 = New System.Windows.Forms.Label()
- Me.TbFilter = New System.Windows.Forms.TextBox()
- Me.LbFilter1 = New System.Windows.Forms.Label()
- Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
- Me.ToolStripBtNew = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtOpen = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtSave = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripBtSaveAs = New System.Windows.Forms.ToolStripButton()
- Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
- Me.ToolStripBtSendTo = New System.Windows.Forms.ToolStripButton()
- Me.StatusStrip1.SuspendLayout()
- Me.ToolStrip1.SuspendLayout()
- Me.SuspendLayout()
- '
- 'TextBoxTEM
- '
- Me.TextBoxTEM.Enabled = False
- Me.TextBoxTEM.Location = New System.Drawing.Point(15, 255)
- Me.TextBoxTEM.Name = "TextBoxTEM"
- Me.TextBoxTEM.Size = New System.Drawing.Size(402, 20)
- Me.TextBoxTEM.TabIndex = 13
- '
- 'TextBoxFLT
- '
- Me.TextBoxFLT.Location = New System.Drawing.Point(15, 211)
- Me.TextBoxFLT.Name = "TextBoxFLT"
- Me.TextBoxFLT.Size = New System.Drawing.Size(402, 20)
- Me.TextBoxFLT.TabIndex = 13
- '
- 'ButtonTEM
- '
- Me.ButtonTEM.Enabled = False
- Me.ButtonTEM.Location = New System.Drawing.Point(423, 254)
- Me.ButtonTEM.Name = "ButtonTEM"
- Me.ButtonTEM.Size = New System.Drawing.Size(28, 21)
- Me.ButtonTEM.TabIndex = 7
- Me.ButtonTEM.Text = "..."
- Me.ButtonTEM.UseVisualStyleBackColor = True
- '
- 'ButtonFLT
- '
- Me.ButtonFLT.Location = New System.Drawing.Point(423, 211)
- Me.ButtonFLT.Name = "ButtonFLT"
- Me.ButtonFLT.Size = New System.Drawing.Size(28, 21)
- Me.ButtonFLT.TabIndex = 6
- Me.ButtonFLT.Text = "..."
- Me.ButtonFLT.UseVisualStyleBackColor = True
- '
- 'TextBoxFZP
- '
- Me.TextBoxFZP.Location = New System.Drawing.Point(15, 167)
- Me.TextBoxFZP.Name = "TextBoxFZP"
- Me.TextBoxFZP.Size = New System.Drawing.Size(402, 20)
- Me.TextBoxFZP.TabIndex = 13
- '
- 'ButtonFZP
- '
- Me.ButtonFZP.Location = New System.Drawing.Point(423, 166)
- Me.ButtonFZP.Name = "ButtonFZP"
- Me.ButtonFZP.Size = New System.Drawing.Size(28, 21)
- Me.ButtonFZP.TabIndex = 5
- Me.ButtonFZP.Text = "..."
- Me.ButtonFZP.UseVisualStyleBackColor = True
- '
- 'StatusStrip1
- '
- Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabelADV})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 500)
- Me.StatusStrip1.Name = "StatusStrip1"
- Me.StatusStrip1.Size = New System.Drawing.Size(466, 22)
- Me.StatusStrip1.SizingGrip = False
- Me.StatusStrip1.TabIndex = 2
- Me.StatusStrip1.Text = "StatusStrip1"
- '
- 'ToolStripStatusLabelADV
- '
- Me.ToolStripStatusLabelADV.Name = "ToolStripStatusLabelADV"
- Me.ToolStripStatusLabelADV.Size = New System.Drawing.Size(138, 17)
- Me.ToolStripStatusLabelADV.Text = "ToolStripStatusLabelADV"
- '
- 'Label2
- '
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(12, 38)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(123, 13)
- Me.Label2.TabIndex = 4
- Me.Label2.Text = "Seed for fleet distribution"
- '
- 'TBseed
- '
- Me.TBseed.Location = New System.Drawing.Point(144, 35)
- Me.TBseed.Name = "TBseed"
- Me.TBseed.Size = New System.Drawing.Size(46, 20)
- Me.TBseed.TabIndex = 5
- '
- 'CheckBoxMISKAM
- '
- Me.CheckBoxMISKAM.AutoSize = True
- Me.CheckBoxMISKAM.Checked = True
- Me.CheckBoxMISKAM.CheckState = System.Windows.Forms.CheckState.Checked
- Me.CheckBoxMISKAM.Location = New System.Drawing.Point(15, 68)
- Me.CheckBoxMISKAM.Name = "CheckBoxMISKAM"
- Me.CheckBoxMISKAM.Size = New System.Drawing.Size(136, 17)
- Me.CheckBoxMISKAM.TabIndex = 6
- Me.CheckBoxMISKAM.Text = "Segment-related output" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
- Me.CheckBoxMISKAM.UseVisualStyleBackColor = True
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(12, 151)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(63, 13)
- Me.Label1.TabIndex = 7
- Me.Label1.Text = "Traffic Data"
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(12, 195)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(121, 13)
- Me.Label3.TabIndex = 8
- Me.Label3.Text = "Fleet Composition (.FLT)"
- '
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(12, 239)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(258, 13)
- Me.Label4.TabIndex = 9
- Me.Label4.Text = "Temperature Ditribution (not supported in this version)"
- '
- 'Label5
- '
- Me.Label5.AutoSize = True
- Me.Label5.Location = New System.Drawing.Point(12, 283)
- Me.Label5.Name = "Label5"
- Me.Label5.Size = New System.Drawing.Size(75, 13)
- Me.Label5.TabIndex = 10
- Me.Label5.Text = "Segment Data"
- '
- 'CheckBoxSTRfilter
- '
- Me.CheckBoxSTRfilter.AutoSize = True
- Me.CheckBoxSTRfilter.Location = New System.Drawing.Point(15, 91)
- Me.CheckBoxSTRfilter.Name = "CheckBoxSTRfilter"
- Me.CheckBoxSTRfilter.Size = New System.Drawing.Size(161, 17)
- Me.CheckBoxSTRfilter.TabIndex = 14
- Me.CheckBoxSTRfilter.Text = "Filter vehicles by segment ID"
- Me.CheckBoxSTRfilter.UseVisualStyleBackColor = True
- '
- 'ButOK
- '
- Me.ButOK.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButOK.Location = New System.Drawing.Point(298, 474)
- Me.ButOK.Name = "ButOK"
- Me.ButOK.Size = New System.Drawing.Size(75, 23)
- Me.ButOK.TabIndex = 15
- Me.ButOK.Text = "OK"
- Me.ButOK.UseVisualStyleBackColor = True
- '
- 'ButCancel
- '
- Me.ButCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.ButCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.ButCancel.Location = New System.Drawing.Point(379, 474)
- Me.ButCancel.Name = "ButCancel"
- Me.ButCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButCancel.TabIndex = 17
- Me.ButCancel.Text = "Cancel"
- Me.ButCancel.UseVisualStyleBackColor = True
- '
- 'LbSTR
- '
- Me.LbSTR.FormattingEnabled = True
- Me.LbSTR.HorizontalScrollbar = True
- Me.LbSTR.Location = New System.Drawing.Point(15, 299)
- Me.LbSTR.Name = "LbSTR"
- Me.LbSTR.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended
- Me.LbSTR.Size = New System.Drawing.Size(436, 121)
- Me.LbSTR.TabIndex = 18
- '
- 'ButSTRadd
- '
- Me.ButSTRadd.Location = New System.Drawing.Point(15, 426)
- Me.ButSTRadd.Name = "ButSTRadd"
- Me.ButSTRadd.Size = New System.Drawing.Size(137, 23)
- Me.ButSTRadd.TabIndex = 19
- Me.ButSTRadd.Text = "Add Files"
- Me.ButSTRadd.UseVisualStyleBackColor = True
- '
- 'ButSTRrem
- '
- Me.ButSTRrem.Location = New System.Drawing.Point(317, 426)
- Me.ButSTRrem.Name = "ButSTRrem"
- Me.ButSTRrem.Size = New System.Drawing.Size(137, 23)
- Me.ButSTRrem.TabIndex = 19
- Me.ButSTRrem.Text = "Remove Selected Files"
- Me.ButSTRrem.UseVisualStyleBackColor = True
- '
- 'LbFilter0
- '
- Me.LbFilter0.AutoSize = True
- Me.LbFilter0.Location = New System.Drawing.Point(37, 117)
- Me.LbFilter0.Name = "LbFilter0"
- Me.LbFilter0.Size = New System.Drawing.Size(195, 13)
- Me.LbFilter0.TabIndex = 20
- Me.LbFilter0.Text = "Distance filter for segment results output"
- '
- 'TbFilter
- '
- Me.TbFilter.Location = New System.Drawing.Point(238, 114)
- Me.TbFilter.Name = "TbFilter"
- Me.TbFilter.Size = New System.Drawing.Size(42, 20)
- Me.TbFilter.TabIndex = 21
- '
- 'LbFilter1
- '
- Me.LbFilter1.AutoSize = True
- Me.LbFilter1.Location = New System.Drawing.Point(286, 117)
- Me.LbFilter1.Name = "LbFilter1"
- Me.LbFilter1.Size = New System.Drawing.Size(21, 13)
- Me.LbFilter1.TabIndex = 22
- Me.LbFilter1.Text = "[%]"
- '
- 'ToolStrip1
- '
- Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
- Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripBtNew, Me.ToolStripBtOpen, Me.ToolStripBtSave, Me.ToolStripBtSaveAs, Me.ToolStripSeparator1, Me.ToolStripBtSendTo})
- Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
- Me.ToolStrip1.Name = "ToolStrip1"
- Me.ToolStrip1.Size = New System.Drawing.Size(466, 25)
- Me.ToolStrip1.TabIndex = 23
- Me.ToolStrip1.Text = "ToolStrip1"
- '
- 'ToolStripBtNew
- '
- Me.ToolStripBtNew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtNew.Image = Global.VECTO.My.Resources.Resources.blue_document_icon
- Me.ToolStripBtNew.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtNew.Name = "ToolStripBtNew"
- Me.ToolStripBtNew.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtNew.Text = "New"
- Me.ToolStripBtNew.ToolTipText = "New"
- '
- 'ToolStripBtOpen
- '
- Me.ToolStripBtOpen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtOpen.Image = Global.VECTO.My.Resources.Resources.Open_icon
- Me.ToolStripBtOpen.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtOpen.Name = "ToolStripBtOpen"
- Me.ToolStripBtOpen.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtOpen.Text = "Open"
- Me.ToolStripBtOpen.ToolTipText = "Open..."
- '
- 'ToolStripBtSave
- '
- Me.ToolStripBtSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSave.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_icon
- Me.ToolStripBtSave.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSave.Name = "ToolStripBtSave"
- Me.ToolStripBtSave.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtSave.Text = "Save"
- Me.ToolStripBtSave.ToolTipText = "Save"
- '
- 'ToolStripBtSaveAs
- '
- Me.ToolStripBtSaveAs.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSaveAs.Image = Global.VECTO.My.Resources.Resources.Actions_document_save_as_icon
- Me.ToolStripBtSaveAs.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSaveAs.Name = "ToolStripBtSaveAs"
- Me.ToolStripBtSaveAs.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtSaveAs.Text = "Save As"
- Me.ToolStripBtSaveAs.ToolTipText = "Save As..."
- '
- 'ToolStripSeparator1
- '
- Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(6, 25)
- '
- 'ToolStripBtSendTo
- '
- Me.ToolStripBtSendTo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
- Me.ToolStripBtSendTo.Image = Global.VECTO.My.Resources.Resources.export_icon
- Me.ToolStripBtSendTo.ImageTransparentColor = System.Drawing.Color.Magenta
- Me.ToolStripBtSendTo.Name = "ToolStripBtSendTo"
- Me.ToolStripBtSendTo.Size = New System.Drawing.Size(23, 22)
- Me.ToolStripBtSendTo.Text = "Send to ADV List"
- Me.ToolStripBtSendTo.ToolTipText = "Send to ADV List"
- '
- 'F_ADV
- '
- Me.AcceptButton = Me.ButOK
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.ButCancel
- Me.ClientSize = New System.Drawing.Size(466, 522)
- Me.Controls.Add(Me.ToolStrip1)
- Me.Controls.Add(Me.LbFilter1)
- Me.Controls.Add(Me.TbFilter)
- Me.Controls.Add(Me.LbFilter0)
- Me.Controls.Add(Me.ButSTRrem)
- Me.Controls.Add(Me.ButSTRadd)
- Me.Controls.Add(Me.LbSTR)
- Me.Controls.Add(Me.ButCancel)
- Me.Controls.Add(Me.ButOK)
- Me.Controls.Add(Me.CheckBoxSTRfilter)
- Me.Controls.Add(Me.Label5)
- Me.Controls.Add(Me.TextBoxTEM)
- Me.Controls.Add(Me.Label4)
- Me.Controls.Add(Me.ButtonTEM)
- Me.Controls.Add(Me.TextBoxFLT)
- Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.ButtonFLT)
- Me.Controls.Add(Me.TextBoxFZP)
- Me.Controls.Add(Me.Label1)
- Me.Controls.Add(Me.CheckBoxMISKAM)
- Me.Controls.Add(Me.TBseed)
- Me.Controls.Add(Me.ButtonFZP)
- Me.Controls.Add(Me.Label2)
- Me.Controls.Add(Me.StatusStrip1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
- Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
- Me.MaximizeBox = False
- Me.Name = "F_ADV"
- Me.Text = "ADV Editor"
- Me.StatusStrip1.ResumeLayout(False)
- Me.StatusStrip1.PerformLayout()
- Me.ToolStrip1.ResumeLayout(False)
- Me.ToolStrip1.PerformLayout()
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
- Friend WithEvents ButtonFZP As System.Windows.Forms.Button
- Friend WithEvents ButtonFLT As System.Windows.Forms.Button
- Friend WithEvents ButtonTEM As System.Windows.Forms.Button
- Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
- Friend WithEvents ToolStripStatusLabelADV As System.Windows.Forms.ToolStripStatusLabel
- Friend WithEvents Label2 As System.Windows.Forms.Label
- Friend WithEvents TBseed As System.Windows.Forms.TextBox
- Friend WithEvents CheckBoxMISKAM As System.Windows.Forms.CheckBox
- Friend WithEvents TextBoxTEM As System.Windows.Forms.TextBox
- Friend WithEvents TextBoxFLT As System.Windows.Forms.TextBox
- Friend WithEvents TextBoxFZP As System.Windows.Forms.TextBox
- Friend WithEvents Label1 As System.Windows.Forms.Label
- Friend WithEvents Label3 As System.Windows.Forms.Label
- Friend WithEvents Label4 As System.Windows.Forms.Label
- Friend WithEvents Label5 As System.Windows.Forms.Label
- Friend WithEvents CheckBoxSTRfilter As System.Windows.Forms.CheckBox
- Friend WithEvents ButOK As System.Windows.Forms.Button
- Friend WithEvents ButCancel As System.Windows.Forms.Button
- Friend WithEvents LbSTR As System.Windows.Forms.ListBox
- Friend WithEvents ButSTRadd As System.Windows.Forms.Button
- Friend WithEvents ButSTRrem As System.Windows.Forms.Button
- Friend WithEvents LbFilter0 As System.Windows.Forms.Label
- Friend WithEvents TbFilter As System.Windows.Forms.TextBox
- Friend WithEvents LbFilter1 As System.Windows.Forms.Label
- Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
- Friend WithEvents ToolStripBtNew As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripBtSave As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripBtSaveAs As System.Windows.Forms.ToolStripButton
- Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
- Friend WithEvents ToolStripBtSendTo As System.Windows.Forms.ToolStripButton
-End Class
diff --git a/VECTO/GUI/F_ADV.resx b/VECTO/GUI/F_ADV.resx
deleted file mode 100644
index 89a39fff2815e605ab2c90b8ad516a4ca4e0b81e..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ADV.resx
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>125, 17</value>
- </metadata>
- <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>349, 17</value>
- </metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAABAAMAICAQAAAAAADoAgAANgAAACAgAAABABgAqAwAAB4DAAAgIAAAAQAgAKgQAADGDwAAKAAAACAA
- AABAAAAAAQAEAAAAAACAAgAAAAAAAAAAAAAAAAAAAAAAADAQmADw8PgAoJjQAIBwwABoULAA4ODwAEAo
- oADY0OgAyMDgAJiIyACwqNgAUECoADAYmABwYLgA+Pj4AIh4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAADu7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u
- 7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u0E7u5gnsAMbY7u7qAN7u7qDFEYAF7Aa8DC
- 7u7QDB7u7mAAAAvuwK4dDF7hwMCu7u4wbdAC7sCu4cCe6gwwTu7ugMGAxe7Aru6w3uQDgMXu7uYK8E7u
- wK7uYD5cCuYC7u7pDWCu7sCu6AAuIMHjBO7u5wwMHu7AmCwGHrDe6Axe7u6wDe7uwAAAt+UAru5gnu7u
- r/fu7v//mO7o/x7ury7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u
- 7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7u7gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAP///////////////////////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
- ////////////////////////KAAAACAAAABAAAAAAQAYAAAAAACADAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////3ViujMXmW9bt/////////////z8/kMp
- oTMXmZmLzP///zQYmjMXmTMXmTgcnEkwpHRhusrD5f///////////////////7qx3TMXmTMXmXZju///
- /////////////////7613zMXmTgdnOnm9PPx+fPx+cK54TMXmTMXmeHd8P///zQYmjMXmUw0plY/qz0i
- njMXmTQYmqaa0////////////////3NguTMXmTMXmTofnfTz+v////////////////r5/UAloDMXmTMX
- mTMXmTMXmTMXmTMXmV1Hrv///////zQYmjMXmbKo2f////f2+3FeuDMXmTYam+Dc8P////////Lw+Tgd
- nDMXmTQYmjMXmbOp2f///////////////////4NywTMXmUAloHNguXFduDMXmTMXmaaZ0////////zQY
- mjMXmbKo2f////////f2+zgcnDMXmZaIy////////7Cl2DMXmT0inoFwwDMXmWxXtv//////////////
- /////8vE5TMXmTkenPX0+szF5jMXmTUZmuzq9v///////zQYmjMXmbKo2f///////////1hBrDMXmXlm
- vP///////2hTtDMXmXpovcvE5TMXmTYam+7r9/////////////////7+/0kwpDMXmbiu3Ih3xDMXmWpW
- tf///////////zQYmjMXmbKo2f///////////0ctozMXmYBuwP///+vp9TUZmjMXmb613/39/kUsojMX
- mamd1P///////////////////5CByDMXmXNguUctozMXmbOp2f///////////zQYmjMXmbKo2f//////
- /87H5zMXmTMXma2h1v///6aZ0zMXmTwinvj3/P///4V1wjMXmWFMsP///////////////////9nU7DMX
- mTQYmjMXmTofnfTz+v///////////zQYmjMXmZaIy8zF5qqf1T4jnzMXmUw0pvX0+v///11HrjMXmXlm
- vP///////8rC5TMXmTQYmuXh8v///////////////////1Q9qjMXmTMXmXhlvP///////////////zQY
- mjMXmTMXmTMXmTMXmTMXmVE5qN7Z7////+Le8TMXmTMXmbyz3v////////z8/kQqojMXmZ6Rz///////
- /////////////76134l5xIl5xNPM6f///////////////4l5xIl5xIl5xI1+xqGU0Ma/4/39/v//////
- /87H54l5xIl5xPf2+////////////7Cl2Il5xKaa0///////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAP///////////////////////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
- ////////////////////////KAAAACAAAABAAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////dWK6/zMXmf9vW7f//////////////////Pz+/0Mp
- of8zF5n/mYvM//////80GJr/MxeZ/zMXmf84HJz/STCk/3Rhuv/Kw+X/////////////////////////
- //+6sd3/MxeZ/zMXmf92Y7v///////////////////////////++td//MxeZ/zgdnP/p5vT/8/H5//Px
- +f/CueH/MxeZ/zMXmf/h3fD//////zQYmv8zF5n/TDSm/1Y/q/89Ip7/MxeZ/zQYmv+mmtP/////////
- /////////////3Nguf8zF5n/MxeZ/zofnf/08/r///////////////////////r5/f9AJaD/MxeZ/zMX
- mf8zF5n/MxeZ/zMXmf8zF5n/XUeu////////////NBia/zMXmf+yqNn///////f2+/9xXrj/MxeZ/zYa
- m//g3PD////////////y8Pn/OB2c/zMXmf80GJr/MxeZ/7Op2f///////////////////////////4Ny
- wf8zF5n/QCWg/3Nguf9xXbj/MxeZ/zMXmf+mmdP///////////80GJr/MxeZ/7Ko2f////////////f2
- +/84HJz/MxeZ/5aIy////////////7Cl2P8zF5n/PSKe/4FwwP8zF5n/bFe2////////////////////
- ////////y8Tl/zMXmf85Hpz/9fT6/8zF5v8zF5n/NRma/+zq9v///////////zQYmv8zF5n/sqjZ////
- /////////////1hBrP8zF5n/eWa8////////////aFO0/zMXmf96aL3/y8Tl/zMXmf82Gpv/7uv3////
- ///////////////////+/v//STCk/zMXmf+4rtz/iHfE/zMXmf9qVrX/////////////////NBia/zMX
- mf+yqNn/////////////////Ry2j/zMXmf+AbsD//////+vp9f81GZr/MxeZ/7613//9/f7/RSyi/zMX
- mf+pndT///////////////////////////+Qgcj/MxeZ/3Nguf9HLaP/MxeZ/7Op2f//////////////
- //80GJr/MxeZ/7Ko2f///////////87H5/8zF5n/MxeZ/62h1v//////ppnT/zMXmf88Ip7/+Pf8////
- //+FdcL/MxeZ/2FMsP///////////////////////////9nU7P8zF5n/NBia/zMXmf86H53/9PP6////
- /////////////zQYmv8zF5n/lojL/8zF5v+qn9X/PiOf/zMXmf9MNKb/9fT6//////9dR67/MxeZ/3lm
- vP///////////8rC5f8zF5n/NBia/+Xh8v///////////////////////////1Q9qv8zF5n/MxeZ/3hl
- vP//////////////////////NBia/zMXmf8zF5n/MxeZ/zMXmf8zF5n/UTmo/97Z7///////4t7x/zMX
- mf8zF5n/vLPe/////////////Pz+/0Qqov8zF5n/npHP////////////////////////////vrXf/4l5
- xP+JecT/08zp//////////////////////+JecT/iXnE/4l5xP+Nfsb/oZTQ/8a/4//9/f7/////////
- ///Ox+f/iXnE/4l5xP/39vv/////////////////sKXY/4l5xP+mmtP/////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAD///////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
- /////////////////////////////w==
-</value>
- </data>
-</root>
\ No newline at end of file
diff --git a/VECTO/GUI/F_ADV.vb b/VECTO/GUI/F_ADV.vb
deleted file mode 100644
index 1232e5f2a5f8d4b0a4c5cbcda7f78d88e44840d9..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ADV.vb
+++ /dev/null
@@ -1,323 +0,0 @@
-Public Class F_ADV
-
- Private Const IFanz As Int16 = 4
- Dim Advfile As String
- Dim Changed As Boolean = False
-
- 'Initialize
- Private Sub F05_ADV_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
- Changed = False
- End Sub
-
- 'Close
- Private Sub F05_ADV_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
- If e.CloseReason <> CloseReason.ApplicationExitCall And e.CloseReason <> CloseReason.WindowsShutDown Then
- e.Cancel = ChangeCheckCancel()
- End If
- End Sub
-
- 'InputFile controls ------------------------------------------
-
- 'Browse Button-Click Events
- Private Sub ButtonFZP_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonFZP.Click
- If fbFZP.OpenDialog(fFileRepl(Me.TextBoxFZP.Text, fPATH(Advfile))) Then Me.TextBoxFZP.Text = fbFZP.Files(0)
- End Sub
-
- Private Sub ButtonFLT_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonFLT.Click
- If fbFLT.OpenDialog(fFileRepl(Me.TextBoxFLT.Text, fPATH(Advfile))) Then Me.TextBoxFLT.Text = fbFLT.Files(0)
- End Sub
-
- Private Sub ButtonTEM_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonTEM.Click
- If fbTEM.OpenDialog(fFileRepl(Me.TextBoxTEM.Text, fPATH(Advfile))) Then Me.TextBoxTEM.Text = fbTEM.Files(0)
- End Sub
-
- Private Sub ButSTRadd_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButSTRadd.Click
- Dim file As String
- If Me.LbSTR.Items.Count > 0 Then
- file = Me.LbSTR.Items(Me.LbSTR.Items.Count - 1).ToString
- Else
- file = ""
- End If
- If fbSTR.OpenDialog(file, True) Then
- For Each file In fbSTR.Files
- Me.LbSTR.Items.Add(file)
- Next
- Change()
- End If
- End Sub
-
- Private Sub ButSTRrem_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButSTRrem.Click
- If Me.LbSTR.SelectedItems.Count > 0 Then Change()
- Do While Me.LbSTR.SelectedItems.Count > 0
- Me.LbSTR.Items.Remove(Me.LbSTR.SelectedItems(0))
- Loop
- End Sub
-
-#Region "Toolbar"
-
- 'New
- Private Sub ToolStripBtNew_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtNew.Click
- Call ADVnew()
- End Sub
-
- 'Open
- Private Sub ToolStripBtOpen_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtOpen.Click
- If fbADV.OpenDialog(Advfile) Then ADVload2Form(fbADV.Files(0))
- End Sub
-
- 'Save
- Private Sub ToolStripBtSave_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSave.Click
- Save()
- End Sub
-
- 'Save As
- Private Sub ToolStripBtSaveAs_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSaveAs.Click
- If fbADV.SaveDialog(Advfile) Then ADVsave(fbADV.Files(0))
- End Sub
-
- 'Send to ADV List
- Private Sub ToolStripBtSendTo_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtSendTo.Click
- If ChangeCheckCancel() Then Exit Sub
- If Advfile = "" Then
- MsgBox("File not found!" & ChrW(10) & ChrW(10) & "Save file and try again.")
- Else
- F_MAINForm.AddToListViewGEN(Advfile)
- Me.ToolStripStatusLabelADV.Text = Advfile & " sent to ADV List."
- End If
- End Sub
-
-#End Region
-
- 'Save ADV
- Private Function Save() As Boolean
- If Advfile = "" Then
- If fbADV.SaveDialog("") Then
- Advfile = fbADV.Files(0)
- Else
- Return False
- End If
- End If
- Return ADVsave(Advfile)
- End Function
-
-
-
- '-------------------------------------------------------------------
-
-
- 'New empty ADV
- Public Sub ADVnew()
- If ChangeCheckCancel() Then Exit Sub
- Me.TBseed.Text = "1"
- Me.TextBoxFZP.Text = ""
- Me.TextBoxFLT.Text = ""
- Me.TextBoxTEM.Text = ""
- Me.TbFilter.Text = "85"
- Me.LbSTR.Items.Clear()
- Me.ToolStripStatusLabelADV.Text = ""
- Me.CheckBoxMISKAM.Checked = False
- Me.CheckBoxSTRfilter.Checked = False
- Changed = False
- Advfile = ""
- Me.Text = "ADV Editor"
- Me.ToolStripStatusLabelADV.Text = "New file"
- End Sub
-
- 'Load ADV in Form
- Public Sub ADVload2Form(ByVal file As String)
- Dim ADV As cADV
- Dim i As Integer
-
- If Not IO.File.Exists(file) Then
- MsgBox("File not found!")
- Exit Sub
- End If
-
- If ChangeCheckCancel() Then Exit Sub
-
- ADVnew()
-
- ADV = New cADV
-
- ADV.FilePath = file
-
- If Not ADV.ReadFile() Then
- MsgBox("Cannot read file!")
- Exit Sub
- End If
-
- 'Line 1: FZP file
- Me.TextBoxFZP.Text = ADV.FZPpath(True)
-
- 'Line 2: FLT file
- Me.TextBoxFLT.Text = ADV.FLTpath(True)
-
- 'Line 3: TEM file
- Me.TextBoxTEM.Text = ADV.TEMpath(True)
-
- 'Line 4: RndSeed
- Me.TBseed.Text = ADV.RndSeed
-
- 'Line 5: MISKAMout True/False
- Me.CheckBoxMISKAM.Checked = ADV.SD3out
-
- 'Line 6: strFilter True/False
- Me.CheckBoxSTRfilter.Checked = ADV.STRfilter
-
- 'Line 7: Distance filter for SUM.STR
- Me.TbFilter.Text = ADV.STRSUMdistflt
-
- 'Line 8 +: STR files
- For i = 1 To ADV.STRcount
- Me.LbSTR.Items.Add(ADV.STRpaths(i - 1, True))
- Next
-
- Advfile = file
- Me.Text = IO.Path.GetFileName(file) & " - ADV Editor"
- Changed = False
- Me.ToolStripStatusLabelADV.Text = "" 'file
- End Sub
-
- 'Save ADV from Form
- Private Function ADVsave(ByVal file As String) As Boolean
- Dim ADV As cADV
- Dim s As String
-
- ADV = New cADV
-
- ADV.FilePath = file
-
- ADV.FZPpath = Me.TextBoxFZP.Text
-
- ADV.FLTpath = Me.TextBoxFLT.Text
-
- ADV.TEMpath = Me.TextBoxTEM.Text
-
- ADV.RndSeed = Me.TBseed.Text
-
- ADV.SD3out = Me.CheckBoxMISKAM.Checked
-
- ADV.STRfilter = Me.CheckBoxSTRfilter.Checked
-
- ADV.STRSUMdistflt = Me.TbFilter.Text
-
- 'ADV.STRpathsClear() '<= Nicht notwendig da neues lokales cADV-Objekt |@@| ADV.STRpathsClear() '<= Not necessary because new local cADV object
- For Each s In Me.LbSTR.Items
- ADV.STRpathsAdd(s)
- Next
-
- If Not ADV.SaveFile Then
- MsgBox("Cannot safe to " & file, MsgBoxStyle.Critical)
- Return False
- End If
-
- Advfile = file
-
- Me.Text = fFILE(file, True) & " - ADV Editor"
- Advfile = file
-
- Me.ToolStripStatusLabelADV.Text = file & " saved."
-
- F_MAINForm.AddToListViewGEN(Advfile)
-
- Changed = False
-
- Return True
-
- End Function
-
- 'TEMformCreator
- Sub TEMfromCreator(ByVal txt As String)
- Me.TextBoxTEM.Text = txt
- End Sub
-
- 'Form changes (control whether GEN saved) ---------------------------------
- 'Event handler for the Form changes
-
- 'Change Status ändern |@@| Change Status change
- Private Sub Change()
- Me.ToolStripStatusLabelADV.Text = "Unsaved changes in current file"
- Changed = True
- End Sub
-
- ' "Save changes? "... Return True if user aborts
- Private Function ChangeCheckCancel() As Boolean
-
- If Changed Then
-
- Select Case MsgBox("Save changes ?", MsgBoxStyle.YesNoCancel)
- Case MsgBoxResult.Yes
- Return Not Save()
- Case MsgBoxResult.Cancel
- Return True
- Case Else ' MsgBoxResult.No
- Changed = False
- Return False
- End Select
-
- Else
-
- Return False
-
- End If
-
- End Function
- '-----------------------------------------------------------------------------------
-
-
-
-#Region "Control-Enables und Change!"
-
- Private Sub CBMISKAM_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CheckBoxMISKAM.CheckedChanged
- If Me.CheckBoxMISKAM.Checked Then
- Me.CheckBoxSTRfilter.Checked = True
- Me.CheckBoxSTRfilter.Enabled = False
- Else
- Me.CheckBoxSTRfilter.Enabled = True
- End If
- Change()
- End Sub
-
- Private Sub CheckBoxSTRfilter_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles CheckBoxSTRfilter.CheckedChanged
- Me.LbSTR.Enabled = Me.CheckBoxSTRfilter.Checked
- Me.ButSTRadd.Enabled = Me.CheckBoxSTRfilter.Checked
- Me.ButSTRrem.Enabled = Me.CheckBoxSTRfilter.Checked
- Me.TbFilter.Enabled = Me.CheckBoxSTRfilter.Checked
- Me.LbFilter0.Enabled = Me.CheckBoxSTRfilter.Checked
- Me.LbFilter1.Enabled = Me.CheckBoxSTRfilter.Checked
- Change()
- End Sub
-
- Private Sub TextBoxFZP_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TextBoxFZP.TextChanged
- Change()
- End Sub
-
- Private Sub TextBoxFLT_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TextBoxFLT.TextChanged
- Change()
- End Sub
-
- Private Sub TextBoxTEM_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TextBoxTEM.TextChanged
- Change()
- End Sub
-
- Private Sub TbFilter_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TbFilter.TextChanged
- Change()
- End Sub
-
-#End Region
-
-
-
- 'OK (Save & Close)
- Private Sub ButSaveClose_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButOK.Click
- If Not Save() Then Exit Sub
- Me.Close()
- End Sub
-
- 'Cancel
- Private Sub ButCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButCancel.Click
- Me.Close()
- End Sub
-
-
-End Class
diff --git a/VECTO/GUI/F_ADVfzp.Designer.vb b/VECTO/GUI/F_ADVfzp.Designer.vb
deleted file mode 100644
index 497a34216ce5029650eec58d7b566c208e78d30e..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ADVfzp.Designer.vb
+++ /dev/null
@@ -1,164 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_ADVfzp
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- <System.Diagnostics.DebuggerNonUserCode()> _
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As System.ComponentModel.IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
- <System.Diagnostics.DebuggerStepThrough()> _
- Private Sub InitializeComponent()
- Me.components = New System.ComponentModel.Container
- Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel
- Me.OK_Button = New System.Windows.Forms.Button
- Me.Cancel_Button = New System.Windows.Forms.Button
- Me.RbUseSFZP = New System.Windows.Forms.RadioButton
- Me.RbUseFZP = New System.Windows.Forms.RadioButton
- Me.RBAbort = New System.Windows.Forms.RadioButton
- Me.LbTimer = New System.Windows.Forms.Label
- Me.LbMsg = New System.Windows.Forms.Label
- Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
- Me.TableLayoutPanel1.SuspendLayout()
- Me.SuspendLayout()
- '
- 'TableLayoutPanel1
- '
- Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TableLayoutPanel1.ColumnCount = 2
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
- Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(194, 134)
- Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
- Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
- Me.TableLayoutPanel1.TabIndex = 0
- '
- 'OK_Button
- '
- Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.OK_Button.Location = New System.Drawing.Point(3, 3)
- Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
- Me.OK_Button.Text = "OK"
- '
- 'Cancel_Button
- '
- Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
- Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
- Me.Cancel_Button.Text = "Cancel"
- '
- 'RbUseSFZP
- '
- Me.RbUseSFZP.AutoSize = True
- Me.RbUseSFZP.Checked = True
- Me.RbUseSFZP.Location = New System.Drawing.Point(20, 48)
- Me.RbUseSFZP.Name = "RbUseSFZP"
- Me.RbUseSFZP.Size = New System.Drawing.Size(187, 17)
- Me.RbUseSFZP.TabIndex = 1
- Me.RbUseSFZP.TabStop = True
- Me.RbUseSFZP.Text = "Use the .sfzp file. Sorting disabled."
- Me.RbUseSFZP.UseVisualStyleBackColor = True
- '
- 'RbUseFZP
- '
- Me.RbUseFZP.AutoSize = True
- Me.RbUseFZP.Location = New System.Drawing.Point(20, 71)
- Me.RbUseFZP.Name = "RbUseFZP"
- Me.RbUseFZP.Size = New System.Drawing.Size(317, 17)
- Me.RbUseFZP.TabIndex = 2
- Me.RbUseFZP.Text = "Use the original .fzp file. The existing .sfzp file will be replaced."
- Me.RbUseFZP.UseVisualStyleBackColor = True
- '
- 'RBAbort
- '
- Me.RBAbort.AutoSize = True
- Me.RBAbort.Location = New System.Drawing.Point(20, 94)
- Me.RBAbort.Name = "RBAbort"
- Me.RBAbort.Size = New System.Drawing.Size(53, 17)
- Me.RBAbort.TabIndex = 3
- Me.RBAbort.Text = "Abort."
- Me.RBAbort.UseVisualStyleBackColor = True
- '
- 'LbTimer
- '
- Me.LbTimer.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.LbTimer.AutoSize = True
- Me.LbTimer.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.LbTimer.Location = New System.Drawing.Point(12, 142)
- Me.LbTimer.Name = "LbTimer"
- Me.LbTimer.Size = New System.Drawing.Size(74, 13)
- Me.LbTimer.TabIndex = 4
- Me.LbTimer.Text = "Closing Dialog"
- '
- 'LbMsg
- '
- Me.LbMsg.AutoSize = True
- Me.LbMsg.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.LbMsg.Location = New System.Drawing.Point(12, 19)
- Me.LbMsg.Name = "LbMsg"
- Me.LbMsg.Size = New System.Drawing.Size(57, 13)
- Me.LbMsg.TabIndex = 5
- Me.LbMsg.Text = "Message"
- '
- 'Timer1
- '
- Me.Timer1.Interval = 1000
- '
- 'F_ADVfzp
- '
- Me.AcceptButton = Me.OK_Button
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New System.Drawing.Size(352, 175)
- Me.Controls.Add(Me.LbMsg)
- Me.Controls.Add(Me.LbTimer)
- Me.Controls.Add(Me.RBAbort)
- Me.Controls.Add(Me.RbUseFZP)
- Me.Controls.Add(Me.RbUseSFZP)
- Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
- Me.MaximizeBox = False
- Me.MinimizeBox = False
- Me.Name = "F_ADVfzp"
- Me.ShowInTaskbar = False
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
- Me.Text = "PHEM ADVANCE"
- Me.TableLayoutPanel1.ResumeLayout(False)
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
- Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
- Friend WithEvents OK_Button As System.Windows.Forms.Button
- Friend WithEvents Cancel_Button As System.Windows.Forms.Button
- Friend WithEvents RbUseSFZP As System.Windows.Forms.RadioButton
- Friend WithEvents RbUseFZP As System.Windows.Forms.RadioButton
- Friend WithEvents RBAbort As System.Windows.Forms.RadioButton
- Friend WithEvents LbTimer As System.Windows.Forms.Label
- Friend WithEvents LbMsg As System.Windows.Forms.Label
- Friend WithEvents Timer1 As System.Windows.Forms.Timer
-
-End Class
diff --git a/VECTO/GUI/F_ADVfzp.resx b/VECTO/GUI/F_ADVfzp.resx
deleted file mode 100644
index b6156eff6c9ce0e44ff015c33d89f62729a24092..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ADVfzp.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
-</root>
\ No newline at end of file
diff --git a/VECTO/GUI/F_ADVfzp.vb b/VECTO/GUI/F_ADVfzp.vb
deleted file mode 100644
index 2f8f4897db5ed896ee7a6ea07f805c0de4902f6f..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ADVfzp.vb
+++ /dev/null
@@ -1,68 +0,0 @@
-Imports System.Windows.Forms
-
-Public Class F_ADVfzp
-
- Private TimerTime As Int16
-
- Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
- Me.DialogResult = System.Windows.Forms.DialogResult.OK
- Me.Close()
- End Sub
-
- Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
- Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Close()
- End Sub
-
- Private Sub F_ADVfzp_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Click
- TimerAbort()
- End Sub
-
- Private Sub F_ADVfzp_Shown(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Shown
- TimerTime = 10
- Me.LbTimer.Text = "Closing Dialog in " & TimerTime & "s"
- Me.Timer1.Start()
- End Sub
-
- Private Sub TimerAbort()
- Me.Timer1.Stop()
- Me.LbTimer.Text = " "
- End Sub
-
- Public Function Answer(ByVal MsgText As String) As Int16
- Me.LbMsg.Text = MsgText
- If Me.ShowDialog() = Windows.Forms.DialogResult.OK Then
- If Me.RbUseSFZP.Checked Then
- Return 0
- ElseIf Me.RbUseFZP.Checked Then
- Return 1
- Else
- Return 2
- End If
- Else
- Return 2
- End If
- End Function
-
- Private Sub Timer1_Tick(ByVal sender As Object, ByVal e As System.EventArgs) Handles Timer1.Tick
- TimerTime -= 1S
- If TimerTime = 0 Then
- Me.Timer1.Stop()
- Me.DialogResult = Windows.Forms.DialogResult.OK
- Me.Close()
- End If
- Me.LbTimer.Text = "Closing Dialog in " & TimerTime & "s"
- End Sub
-
- Private Sub RbUseSFZP_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles RbUseSFZP.CheckedChanged
- TimerAbort()
- End Sub
-
- Private Sub RbUseFZP_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles RbUseFZP.CheckedChanged
- TimerAbort()
- End Sub
-
- Private Sub LbTimer_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles LbTimer.Click
- TimerAbort()
- End Sub
-End Class
diff --git a/VECTO/GUI/F_GEN.vb b/VECTO/GUI/F_GEN.vb
index f4b9377b5a2a452e3bbd19fed2a77b7734a04447..6af8cba3aaad07d479fcc71c94d0e8693884d99b 100644
--- a/VECTO/GUI/F_GEN.vb
+++ b/VECTO/GUI/F_GEN.vb
@@ -858,7 +858,7 @@ Public Class F_GEN
Me.ToolStripStatusLabelGEN.Text = ""
- If PHEMmode <> tPHEMmode.ModeADVANCE Then F_MAINForm.AddToListViewGEN(Genfile)
+ F_MAINForm.AddToListViewGEN(Genfile)
Changed = False
diff --git a/VECTO/GUI/F_MAINForm.Designer.vb b/VECTO/GUI/F_MAINForm.Designer.vb
index e2ace3deb68592a1b34e41a45cc1213d57bd55a0..dca853e94a2a7fd03fe47827f34c577e7dc5434c 100644
--- a/VECTO/GUI/F_MAINForm.Designer.vb
+++ b/VECTO/GUI/F_MAINForm.Designer.vb
@@ -104,13 +104,9 @@ Partial Class F_MAINForm
Me.VEHEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.EngineEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GearboxEditorToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ADVEditorToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.GRAPHiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator()
Me.SignOrVerifyFilesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
- Me.CreateTEMFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.SplitMODFilesToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
Me.OpenLogToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ChangeWorkingDirectoryToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
@@ -889,7 +885,7 @@ Partial Class F_MAINForm
'
'ToolStripDrDnBtTools
'
- Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.ADVEditorToolStripMenuItem1, Me.GRAPHiToolStripMenuItem, Me.ToolStripSeparator6, Me.SignOrVerifyFilesToolStripMenuItem, Me.ToolStripSeparator1, Me.CreateTEMFileToolStripMenuItem, Me.SplitMODFilesToolStripMenuItem, Me.ToolStripSeparator4, Me.OpenLogToolStripMenuItem, Me.ChangeWorkingDirectoryToolStripMenuItem1, Me.SettingsToolStripMenuItem})
+ Me.ToolStripDrDnBtTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GENEditorToolStripMenuItem1, Me.VEHEditorToolStripMenuItem, Me.EngineEditorToolStripMenuItem, Me.GearboxEditorToolStripMenuItem, Me.GRAPHiToolStripMenuItem, Me.ToolStripSeparator6, Me.SignOrVerifyFilesToolStripMenuItem, Me.ToolStripSeparator4, Me.OpenLogToolStripMenuItem, Me.ChangeWorkingDirectoryToolStripMenuItem1, Me.SettingsToolStripMenuItem})
Me.ToolStripDrDnBtTools.Image = Global.VECTO.My.Resources.Resources.Misc_Tools_icon
Me.ToolStripDrDnBtTools.ImageTransparentColor = System.Drawing.Color.Magenta
Me.ToolStripDrDnBtTools.Name = "ToolStripDrDnBtTools"
@@ -920,13 +916,6 @@ Partial Class F_MAINForm
Me.GearboxEditorToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.GearboxEditorToolStripMenuItem.Text = "Gearbox Editor"
'
- 'ADVEditorToolStripMenuItem1
- '
- Me.ADVEditorToolStripMenuItem1.Name = "ADVEditorToolStripMenuItem1"
- Me.ADVEditorToolStripMenuItem1.Size = New System.Drawing.Size(214, 22)
- Me.ADVEditorToolStripMenuItem1.Text = "ADV Editor"
- Me.ADVEditorToolStripMenuItem1.Visible = False
- '
'GRAPHiToolStripMenuItem
'
Me.GRAPHiToolStripMenuItem.Name = "GRAPHiToolStripMenuItem"
@@ -945,25 +934,6 @@ Partial Class F_MAINForm
Me.SignOrVerifyFilesToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
Me.SignOrVerifyFilesToolStripMenuItem.Text = "Sign or Verify Files"
'
- 'ToolStripSeparator1
- '
- Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(211, 6)
- '
- 'CreateTEMFileToolStripMenuItem
- '
- Me.CreateTEMFileToolStripMenuItem.Name = "CreateTEMFileToolStripMenuItem"
- Me.CreateTEMFileToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
- Me.CreateTEMFileToolStripMenuItem.Text = "Create TEM File"
- Me.CreateTEMFileToolStripMenuItem.Visible = False
- '
- 'SplitMODFilesToolStripMenuItem
- '
- Me.SplitMODFilesToolStripMenuItem.Name = "SplitMODFilesToolStripMenuItem"
- Me.SplitMODFilesToolStripMenuItem.Size = New System.Drawing.Size(214, 22)
- Me.SplitMODFilesToolStripMenuItem.Text = "Split MOD Files"
- Me.SplitMODFilesToolStripMenuItem.Visible = False
- '
'ToolStripSeparator4
'
Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@@ -1186,11 +1156,7 @@ Partial Class F_MAINForm
Friend WithEvents ToolStripBtOpen As System.Windows.Forms.ToolStripButton
Friend WithEvents ToolStripDrDnBtTools As System.Windows.Forms.ToolStripDropDownButton
Friend WithEvents GENEditorToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ADVEditorToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents VEHEditorToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
- Friend WithEvents CreateTEMFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents SplitMODFilesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ToolStripSeparator4 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents OpenLogToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ChangeWorkingDirectoryToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
diff --git a/VECTO/GUI/F_MAINForm.vb b/VECTO/GUI/F_MAINForm.vb
index 69ce453b362a25d12a3241f35afa070677c63f03..29dccb0e042aa8522d4c535992619dd4001d1815 100644
--- a/VECTO/GUI/F_MAINForm.vb
+++ b/VECTO/GUI/F_MAINForm.vb
@@ -12,8 +12,6 @@ Public Class F_MAINForm
Private ConMenTarget As ListView
Private ConMenTarGEN As Boolean
- Private BGjob As tBGjob
-
Private MODpath As String
Private MODVehList As Int32()
@@ -62,18 +60,12 @@ Public Class F_MAINForm
#End Region
- Private Enum tBGjob As Short
- PHEM = 0
- ModFilter = 1
- End Enum
-
#Region "FileBrowser Init/Close"
Private Sub FB_Initialize()
FB_Init = False
fbWorkDir = New cFileBrowser("WorkDir", True)
fbFileLists = New cFileBrowser("FileLists")
fbGEN = New cFileBrowser("gen")
- fbADV = New cFileBrowser("adv")
fbVEH = New cFileBrowser("vveh")
fbMAP = New cFileBrowser("vmap")
fbDRI = New cFileBrowser("vdri")
@@ -107,7 +99,6 @@ Public Class F_MAINForm
'-------------------------------------------------------
fbFileLists.Extensions = New String() {"txt"}
fbGEN.Extensions = New String() {"vecto"}
- fbADV.Extensions = New String() {"adv"}
fbVEH.Extensions = New String() {"vveh"}
fbMAP.Extensions = New String() {"vmap"}
fbDRI.Extensions = New String() {"vdri"}
@@ -142,7 +133,6 @@ Public Class F_MAINForm
fbWorkDir.Close()
fbFileLists.Close()
fbGEN.Close()
- fbADV.Close()
fbVEH.Close()
fbMAP.Close()
fbDRI.Close()
@@ -180,6 +170,7 @@ Public Class F_MAINForm
'PHEM-Launcher
Public Sub PHEM_Launcher()
Dim ProgOverall As Boolean
+ Dim GEN0 As cGEN
'Called when PHEM already running
If PHEMworker.IsBusy Then
@@ -196,8 +187,6 @@ Public Class F_MAINForm
PHEMmode = tPHEMmode.ModeSTANDARD
Case 1
PHEMmode = tPHEMmode.ModeBATCH
- Case 2
- PHEMmode = tPHEMmode.ModeADVANCE
End Select
'Wenn mehr als 100 Kombinationen in Batch fragen ob sekündliche Ausgabe |@@| When Batch resulting in more than 100 combinations per second, ask whether to dump-output per second
@@ -224,10 +213,19 @@ Public Class F_MAINForm
SetCycleList()
'Check whether Overall-progbar is needed
- ProgOverall = PHEMmode <> tPHEMmode.ModeADVANCE ' JobFileList.Count > 1 Or PHEMmode = tPHEMmode.ModeBATCH
+ If PHEMmode = tPHEMmode.ModeBATCH Or JobFileList.Count > 1 Then
+ ProgOverall = True
+ Else
+ GEN0 = New cGEN
+ GEN0.FilePath = JobFileList(0)
+ If Not GEN0.ReadFile Then
+ GUImsg(tMsgID.Err, "Failed to job file (" & fFILE(JobFileList(0), True) & ")!")
+ Exit Sub
+ End If
+ ProgOverall = (GEN0.CycleFiles.Count > 1)
+ End If
'Launch through Job_Launcher
- BGjob = tBGjob.PHEM
Job_Launcher(ProgOverall)
End Sub
@@ -354,14 +352,9 @@ Public Class F_MAINForm
End Try
End If
- Select Case BGjob
- Case tBGjob.PHEM
- e.Result = VECTO()
- Case tBGjob.ModFilter
- ADV = New cADVANCE_V3
- ADV.AusgModCut(MODpath, MODVehList)
- ADV = Nothing
- End Select
+ e.Result = VECTO()
+
+
End Sub
'Progress Report
@@ -421,21 +414,11 @@ Public Class F_MAINForm
Result = e.Result
- Select Case BGjob
-
- Case tBGjob.PHEM
-
- 'Falls Optimierer aktiv werden hier die Zielfunktion ausgegeben und Signal an Interface |@@| If Optimizers(Optimierer ) are active here, then dump the Objective-function(Zielfunktion ) and Signal to interface
- If bOptOn Then
- If Result = tCalcResult.Err Or Result = tCalcResult.Abort Then OptERstat = True
- OptEND()
- End If
-
- Case tBGjob.ModFilter
-
- ReDim MODVehList(-1)
-
- End Select
+ 'Falls Optimierer aktiv werden hier die Zielfunktion ausgegeben und Signal an Interface |@@| If Optimizers(Optimierer ) are active here, then dump the Objective-function(Zielfunktion ) and Signal to interface
+ If bOptOn Then
+ If Result = tCalcResult.Err Or Result = tCalcResult.Abort Then OptERstat = True
+ OptEND()
+ End If
'ShutDown when Unexpected Error
If e.Error IsNot Nothing Then
@@ -877,20 +860,12 @@ Public Class F_MAINForm
x = New String() {""}
- If LastModeIndex = 2 Then
- 'ADVANCE
- If fbADV.OpenDialog("", True) Then
- Chck = True
- x = fbADV.Files
- End If
- Else
- 'STANDARD/BATCH
- If fbGEN.OpenDialog("", True, "vecto") Then
- Chck = True
- x = fbGEN.Files
- End If
+ 'STANDARD/BATCH
+ If fbGEN.OpenDialog("", True, "vecto") Then
+ Chck = True
+ x = fbGEN.Files
End If
-
+
If Chck Then AddToListViewGEN(x)
End Sub
@@ -912,11 +887,7 @@ Public Class F_MAINForm
If Not IO.File.Exists(f) Then
MsgBox(f & " not found!")
Else
- If UCase(Microsoft.VisualBasic.Right(f, 4)) = ".ADV" Then
- OpenADVEditor(f)
- Else
- OpenGENEditor(f)
- End If
+ OpenGENEditor(f)
End If
End Sub
@@ -1264,32 +1235,22 @@ lbFound:
'New GEN/ADV
Private Sub ToolStripBtNew_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtNew.Click
- If LastModeIndex = 2 Then
- OpenADVEditor("<New>")
- Else
- OpenGENEditor("<New>")
- End If
+ OpenGENEditor("<New>")
End Sub
'Open GEN/ADV
Private Sub ToolStripBtOpen_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripBtOpen.Click
- If LastModeIndex = 2 Then
- If fbADV.OpenDialog("") Then OpenADVEditor(fbADV.Files(0))
- Else
- If fbGEN.OpenDialog("", False, "vecto,vveh,vgbx,veng,vsig") Then
- OpenVectoFile(fbGEN.Files(0))
- End If
+
+ If fbGEN.OpenDialog("", False, "vecto,vveh,vgbx,veng,vsig") Then
+ OpenVectoFile(fbGEN.Files(0))
End If
+
End Sub
Private Sub GENEditorToolStripMenuItem1_Click(sender As System.Object, e As System.EventArgs) Handles GENEditorToolStripMenuItem1.Click
OpenGENEditor("<New>")
End Sub
- Private Sub ADVEditorToolStripMenuItem1_Click(sender As System.Object, e As System.EventArgs) Handles ADVEditorToolStripMenuItem1.Click
- OpenADVEditor("<New>")
- End Sub
-
Private Sub VEHEditorToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles VEHEditorToolStripMenuItem.Click
If Not F_VEH.Visible Then
F_VEH.Show()
@@ -1339,26 +1300,6 @@ lbFound:
End Sub
- Private Sub CreateTEMFileToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles CreateTEMFileToolStripMenuItem.Click
- F_TEM_Creator.Show()
- F_TEM_Creator.Focus()
- End Sub
-
- Private Sub SplitMODFilesToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles SplitMODFilesToolStripMenuItem.Click
- If PHEMworker.IsBusy Then Exit Sub
-
- If F_ModSplit.ShowDialog = Windows.Forms.DialogResult.OK Then
- MODpath = F_ModSplit.ModPath
- MODVehList = F_ModSplit.VehList
- Else
- Exit Sub
- End If
-
- 'Worker start
- BGjob = tBGjob.ModFilter
- Job_Launcher(False)
- End Sub
-
Private Sub OpenLogToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles OpenLogToolStripMenuItem.Click
System.Diagnostics.Process.Start(MyAppPath & "log.txt")
End Sub
@@ -1618,8 +1559,6 @@ lbFound:
PHEMmode = tPHEMmode.ModeSTANDARD
Case 1
PHEMmode = tPHEMmode.ModeBATCH
- Case 2
- PHEMmode = tPHEMmode.ModeADVANCE
End Select
'Load New List
@@ -1829,21 +1768,10 @@ lbFound:
End Sub
- 'Open ADV-editor and load file
- Friend Sub OpenADVEditor(ByVal x As String)
- If Not F_ADV.Visible Then
- F_ADV.Show()
- If x = "<New>" Then F_ADV.ADVnew()
- End If
- F_ADV.WindowState = FormWindowState.Normal
- If x <> "<New>" Then Call F_ADV.ADVload2Form(x)
- F_ADV.Activate()
- End Sub
-
Friend Sub OpenSigFile(ByVal file As String)
If Not F_FileSign.Visible Then
F_FileSign.Show()
-
+
End If
F_FileSign.WindowState = FormWindowState.Normal
F_FileSign.TbSigFile.Text = file
@@ -1955,8 +1883,6 @@ lbFound:
PHEMmode = tPHEMmode.ModeSTANDARD
Case 1
PHEMmode = tPHEMmode.ModeBATCH
- Case 2
- PHEMmode = tPHEMmode.ModeADVANCE
End Select
End Sub
diff --git a/VECTO/GUI/F_ModSplit.Designer.vb b/VECTO/GUI/F_ModSplit.Designer.vb
deleted file mode 100644
index 166526ba64c11cfd5deb665010bd0d024451f3c5..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ModSplit.Designer.vb
+++ /dev/null
@@ -1,158 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_ModSplit
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- <System.Diagnostics.DebuggerNonUserCode()> _
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As System.ComponentModel.IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
- <System.Diagnostics.DebuggerStepThrough()> _
- Private Sub InitializeComponent()
- Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
- Me.OK_Button = New System.Windows.Forms.Button()
- Me.Cancel_Button = New System.Windows.Forms.Button()
- Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
- Me.TextBoxPath = New System.Windows.Forms.TextBox()
- Me.ButBrowse = New System.Windows.Forms.Button()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.ButClear = New System.Windows.Forms.Button()
- Me.TableLayoutPanel1.SuspendLayout()
- Me.SuspendLayout()
- '
- 'TableLayoutPanel1
- '
- Me.TableLayoutPanel1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.TableLayoutPanel1.ColumnCount = 2
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Controls.Add(Me.OK_Button, 0, 0)
- Me.TableLayoutPanel1.Controls.Add(Me.Cancel_Button, 1, 0)
- Me.TableLayoutPanel1.Location = New System.Drawing.Point(277, 274)
- Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
- Me.TableLayoutPanel1.RowCount = 1
- Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
- Me.TableLayoutPanel1.Size = New System.Drawing.Size(146, 29)
- Me.TableLayoutPanel1.TabIndex = 0
- '
- 'OK_Button
- '
- Me.OK_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.OK_Button.Location = New System.Drawing.Point(3, 3)
- Me.OK_Button.Name = "OK_Button"
- Me.OK_Button.Size = New System.Drawing.Size(67, 23)
- Me.OK_Button.TabIndex = 0
- Me.OK_Button.Text = "OK"
- '
- 'Cancel_Button
- '
- Me.Cancel_Button.Anchor = System.Windows.Forms.AnchorStyles.None
- Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Cancel_Button.Location = New System.Drawing.Point(76, 3)
- Me.Cancel_Button.Name = "Cancel_Button"
- Me.Cancel_Button.Size = New System.Drawing.Size(67, 23)
- Me.Cancel_Button.TabIndex = 1
- Me.Cancel_Button.Text = "Cancel"
- '
- 'RichTextBox1
- '
- Me.RichTextBox1.Location = New System.Drawing.Point(15, 82)
- Me.RichTextBox1.Name = "RichTextBox1"
- Me.RichTextBox1.Size = New System.Drawing.Size(405, 186)
- Me.RichTextBox1.TabIndex = 1
- Me.RichTextBox1.Text = ""
- Me.RichTextBox1.WordWrap = False
- '
- 'TextBoxPath
- '
- Me.TextBoxPath.Location = New System.Drawing.Point(15, 25)
- Me.TextBoxPath.Name = "TextBoxPath"
- Me.TextBoxPath.Size = New System.Drawing.Size(376, 20)
- Me.TextBoxPath.TabIndex = 2
- '
- 'ButBrowse
- '
- Me.ButBrowse.Location = New System.Drawing.Point(397, 25)
- Me.ButBrowse.Name = "ButBrowse"
- Me.ButBrowse.Size = New System.Drawing.Size(26, 20)
- Me.ButBrowse.TabIndex = 3
- Me.ButBrowse.Text = "..."
- Me.ButBrowse.UseVisualStyleBackColor = True
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(12, 66)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(254, 13)
- Me.Label1.TabIndex = 4
- Me.Label1.Text = "Vehicle Numbers separated by Comma or Line-break"
- '
- 'Label2
- '
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(12, 9)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(44, 13)
- Me.Label2.TabIndex = 4
- Me.Label2.Text = "Filepath"
- '
- 'ButClear
- '
- Me.ButClear.Location = New System.Drawing.Point(15, 274)
- Me.ButClear.Name = "ButClear"
- Me.ButClear.Size = New System.Drawing.Size(75, 23)
- Me.ButClear.TabIndex = 5
- Me.ButClear.Text = "Clear List"
- Me.ButClear.UseVisualStyleBackColor = True
- '
- 'F_ModSplit
- '
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.CancelButton = Me.Cancel_Button
- Me.ClientSize = New System.Drawing.Size(435, 315)
- Me.Controls.Add(Me.ButClear)
- Me.Controls.Add(Me.Label2)
- Me.Controls.Add(Me.Label1)
- Me.Controls.Add(Me.ButBrowse)
- Me.Controls.Add(Me.TextBoxPath)
- Me.Controls.Add(Me.RichTextBox1)
- Me.Controls.Add(Me.TableLayoutPanel1)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
- Me.MaximizeBox = False
- Me.MinimizeBox = False
- Me.Name = "F_ModSplit"
- Me.ShowInTaskbar = False
- Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
- Me.Text = "Split .mod file"
- Me.TableLayoutPanel1.ResumeLayout(False)
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
- Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
- Friend WithEvents OK_Button As System.Windows.Forms.Button
- Friend WithEvents Cancel_Button As System.Windows.Forms.Button
- Friend WithEvents RichTextBox1 As System.Windows.Forms.RichTextBox
- Friend WithEvents TextBoxPath As System.Windows.Forms.TextBox
- Friend WithEvents ButBrowse As System.Windows.Forms.Button
- Friend WithEvents Label1 As System.Windows.Forms.Label
- Friend WithEvents Label2 As System.Windows.Forms.Label
- Friend WithEvents ButClear As System.Windows.Forms.Button
-
-End Class
diff --git a/VECTO/GUI/F_ModSplit.resx b/VECTO/GUI/F_ModSplit.resx
deleted file mode 100644
index ff31a6db56e23b5a334f34387830ba5b4bd33eb8..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ModSplit.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/VECTO/GUI/F_ModSplit.vb b/VECTO/GUI/F_ModSplit.vb
deleted file mode 100644
index 7015bee2f6b609e8135a8103ce855295b826d7ab..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_ModSplit.vb
+++ /dev/null
@@ -1,102 +0,0 @@
-Imports System.Windows.Forms
-
-Public Class F_ModSplit
-
- Private LastFile As String = ""
- Private sMODpath As String
- Private iVehList As Int32()
- Dim FBtemp As cFileBrowser
-
- Public Sub New()
- ' Dieser Aufruf ist für den Windows Form-Designer erforderlich. |@@| This call is required by the Windows Form Designer.
- InitializeComponent()
-
- ' Add any initialization after the InitializeComponent() invocation.
- FBtemp = New cFileBrowser("temp", False, True)
- FBtemp.Extensions = New String() {"mod"}
- End Sub
-
- 'Load
- Private Sub F_ModSplit_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
- Me.TextBoxPath.Text = LastFile
- End Sub
-
- 'Browse
- Private Sub ButBrowse_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButBrowse.Click
- If FBtemp.OpenDialog("", False, "mod") Then
- Me.TextBoxPath.Text = FBtemp.Files(0)
- Else
- Exit Sub
- End If
- End Sub
-
- Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
-
- Dim VehStr As String
- Dim VehStrList As String()
- Dim x As Int16
- Dim SplitArray As System.Collections.Generic.List(Of Char)
-
- sMODpath = Me.TextBoxPath.Text
- VehStr = Me.RichTextBox1.Text
-
- If Not IO.File.Exists(sMODpath) Then
- MsgBox("File not found!")
- Exit Sub
- End If
-
- If VehStr = "" Then
- MsgBox("No Vehicle Numbers defined!")
- Exit Sub
- End If
-
- SplitArray = New System.Collections.Generic.List(Of Char)
-
- SplitArray.AddRange(vbNewLine.ToCharArray)
- SplitArray.Add(",")
- SplitArray.Add(";")
-
- ' Split
- VehStrList = VehStr.Split(SplitArray.ToArray, StringSplitOptions.RemoveEmptyEntries)
-
- ' Convert to Int32
- ReDim iVehList(UBound(VehStrList))
- For x = 0 To UBound(VehStrList)
- If IsNumeric(VehStrList(x)) Then
- iVehList(x) = CInt(VehStrList(x))
- Else
- iVehList(x) = 0
- End If
- Next
- ' Sort
- Array.Sort(iVehList)
-
- LastFile = sMODpath
-
- 'End
- Me.DialogResult = System.Windows.Forms.DialogResult.OK
- Me.Close()
- End Sub
-
- Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click
- Me.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.Close()
- End Sub
-
- Public ReadOnly Property ModPath() As String
- Get
- Return sMODpath
- End Get
- End Property
-
- Public ReadOnly Property VehList() As Int32()
- Get
- Return iVehList
- End Get
- End Property
-
- Private Sub ButClear_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButClear.Click
- Me.RichTextBox1.Text = ""
- End Sub
-
-End Class
diff --git a/VECTO/GUI/F_TEM_Creator.Designer.vb b/VECTO/GUI/F_TEM_Creator.Designer.vb
deleted file mode 100644
index 89fe29698bd7a07e968e93edb06d5333c3bea83c..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_TEM_Creator.Designer.vb
+++ /dev/null
@@ -1,169 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class F_TEM_Creator
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- <System.Diagnostics.DebuggerNonUserCode()> _
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As System.ComponentModel.IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
- <System.Diagnostics.DebuggerStepThrough()> _
- Private Sub InitializeComponent()
- Me.TextBoxTemp = New System.Windows.Forms.TextBox
- Me.ComboBoxDrCyc = New System.Windows.Forms.ComboBox
- Me.TextBoxPath = New System.Windows.Forms.TextBox
- Me.ButtonBrowse = New System.Windows.Forms.Button
- Me.ButtonOK = New System.Windows.Forms.Button
- Me.ButtonCancel = New System.Windows.Forms.Button
- Me.Label1 = New System.Windows.Forms.Label
- Me.Label2 = New System.Windows.Forms.Label
- Me.Label3 = New System.Windows.Forms.Label
- Me.Label4 = New System.Windows.Forms.Label
- Me.CheckBoxEXL = New System.Windows.Forms.CheckBox
- Me.SuspendLayout()
- '
- 'TextBoxTemp
- '
- Me.TextBoxTemp.Location = New System.Drawing.Point(94, 15)
- Me.TextBoxTemp.Name = "TextBoxTemp"
- Me.TextBoxTemp.Size = New System.Drawing.Size(39, 20)
- Me.TextBoxTemp.TabIndex = 0
- '
- 'ComboBoxDrCyc
- '
- Me.ComboBoxDrCyc.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.ComboBoxDrCyc.FormattingEnabled = True
- Me.ComboBoxDrCyc.Location = New System.Drawing.Point(94, 48)
- Me.ComboBoxDrCyc.Name = "ComboBoxDrCyc"
- Me.ComboBoxDrCyc.Size = New System.Drawing.Size(133, 21)
- Me.ComboBoxDrCyc.TabIndex = 1
- '
- 'TextBoxPath
- '
- Me.TextBoxPath.Location = New System.Drawing.Point(41, 82)
- Me.TextBoxPath.Name = "TextBoxPath"
- Me.TextBoxPath.Size = New System.Drawing.Size(208, 20)
- Me.TextBoxPath.TabIndex = 2
- '
- 'ButtonBrowse
- '
- Me.ButtonBrowse.Location = New System.Drawing.Point(255, 82)
- Me.ButtonBrowse.Name = "ButtonBrowse"
- Me.ButtonBrowse.Size = New System.Drawing.Size(25, 20)
- Me.ButtonBrowse.TabIndex = 3
- Me.ButtonBrowse.Text = "..."
- Me.ButtonBrowse.UseVisualStyleBackColor = True
- '
- 'ButtonOK
- '
- Me.ButtonOK.Location = New System.Drawing.Point(124, 152)
- Me.ButtonOK.Name = "ButtonOK"
- Me.ButtonOK.Size = New System.Drawing.Size(75, 23)
- Me.ButtonOK.TabIndex = 4
- Me.ButtonOK.Text = "Create"
- Me.ButtonOK.UseVisualStyleBackColor = True
- '
- 'ButtonCancel
- '
- Me.ButtonCancel.Location = New System.Drawing.Point(205, 152)
- Me.ButtonCancel.Name = "ButtonCancel"
- Me.ButtonCancel.Size = New System.Drawing.Size(75, 23)
- Me.ButtonCancel.TabIndex = 5
- Me.ButtonCancel.Text = "Cancel"
- Me.ButtonCancel.UseVisualStyleBackColor = True
- '
- 'Label1
- '
- Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(21, 18)
- Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(67, 13)
- Me.Label1.TabIndex = 6
- Me.Label1.Text = "Temperature"
- '
- 'Label2
- '
- Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(139, 18)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(18, 13)
- Me.Label2.TabIndex = 7
- Me.Label2.Text = "°C"
- '
- 'Label3
- '
- Me.Label3.AutoSize = True
- Me.Label3.Location = New System.Drawing.Point(47, 51)
- Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(41, 13)
- Me.Label3.TabIndex = 8
- Me.Label3.Text = "Region"
- '
- 'Label4
- '
- Me.Label4.AutoSize = True
- Me.Label4.Location = New System.Drawing.Point(12, 85)
- Me.Label4.Name = "Label4"
- Me.Label4.Size = New System.Drawing.Size(23, 13)
- Me.Label4.TabIndex = 9
- Me.Label4.Text = "File"
- '
- 'CheckBoxEXL
- '
- Me.CheckBoxEXL.AutoSize = True
- Me.CheckBoxEXL.Location = New System.Drawing.Point(15, 119)
- Me.CheckBoxEXL.Name = "CheckBoxEXL"
- Me.CheckBoxEXL.Size = New System.Drawing.Size(197, 17)
- Me.CheckBoxEXL.TabIndex = 10
- Me.CheckBoxEXL.Text = "Open with MS Excel when complete"
- Me.CheckBoxEXL.UseVisualStyleBackColor = True
- '
- 'F04_TEM_Creator
- '
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(290, 185)
- Me.Controls.Add(Me.CheckBoxEXL)
- Me.Controls.Add(Me.Label4)
- Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.Label2)
- Me.Controls.Add(Me.Label1)
- Me.Controls.Add(Me.ButtonCancel)
- Me.Controls.Add(Me.ButtonOK)
- Me.Controls.Add(Me.ButtonBrowse)
- Me.Controls.Add(Me.TextBoxPath)
- Me.Controls.Add(Me.ComboBoxDrCyc)
- Me.Controls.Add(Me.TextBoxTemp)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow
- Me.MaximizeBox = False
- Me.Name = "F04_TEM_Creator"
- Me.Text = "Create new TEM file"
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
- Friend WithEvents TextBoxTemp As System.Windows.Forms.TextBox
- Friend WithEvents ComboBoxDrCyc As System.Windows.Forms.ComboBox
- Friend WithEvents TextBoxPath As System.Windows.Forms.TextBox
- Friend WithEvents ButtonBrowse As System.Windows.Forms.Button
- Friend WithEvents ButtonOK As System.Windows.Forms.Button
- Friend WithEvents ButtonCancel As System.Windows.Forms.Button
- Friend WithEvents Label1 As System.Windows.Forms.Label
- Friend WithEvents Label2 As System.Windows.Forms.Label
- Friend WithEvents Label3 As System.Windows.Forms.Label
- Friend WithEvents Label4 As System.Windows.Forms.Label
- Friend WithEvents CheckBoxEXL As System.Windows.Forms.CheckBox
-End Class
diff --git a/VECTO/GUI/F_TEM_Creator.resx b/VECTO/GUI/F_TEM_Creator.resx
deleted file mode 100644
index ff31a6db56e23b5a334f34387830ba5b4bd33eb8..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_TEM_Creator.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/VECTO/GUI/F_TEM_Creator.vb b/VECTO/GUI/F_TEM_Creator.vb
deleted file mode 100644
index 9a4b27489f64442b64e6fc1dce06900e300926fc..0000000000000000000000000000000000000000
--- a/VECTO/GUI/F_TEM_Creator.vb
+++ /dev/null
@@ -1,48 +0,0 @@
-Public Class F_TEM_Creator
-
- 'Initialization
- Private Sub F04_TEM_Creator_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
- Me.TextBoxTemp.Text = "20"
- Me.ComboBoxDrCyc.Items.Add("Average")
- Me.ComboBoxDrCyc.Items.Add("Residential Street")
- Me.ComboBoxDrCyc.Items.Add("Main Street")
- Me.ComboBoxDrCyc.SelectedIndex = 0
- Me.TextBoxPath.Text = Cfg.LastTEM
- Me.CheckBoxEXL.Checked = Cfg.TEMexl
- End Sub
-
- 'Cancel
- Private Sub ButtonCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonCancel.Click
- Me.Close()
- End Sub
-
- 'OK
- Private Sub ButtonOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonOK.Click
- Dim f As String
- If Me.TextBoxPath.Text = "" Then
- MsgBox("No file specified!", MsgBoxStyle.Critical)
- Exit Sub
- End If
- f = Me.TextBoxPath.Text
- Cfg.TEMexl = Me.CheckBoxEXL.Checked
- If UCase(Microsoft.VisualBasic.Right(f, 4)) <> ".TEM" Then f = f & ".TEM"
- Cfg.LastTEM = f
- f = fFileRepl(f)
- If IO.File.Exists(f) Then
- If MsgBox("Overwrite existing file?", MsgBoxStyle.YesNo) = MsgBoxResult.No Then Exit Sub
- End If
- Me.Close()
- If F_ADV.Visible Then
- F_ADV.WindowState = FormWindowState.Normal
- F_ADV.TEMfromCreator(f)
- End If
- If Cfg.TEMexl Then FileOpenAlt(f)
- End Sub
-
- 'Browse
- Private Sub ButtonBrowse_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles ButtonBrowse.Click
- If fbTEM.SaveDialog(Me.TextBoxPath.Text) Then
- Me.TextBoxPath.Text = fbTEM.Files(0)
- End If
- End Sub
-End Class
diff --git a/VECTO/MODcalc/Em Calc.vb b/VECTO/MODcalc/Em Calc.vb
index fffc6091ca0f9b3df7ef5ab02856e5e19bf89b60..8572bd32b8088364c2785fdd777b830ce727ed3d 100644
--- a/VECTO/MODcalc/Em Calc.vb
+++ b/VECTO/MODcalc/Em Calc.vb
@@ -1155,39 +1155,38 @@ lb100: 'Rücksprunglabel für iterativen Berechnungsmodus
'Calculation loop: Per Time-step / per Module: 1. Temperatures, 2. Conversions
While True
'Display per-second Results on each iteration Results
- If Not (PHEMmode = tPHEMmode.ModeADVANCE) Then
- If Not (PHEMmode = tPHEMmode.ModeBATCH) Or Cfg.ModOut Then
-
- ' Write Header *.ter
- DatTer.OpenWrite(PathTer, ",")
- DatTer.WriteLine("result-file for temperatures in the exhaust system")
- DatTer.WriteLine("VECTO " & VECTOvers)
- line1 = "time,vehicle speed,nnorm,P_norm,rpm,fuel consumption,lambda,m_p exhaust,ta_41_qs"
- line2 = "[s],[km/h],[-],[-],[min-1],[g/h],[-],[kg/s],[°C]"
- For ii = 1 To ModAnz
- If TempMod(ii).TgasGegJa Then
- line1 = line1 & ",tm_" & ii & "_output" & ",ttc_" & ii & "_output" & ",tgas_" & ii & "_output"
- Else
- line1 = line1 & ",tm_" & ii & ",ttc_" & ii & ",tgas_" & ii
- End If
- line2 = line2 & ",[°C],[°C],[°C]"
- Next
- line1 = line1 & ",Q_p coolant"
- line2 = line2 & ",[W]"
+ If Not (PHEMmode = tPHEMmode.ModeBATCH) Or Cfg.ModOut Then
+
+ ' Write Header *.ter
+ DatTer.OpenWrite(PathTer, ",")
+ DatTer.WriteLine("result-file for temperatures in the exhaust system")
+ DatTer.WriteLine("VECTO " & VECTOvers)
+ line1 = "time,vehicle speed,nnorm,P_norm,rpm,fuel consumption,lambda,m_p exhaust,ta_41_qs"
+ line2 = "[s],[km/h],[-],[-],[min-1],[g/h],[-],[kg/s],[°C]"
+ For ii = 1 To ModAnz
+ If TempMod(ii).TgasGegJa Then
+ line1 = line1 & ",tm_" & ii & "_output" & ",ttc_" & ii & "_output" & ",tgas_" & ii & "_output"
+ Else
+ line1 = line1 & ",tm_" & ii & ",ttc_" & ii & ",tgas_" & ii
+ End If
+ line2 = line2 & ",[°C],[°C],[°C]"
+ Next
+ line1 = line1 & ",Q_p coolant"
+ line2 = line2 & ",[W]"
- DatTer.WriteLine(line1)
- DatTer.WriteLine(line2)
+ DatTer.WriteLine(line1)
+ DatTer.WriteLine(line2)
- ' Write the Header for KonvMods
- For ii = 1 To ModAnz
- If TempMod(ii).ModTyp = 1 Or TempMod(ii).ModTyp = 2 Then
- TempMod(ii).KonvMod.Header()
- End If
- Next
+ ' Write the Header for KonvMods
+ For ii = 1 To ModAnz
+ If TempMod(ii).ModTyp = 1 Or TempMod(ii).ModTyp = 2 Then
+ TempMod(ii).KonvMod.Header()
+ End If
+ Next
- End If
End If
+
'Start-values ​​for Cooling-system simulation:
t_mass1(0) = t_start_m1_m2
t_mass2(0) = t_start_m1_m2
@@ -1303,12 +1302,12 @@ lb100: 'Rücksprunglabel für iterativen Berechnungsmodus
TempMod(iMod).eEmKomp(7, jz) = TempMod(iMod - 1).eEmKomp(7, jz) * (1 - TempMod(iMod).KonvMod.KonvRate(tMapComp.NO)(jz))
End If
- If Not (PHEMmode = tPHEMmode.ModeADVANCE) Then
- If Not (PHEMmode = tPHEMmode.ModeBATCH) Or Cfg.ModOut Then
- TempMod(iMod).KonvMod.Write(jz) 'Sekündliche Ausgabe
- End If
+
+ If Not (PHEMmode = tPHEMmode.ModeBATCH) Or Cfg.ModOut Then
+ TempMod(iMod).KonvMod.Write(jz) 'Sekündliche Ausgabe
End If
+
Else
'Falls Modul kein Konv-Element hat ändert sich nix (Anmerkung: Modul 1 hat immer ModTyp0) |@@| If Module has no Conv-element changes nothing (Note: Module 1 has always ModTyp0)
If iMod > 1 Then
@@ -1324,17 +1323,15 @@ lb100: 'Rücksprunglabel für iterativen Berechnungsmodus
Next
'Write Line in *.ter.
- If Not (PHEMmode = tPHEMmode.ModeADVANCE) Then
- If Not (PHEMmode = tPHEMmode.ModeBATCH) Or Cfg.ModOut Then
- line1 = jz & "," & vehspe(jz) & "," & nnorm(jz) & "," & p_norm(jz) & "," & rpm(jz) & "," & fc(jz) & "," & lambda(jz) & "," & mpexh(jz) & "," & tqs(jz)
- For ij = 1 To ModAnz
- line1 = line1 & "," & TempMod(ij).t_m(jz) & "," & TempMod(ij).t_tc(jz) & "," & TempMod(ij).t_gas(jz)
- Next
- If GEN.CoolantsimJa Then
- line1 = line1 & "," & qp_loss(jz)
- End If
- DatTer.WriteLine(line1)
+ If Not (PHEMmode = tPHEMmode.ModeBATCH) Or Cfg.ModOut Then
+ line1 = jz & "," & vehspe(jz) & "," & nnorm(jz) & "," & p_norm(jz) & "," & rpm(jz) & "," & fc(jz) & "," & lambda(jz) & "," & mpexh(jz) & "," & tqs(jz)
+ For ij = 1 To ModAnz
+ line1 = line1 & "," & TempMod(ij).t_m(jz) & "," & TempMod(ij).t_tc(jz) & "," & TempMod(ij).t_gas(jz)
+ Next
+ If GEN.CoolantsimJa Then
+ line1 = line1 & "," & qp_loss(jz)
End If
+ DatTer.WriteLine(line1)
End If
'------------------------------------------------------------------------------------------
@@ -1346,15 +1343,13 @@ lb100: 'Rücksprunglabel für iterativen Berechnungsmodus
'----------------------------------------------------------------------------------------------
'Close all second-by-second Result-files
- If Not (PHEMmode = tPHEMmode.ModeADVANCE) Then
- If Not (PHEMmode = tPHEMmode.ModeBATCH) Or Cfg.ModOut Then
- DatTer.Close()
- For ii = 1 To ModAnz
- If TempMod(ii).ModTyp = 1 Or TempMod(ii).ModTyp = 2 Then
- TempMod(ii).KonvMod.Close()
- End If
- Next
- End If
+ If Not (PHEMmode = tPHEMmode.ModeBATCH) Or Cfg.ModOut Then
+ DatTer.Close()
+ For ii = 1 To ModAnz
+ If TempMod(ii).ModTyp = 1 Or TempMod(ii).ModTyp = 2 Then
+ TempMod(ii).KonvMod.Close()
+ End If
+ Next
End If
'---------- Abfrage Rücksprung im iterativen Berechnungsmodus für Starttemp ------------------- |@@| Query return in the iterative Calculation-mode for Starttemp -------------------
diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb
index 96519d3329294b703aff38319fd29007a3ad0bda..683dd0e459944d74b586344d1ec2988626f6df8f 100644
--- a/VECTO/MODcalc/cMOD.vb
+++ b/VECTO/MODcalc/cMOD.vb
@@ -308,7 +308,6 @@ Public Class cMOD
Dim t1 As Integer
Dim Sepp As String
- Dim ADVmode As Boolean
Dim path As String
Dim dist As Double
Dim MsgSrc As String
@@ -336,19 +335,9 @@ Public Class cMOD
f = New cFile_V3
- ADVmode = (PHEMmode = tPHEMmode.ModeADVANCE)
+ path = ModOutpName & ".vmod"
- If ADVmode Then
- path = ModOutpName & "_" & ADV.aVehType & ".mod"
- Else
- If GEN.dynkorja Then
- path = ModOutpName & ".vmod"
- Else
- path = ModOutpName & ".vmod"
- End If
- End If
-
- If Not f.OpenWrite(path, ",", False, ADVmode) Then
+ If Not f.OpenWrite(path, ",", False) Then
WorkerMsg(tMsgID.Err, "Can't write to " & path, MsgSrc)
Return False
End If
@@ -383,17 +372,12 @@ Public Class cMOD
- '*** ID line (Only ADVANCE)
- If ADVmode Then
- s.Append("VehNr: " & ADV.aVehNr)
- s.Append(",Input File: " & fFILE(GenFile, True))
- f.WriteLine(s.ToString)
- Else
- f.WriteLine("VECTO modal results")
- f.WriteLine("VECTO " & VECTOvers)
- f.WriteLine(Now.ToString)
- f.WriteLine("Input File: " & JobFile)
- End If
+
+ f.WriteLine("VECTO modal results")
+ f.WriteLine("VECTO " & VECTOvers)
+ f.WriteLine(Now.ToString)
+ f.WriteLine("Input File: " & JobFile)
+
'***********************************************************************************************
'***********************************************************************************************
@@ -449,13 +433,6 @@ Public Class cMOD
End If
- 'ADVANCE-specific
- If ADVmode Then
-
- s.Append(",WorldX,WorldY,StrId")
- sU.Append(",[m],[m],[-]")
-
- End If
If Cfg.FinalEmOnly Then
@@ -697,20 +674,6 @@ Public Class cMOD
End If
- 'ADVANCE-specific
- If ADVmode Then
-
- 'X
- s.Append(Sepp & ADV.aWorldX(t))
-
- 'Y
- s.Append(Sepp & ADV.aWorldY(t))
-
- 'StrId
- s.Append(Sepp & ADV.aStrId(t))
-
- End If
-
If Cfg.FinalEmOnly Then
'Final-emissions (tailpipe)
diff --git a/VECTO/MODcalc/cPower.vb b/VECTO/MODcalc/cPower.vb
index ff4bfbe35150ba0cd08bae8ce357ec05fe9c9e4d..981ad3064b78cf833ac87db7c933dc9b8bcfd3e7 100644
--- a/VECTO/MODcalc/cPower.vb
+++ b/VECTO/MODcalc/cPower.vb
@@ -531,7 +531,7 @@ Public Class cPower
Dim amax As Single
Dim StdMode As Boolean
- Dim NotAdvMode As Boolean
+
Dim LastPmax As Single
@@ -540,7 +540,6 @@ Public Class cPower
MsgSrc = "Power/Calc"
StdMode = (PHEMmode = tPHEMmode.ModeSTANDARD)
- NotAdvMode = Not (PHEMmode = tPHEMmode.ModeADVANCE)
'Abort if no speed given
If Not DRI.Vvorg Then
@@ -609,7 +608,7 @@ Public Class cPower
FirstSecItar = True
'Secondary Progressbar
- If NotAdvMode Then ProgBarCtrl.ProgJobInt = CInt(100 * jz / MODdata.tDim)
+ ProgBarCtrl.ProgJobInt = CInt(100 * jz / MODdata.tDim)
' Determine State
@@ -1376,24 +1375,19 @@ lb_nOK:
'*********************************** Time loop END ***********************************
'***********************************************************************************************
- 'Notify (When not ADVANCE)
- If NotAdvMode Then
-
- If Cfg.WegKorJa Then
- If MODdata.tDim > MODdata.tDimOgl Then WorkerMsg(tMsgID.Normal, "Cycle extended by " & MODdata.tDim - MODdata.tDimOgl & " seconds to meet target distance.", MsgSrc)
+ 'Notify
+ If Cfg.WegKorJa Then
+ If MODdata.tDim > MODdata.tDimOgl Then WorkerMsg(tMsgID.Normal, "Cycle extended by " & MODdata.tDim - MODdata.tDimOgl & " seconds to meet target distance.", MsgSrc)
- If Math.Abs(Vh.WegIst - Vh.WegSoll) > 80 Then
- WorkerMsg(tMsgID.Warn, "Target distance= " & (Vh.WegSoll / 1000).ToString("#.000") & "[km], Actual distance= " & (Vh.WegIst / 1000).ToString("#.000") & "[km], Error= " & Math.Abs(Vh.WegIst - Vh.WegSoll).ToString("#.0") & "[m]", MsgSrc)
- Else
- WorkerMsg(tMsgID.Normal, "Target distance= " & (Vh.WegSoll / 1000).ToString("#.000") & "[km], Actual distance= " & (Vh.WegIst / 1000).ToString("#.000") & "[km], Error= " & Math.Abs(Vh.WegIst - Vh.WegSoll).ToString("#.0") & "[m]", MsgSrc)
- End If
+ If Math.Abs(Vh.WegIst - Vh.WegSoll) > 80 Then
+ WorkerMsg(tMsgID.Warn, "Target distance= " & (Vh.WegSoll / 1000).ToString("#.000") & "[km], Actual distance= " & (Vh.WegIst / 1000).ToString("#.000") & "[km], Error= " & Math.Abs(Vh.WegIst - Vh.WegSoll).ToString("#.0") & "[m]", MsgSrc)
+ Else
+ WorkerMsg(tMsgID.Normal, "Target distance= " & (Vh.WegSoll / 1000).ToString("#.000") & "[km], Actual distance= " & (Vh.WegIst / 1000).ToString("#.000") & "[km], Error= " & Math.Abs(Vh.WegIst - Vh.WegSoll).ToString("#.0") & "[m]", MsgSrc)
End If
+ End If
- If SecSpeedRed > 0 Then WorkerMsg(tMsgID.Normal, "Speed reduction > 1.5 m/s in " & SecSpeedRed & " time steps.", MsgSrc)
-
-
+ If SecSpeedRed > 0 Then WorkerMsg(tMsgID.Normal, "Speed reduction > 1.5 m/s in " & SecSpeedRed & " time steps.", MsgSrc)
- End If
'CleanUp
Vh = Nothing
@@ -1413,14 +1407,12 @@ lb_nOK:
Dim PeDRI As List(Of Double)
Dim PcorCount As Integer
Dim StdMode As Boolean
- Dim NotAdvMode As Boolean
Dim MsgSrc As String
Dim Padd As Single
MsgSrc = "Power/Eng_Calc"
StdMode = (PHEMmode = tPHEMmode.ModeSTANDARD)
- NotAdvMode = Not (PHEMmode = tPHEMmode.ModeADVANCE)
'Abort if Power/Revolutions not given
If Not (DRI.Nvorg And DRI.Pvorg) Then
@@ -1443,7 +1435,7 @@ lb_nOK:
For t = 0 To t1
'Secondary Progressbar
- If NotAdvMode Then ProgBarCtrl.ProgJobInt = CInt(100 * t / t1)
+ ProgBarCtrl.ProgJobInt = CInt(100 * t / t1)
'Reset the second-by-second Errors
MODdata.ModErrors.ResetAll()
diff --git a/VECTO/MODcalc/cVh.vb b/VECTO/MODcalc/cVh.vb
index dae7cd18d53a84d7083fa896098b550cbdbb0093..809c8c73aced2b5edbeb2ea27367fede5bde89d4 100644
--- a/VECTO/MODcalc/cVh.vb
+++ b/VECTO/MODcalc/cVh.vb
@@ -433,12 +433,6 @@ Public Class cVh
MODdata.Duplicate(t)
- If PHEMmode = tPHEMmode.ModeADVANCE Then
- ADV.aWorldX.Insert(t, ADV.aWorldX(t))
- ADV.aWorldY.Insert(t, ADV.aWorldY(t))
- ADV.aStrId.Insert(t, ADV.aStrId(t))
- End If
-
End Sub
@@ -468,13 +462,6 @@ Public Class cVh
MODdata.Duplicate(t)
- If PHEMmode = tPHEMmode.ModeADVANCE Then
- ADV.aWorldX.Insert(t, ADV.aWorldX(t))
- ADV.aWorldY.Insert(t, ADV.aWorldY(t))
- ADV.aStrId.Insert(t, ADV.aStrId(t))
- End If
-
-
End Sub
Private Sub Cut(ByVal t As Integer)
@@ -511,12 +498,6 @@ Public Class cVh
MODdata.Cut(t)
- If PHEMmode = tPHEMmode.ModeADVANCE Then
- ADV.aWorldX.RemoveAt(t)
- ADV.aWorldY.RemoveAt(t)
- ADV.aStrId.RemoveAt(t)
- End If
-
End Sub
Public ReadOnly Property Vsoll(ByVal t As Integer) As Single
diff --git a/VECTO/M_MAIN.vb b/VECTO/M_MAIN.vb
index 1a7c8de07add6ab5f5bf573b6f7fbbd4be47f1b3..3690a26cde426d838fe83473949df33b4d959116 100644
--- a/VECTO/M_MAIN.vb
+++ b/VECTO/M_MAIN.vb
@@ -63,9 +63,6 @@ Module M_MAIN
Case tPHEMmode.ModeBATCH
WorkerMsg(tMsgID.Normal, "Starting VECTO BATCH...", MsgSrc)
CyclesDim = JobCycleList.Count - 1
- Case tPHEMmode.ModeADVANCE
- WorkerMsg(tMsgID.Normal, "Starting PHEM ADVANCE...", MsgSrc)
- CyclesDim = 0
End Select
FilesDim = JobFileList.Count - 1
@@ -123,10 +120,6 @@ lbSkip0:
VSUM = New cVSUM
If Not ERG.Init(JobFileList(0)) Then GoTo lbErrBefore
- If Not PHEMmode = tPHEMmode.ModeADVANCE Then
- If Not ERG.ErgEntryInit() Then GoTo lbErrBefore
- End If
-
SigFile = Left(ERG.ErgFile, ERG.ErgFile.Length - 5) & ".vsig"
'Warning on invalid/unrealistic settings
@@ -150,7 +143,7 @@ lbSkip0:
JobFile = fFileRepl(JobFileList(jgen))
- If Not PHEMmode = tPHEMmode.ModeADVANCE Then GenFile = JobFile
+ GenFile = JobFile
WorkerJobStatus(jgen, "running...", tJobStatus.Running)
@@ -158,40 +151,6 @@ lbSkip0:
MSGwarn = 0
MSGerror = 0
- If (PHEMmode = tPHEMmode.ModeADVANCE) Then
-
- WorkerMsg(tMsgID.NewJob, "Job: " & NrOfRunStr() & " / " & ((FilesDim + 1) * (CyclesDim + 1)) & " | " & fFILE(JobFile, True), MsgSrc)
- WorkerStatus("Current Job: " & NrOfRunStr() & " / " & ((FilesDim + 1) * (CyclesDim + 1)) & " | " & fFILE(JobFile, True))
-
-
- If Not ERG.ErgEntryInit() Then GoTo lbNextJob
-
- 'Status
- WorkerJobStatus(jgen, "processing input...", tJobStatus.Running)
-
- ADV = New cADVANCE_V3
- If Not ADV.ADVANCE_V2_Init() Then GoTo lbNextJob
-
- If ADV.ADVANCEdone Or PHEMworker.CancellationPending Then GoTo lbAbort
-
- 'Status/ProgBar
- WorkerJobStatus(jgen, "running...", tJobStatus.Running)
- ProgBarCtrl.ProgOverallStartInt = 100 * (jgen) / (FilesDim + 1)
- ProgBarCtrl.PgroOverallEndInt = 100 * (jgen + 1) / (FilesDim + 1)
-
- End If
-lbADV:
- If (PHEMmode = tPHEMmode.ModeADVANCE) Then
- If Not ADV.ADVANCE_V2_Next() Then
- JobAbortedByErr = True
- GoTo lbNextJob
- End If
- If ADV.ADVANCEdone Then
- ADV.ADVANCE_V2_Close()
- GoTo lbNextJob
- End If
- End If
-
'Check if Abort
If PHEMworker.CancellationPending Then GoTo lbAbort
@@ -318,45 +277,41 @@ lbADV:
FCerror = False
'Read cycle
- If (Not (PHEMmode = tPHEMmode.ModeADVANCE)) Then
+ DRI = New cDRI
+ DRI.FilePath = CurrentCycleFile
- 'Read in
- DRI = New cDRI
- DRI.FilePath = CurrentCycleFile
+ If Not DRI.ReadFile Then
+ CyclAbrtedByErr = True
+ GoTo lbAusg
+ End If
- If Not DRI.ReadFile Then
+ 'Convert v(s) into v(t) (optional)
+ If DRI.Scycle Then
+ If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle (v(s) => v(t))", MsgSrc)
+ If Not DRI.ConvStoT() Then
CyclAbrtedByErr = True
GoTo lbAusg
End If
+ End If
- 'Convert v(s) into v(t) (optional)
- If DRI.Scycle Then
- If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle (v(s) => v(t))", MsgSrc)
- If Not DRI.ConvStoT() Then
- CyclAbrtedByErr = True
- GoTo lbAusg
- End If
- End If
-
- 'If first time step is Zero then duplicate first values to start cycle with vehicle standing.
- If DRI.Vvorg AndAlso DRI.tDim > 1 AndAlso DRI.Values(tDriComp.V)(0) < 0.0001 AndAlso DRI.Values(tDriComp.V)(1) >= 0.0001 Then
- DRI.FirstZero()
- End If
+ 'If first time step is Zero then duplicate first values to start cycle with vehicle standing.
+ If DRI.Vvorg AndAlso DRI.tDim > 1 AndAlso DRI.Values(tDriComp.V)(0) < 0.0001 AndAlso DRI.Values(tDriComp.V)(1) >= 0.0001 Then
+ DRI.FirstZero()
+ End If
- 'Convert to 1Hz (optional) - does not apply to v(s) cycles because timestep is missing
- If DRI.Tvorg Then
- If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle to 1Hz", MsgSrc)
- If Not DRI.ConvTo1Hz() Then
- 'Error-notification in DRI.Convert()
- CyclAbrtedByErr = True
- GoTo lbAusg
- End If
+ 'Convert to 1Hz (optional) - does not apply to v(s) cycles because timestep is missing
+ If DRI.Tvorg Then
+ If MsgOut Then WorkerMsg(tMsgID.Normal, "Converting cycle to 1Hz", MsgSrc)
+ If Not DRI.ConvTo1Hz() Then
+ 'Error-notification in DRI.Convert()
+ CyclAbrtedByErr = True
+ GoTo lbAusg
End If
+ End If
- 'Unnormalised
- DRI.DeNorm()
+ 'De-normalize
+ DRI.DeNorm()
- End If
'----------------------------------------------------------------------------
'----------------------------------------------------------------------------
@@ -534,30 +489,9 @@ lbADV:
'Output for BATCH and ADVANCE
lbAusg:
- If (PHEMmode = tPHEMmode.ModeADVANCE) Then
-
- 'In ADVANCE, Cycle-cancel = Job-cancel
- If CyclAbrtedByErr Then
- JobAbortedByErr = True
- GoTo lbNextJob
- End If
-
- ADV.STRcalc()
- If Not ADV.AusgVis_V3() Then
- JobAbortedByErr = True
- GoTo lbNextJob
- End If
-
- GoTo lbadv
-
- Else
-
- 'Output in Erg (first Calculation - Initialization & Header)
- If Not ERG.AusgERG(NrOfRunStr, fFILE(GenFile, True), fFILE(CurrentCycleFile, True), CyclAbrtedByErr) Then GoTo lbErrInJobLoop
-
-
-
- End If
+
+ 'Output in Erg (first Calculation - Initialization & Header)
+ If Not ERG.AusgERG(NrOfRunStr, fFILE(GenFile, True), fFILE(CurrentCycleFile, True), CyclAbrtedByErr) Then GoTo lbErrInJobLoop
'Data Cleanup
MODdata.CleanUp()
@@ -593,12 +527,6 @@ lbAusg:
'**********************************************************************************************
lbNextJob:
- If (PHEMmode = tPHEMmode.ModeADVANCE) Then
- ProgBarCtrl.ProgOverallStartInt = -1
- WorkerProg(100 * (jgen + 1) / (FilesDim + 1), 0)
- End If
-
-
If JobAbortedByErr Or (CyclAbrtedByErr And CyclesDim = 0) Then
If JobAbortedByErr Then
@@ -712,7 +640,6 @@ lbExit:
MAP = Nothing
TRS = Nothing
DRI = Nothing
- ADV = Nothing
MODdata = Nothing
ERG = Nothing
diff --git a/VECTO/My Project/AssemblyInfo.vb b/VECTO/My Project/AssemblyInfo.vb
index 435d327fdb28f2a117ac5b34e67d571343387533..0b4a85966e1dfab0931eb6dfd44a29d42339e80f 100644
--- a/VECTO/My Project/AssemblyInfo.vb
+++ b/VECTO/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by entering "*" in them:
' <Assembly: AssemblyVersion("1.0.*")>
-<Assembly: AssemblyVersion("1.3.1.1")>
-<Assembly: AssemblyFileVersion("1.3.1.1")>
+<Assembly: AssemblyVersion("1.4.0.0")>
+<Assembly: AssemblyFileVersion("1.4.0.0")>
diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj
index 1376847efce5f90a7bceb7c588d35e65d1b35d57..3b8b5be7618bac34e4a5e70c4936f839dde4d72d 100644
--- a/VECTO/VECTO.vbproj
+++ b/VECTO/VECTO.vbproj
@@ -106,7 +106,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="ApplicationEvents.vb" />
- <Compile Include="ADVANCE\cADV.vb" />
<Compile Include="cVECTO.vb" />
<Compile Include="cVSUM.vb" />
<Compile Include="GUI\F_FileSign.Designer.vb">
@@ -204,30 +203,17 @@
<Compile Include="GUI\F_ShutDown.vb">
<SubType>Form</SubType>
</Compile>
- <Compile Include="GUI\F_ADVfzp.Designer.vb">
- <DependentUpon>F_ADVfzp.vb</DependentUpon>
- </Compile>
- <Compile Include="GUI\F_ADVfzp.vb">
- <SubType>Form</SubType>
- </Compile>
<Compile Include="GUI\F_GEN.Designer.vb">
<DependentUpon>F_GEN.vb</DependentUpon>
</Compile>
<Compile Include="GUI\F_GEN.vb">
<SubType>Form</SubType>
</Compile>
- <Compile Include="GUI\F_ModSplit.Designer.vb">
- <DependentUpon>F_ModSplit.vb</DependentUpon>
- </Compile>
- <Compile Include="GUI\F_ModSplit.vb">
- <SubType>Form</SubType>
- </Compile>
<Compile Include="cFile V3.vb" />
<Compile Include="VECTO_Global.vb" />
<Compile Include="VECTO_Types.vb" />
<Compile Include="M_SOC_Iter.vb" />
<Compile Include="cRegression.vb" />
- <Compile Include="ADVANCE\cADVANCE.vb" />
<Compile Include="GUI\GUI_Subs.vb" />
<Compile Include="GUI\F_VEH.Designer.vb">
<DependentUpon>F_VEH.vb</DependentUpon>
@@ -241,18 +227,6 @@
<Compile Include="GUI\F_Options.vb">
<SubType>Form</SubType>
</Compile>
- <Compile Include="GUI\F_TEM_Creator.Designer.vb">
- <DependentUpon>F_TEM_Creator.vb</DependentUpon>
- </Compile>
- <Compile Include="GUI\F_TEM_Creator.vb">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="GUI\F_ADV.Designer.vb">
- <DependentUpon>F_ADV.vb</DependentUpon>
- </Compile>
- <Compile Include="GUI\F_ADV.vb">
- <SubType>Form</SubType>
- </Compile>
<Compile Include="GUI\F_AboutBox.Designer.vb">
<DependentUpon>F_AboutBox.vb</DependentUpon>
</Compile>
@@ -305,10 +279,6 @@
<EmbeddedResource Include="GUI\F_Welcome.resx">
<DependentUpon>F_Welcome.vb</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="GUI\F_ADVfzp.resx">
- <SubType>Designer</SubType>
- <DependentUpon>F_ADVfzp.vb</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="GUI\F_ENG.resx">
<DependentUpon>F_ENG.vb</DependentUpon>
</EmbeddedResource>
@@ -323,10 +293,6 @@
<SubType>Designer</SubType>
<DependentUpon>F_GEN.vb</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="GUI\F_ModSplit.resx">
- <SubType>Designer</SubType>
- <DependentUpon>F_ModSplit.vb</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="GUI\F_ShutDown.resx">
<SubType>Designer</SubType>
<DependentUpon>F_ShutDown.vb</DependentUpon>
@@ -342,14 +308,6 @@
<SubType>Designer</SubType>
<DependentUpon>F_Options.vb</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="GUI\F_TEM_Creator.resx">
- <SubType>Designer</SubType>
- <DependentUpon>F_TEM_Creator.vb</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="GUI\F_ADV.resx">
- <SubType>Designer</SubType>
- <DependentUpon>F_ADV.vb</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="GUI\F_AboutBox.resx">
<SubType>Designer</SubType>
<DependentUpon>F_AboutBox.vb</DependentUpon>
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index 635c8c8c1eea5feb9986df83b2ab50934c87c1a5..1384392d94b5298d4c15cc8d5b07e411dc52041f 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -38,7 +38,6 @@ Module VECTO_Global
Public MODdata As cMOD
Public TRS As cTRS
Public EXS As cEXS
- Public ADV As cADVANCE_V3
Public Lic As vectolic.cLicense
Public ERG As cERG
Public DEV As cDEV
diff --git a/VECTO/VECTO_Types.vb b/VECTO/VECTO_Types.vb
index 84acf3a6c33148b4094bd6ab9466b89959fcd6eb..30770798cadbb7f5211ce1c84044046f0e2fe051 100644
--- a/VECTO/VECTO_Types.vb
+++ b/VECTO/VECTO_Types.vb
@@ -1,7 +1,6 @@
Public Enum tPHEMmode As Short
ModeSTANDARD = 0
ModeBATCH = 1
- ModeADVANCE = 2
End Enum
Public Enum tCalcMode As Short
diff --git a/VECTO/cDEV.vb b/VECTO/cDEV.vb
index 3614b4e28f2ad6e954d3b954b85cf75239adff12..48bc7e403cab1d56c4640f71f20b9d423c785f67 100644
--- a/VECTO/cDEV.vb
+++ b/VECTO/cDEV.vb
@@ -193,11 +193,6 @@ Public Class cDEV
Public Function ShowAddOptions() As String
F_MAINForm.GrbxTest.Visible = True
- F_MAINForm.ADVEditorToolStripMenuItem1.Visible = True
- F_MAINForm.CreateTEMFileToolStripMenuItem.Visible = True
- F_MAINForm.SplitMODFilesToolStripMenuItem.Visible = True
- F_MAINForm.ToolStripSeparator4.Visible = True
-
Return ("done")
End Function
diff --git a/VECTO/cERG.vb b/VECTO/cERG.vb
index 09d154b02403acc727a3cc2283cbae2764f28b55..4c39eb0daeaa5de1381decc162cf504c9a2a90e3 100644
--- a/VECTO/cERG.vb
+++ b/VECTO/cERG.vb
@@ -14,316 +14,6 @@ Class cERG
ERGpath = ""
End Sub
- Public Function ErgEntryInit() As Boolean
- Dim GENs As New List(Of String)
- Dim str As String
- Dim str1 As String
- Dim iGEN As Integer
- Dim ADV0 As cADV
- Dim file As New cFile_V3
- Dim path0 As String
- Dim GEN0 As cGEN
- Dim MAP0 As cMAP
- Dim ENG0 As cENG
- Dim Em0 As cEmComp
- Dim HEVorEVdone As Boolean
- Dim EVdone As Boolean
- Dim EngOnly As Boolean
- Dim NonEngOnly As Boolean
- Dim ErgEntry As cErgEntry
- Dim CylceKin As cCycleKin
- Dim i1 As Integer
- Dim i2 As Integer
- Dim iDim As Integer
- Dim DRI0 As cDRI
- Dim MsgSrc As String
-
- MsgSrc = "SUMALL/Init"
-
- ErgEntries = New Dictionary(Of String, cErgEntry)
- ErgEntryList = New List(Of String)
-
-
- '********************** GEN-Liste raussuchen. Bei ADVANCE aus Flotte sonst aus Jobliste '********************** |@@| Select GEN-list for ADVANCE either from Fleet or from Job-list '**********************
- If PHEMmode = tPHEMmode.ModeADVANCE Then
-
- ADV0 = New cADV
- ADV0.FilePath = JobFile
-
- If Not ADV0.ReadFile Then
- WorkerMsg(tMsgID.Err, "Can't read .adv file '" & JobFile & "' !", MsgSrc)
- Return False
- End If
-
- If Not file.OpenRead(ADV0.FLTpath) Then
- WorkerMsg(tMsgID.Err, "Can't read .flt file '" & ADV0.FLTpath & "' !", MsgSrc)
- Return False
- End If
-
- path0 = fPATH(ADV0.FLTpath)
-
- Do While Not file.EndOfFile
- str = file.ReadLine(1)
- GENs.Add(fFileRepl(str, path0))
- Loop
-
- file.Close()
-
- iGEN = GENs.Count - 1
-
- Else
-
- For Each str In JobFileList
- GENs.Add(fFileRepl(str))
- Next
- iGEN = GENs.Count - 1
-
- End If
-
-
- '********************** Create Erg-entries '**********************
- EVdone = False
- HEVorEVdone = False
- EngOnly = False
- NonEngOnly = False
-
- 'Vehicle type-independent
- AddToErg("\\T", "time", "[s]")
- AddToErg("\\Prated", "Prated", "[kW]")
-
- 'For each GEN-file check Mode and Map
- For Each str In GENs
-
- GEN0 = New cGEN
-
- GEN0.FilePath = str
-
- Try
- If Not GEN0.ReadFile Then
- WorkerMsg(tMsgID.Err, "Can't read .gen file '" & str & "' !", MsgSrc)
- Return False
- End If
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "File read error! (" & str & ")", MsgSrc)
- Return False
- End Try
-
- If GEN0.VehMode = tVehMode.EngineOnly Then
-
- If Not EngOnly Then
-
- 'nothing...
-
- EngOnly = True
-
- End If
-
- Else
-
- If Not NonEngOnly Then
-
- AddToErg("\\S", "distance", "[km]")
- AddToErg("\\V", "speed", "[km/h]")
- AddToErg("\\G", "∆altitude", "[m]")
-
- NonEngOnly = True
-
- End If
-
- 'Auxiliary energy consumption
- If GEN0.AuxDef Then
- For Each str1 In GEN0.AuxPaths.Keys
- AddToErg("\\Eaux_" & UCase(str1), "Eaux_" & str1, "[kWh]")
- Next
- End If
-
- End If
-
-
- 'Electric-Vehicle / Hybrid
- If GEN0.VehMode = tVehMode.EV Or GEN0.VehMode = tVehMode.HEV Then
-
- 'EV & HEV
- If Not HEVorEVdone Then
-
- AddToErg("\\PeEM+", "PeEM+", "[kW]")
- AddToErg("\\PeBat+", "PeBat+", "[kW]")
- AddToErg("\\PiBat+", "PiBat+", "[kW]")
- AddToErg("\\PeEM-", "PeEM-", "[kW]")
- AddToErg("\\PeBat-", "PeBat-", "[kW]")
- AddToErg("\\PiBat-", "PiBat-", "[kW]")
- AddToErg("\\EiBat+", "EiBat+", "[kWh]")
- AddToErg("\\EiBat-", "EiBat-", "[kWh]")
- AddToErg("\\EtaEM", "EtaEM", "[%]")
- AddToErg("\\EtaBat", "EtaBat", "[%]")
- AddToErg("\\∆SOC", "∆SOC", "[%]")
-
- HEVorEVdone = True
-
- End If
-
- 'Only EV:
- If GEN0.VehMode = tVehMode.EV And Not EVdone Then
-
- AddToErg("\\EC", "EC", "[kWh/km]")
-
- EVdone = True
-
- End If
-
-
- End If
-
-
- 'Conventional / Hybrid (Everything except EV)
- If GEN0.VehMode <> tVehMode.EV Then
-
- 'Conventional vehicles ...
- 'AddToErg("\\n_norm", "n_norm", "[-]")
- 'AddToErg("\\Pe_norm", "Pe_norm", "[-]")
- AddToErg("\\Ppos", "Ppos", "[-]")
- AddToErg("\\Pneg", "Pneg", "[-]")
-
- If GEN0.CreateMap Then
-
- 'From the measured data
- DRI0 = New cDRI
- DRI0.FilePath = GEN0.CycleFiles(0).FullPath
-
- Try
- If Not DRI0.ReadFile Then Return False
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "File read error! (" & GEN0.CycleFiles(0).FullPath & ")", MsgSrc)
- Return False
- End Try
-
- For Each Em0 In DRI0.EmComponents.Values
-
- If Em0.WriteOutput Then
-
- 'Dump x/h if in ADVANCE mode -or- EngineOnly -or- Units not in x/h and therefore Conversion into x/km is not possible
- If Em0.NormID = tEmNorm.x Or GEN0.VehMode = tVehMode.EngineOnly Or PHEMmode = tPHEMmode.ModeADVANCE Then
- AddToErg(Em0.IDstring, Em0.Name, Em0.Unit, False)
- Else
- AddToErg(Em0.IDstring, Em0.Name, "[" & Em0.RawUnit & "/km]", True)
- End If
-
- End If
-
- Next
-
- AddToErg(sKey.MAP.Extrapol, fMapCompName(tMapComp.Extrapol), "[-]")
-
- Else
-
- 'From the Engine-Map
- ENG0 = New cENG
- ENG0.FilePath = GEN0.PathENG
-
- Try
- If Not ENG0.ReadFile Then Return False
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "File read error! (" & GEN0.PathENG & ")", MsgSrc)
- Return False
- End Try
-
- MAP0 = New cMAP(GEN0.PKWja)
- MAP0.FilePath = ENG0.PathMAP
-
- Try
- If Not MAP0.ReadFile(False) Then Return False 'Fehlermeldungen werden auch bei "MsgOutput = False" ausgegeben
- Catch ex As Exception
- WorkerMsg(tMsgID.Err, "File read error! (" & ENG0.PathMAP & ")", MsgSrc)
- Return False
- End Try
-
-
- For Each str1 In MAP0.EmList
-
- Em0 = MAP0.EmComponents(str1)
-
- If Em0.WriteOutput Then
-
- 'Dump x/h if ADVANCE mode -or- EngineOnly -or- Units not in x/h and therefore Conversion into x/km is not possible
- If Em0.NormID = tEmNorm.x Or GEN0.VehMode = tVehMode.EngineOnly Or PHEMmode = tPHEMmode.ModeADVANCE Then
- AddToErg(Em0.IDstring, Em0.Name, Em0.Unit, False)
- Else
- AddToErg(Em0.IDstring, Em0.Name, "[" & Em0.RawUnit & "/km]", True)
- End If
-
- End If
-
- Next
-
- End If
-
- End If
-
- Next
-
-
- If EngOnly Then
-
- 'currently nothing
-
- End If
-
- If NonEngOnly Then
-
- 'Vehicle-related fields
- AddToErg("\\Pbrake", "Pbrake", "[-]")
- AddToErg("\\EposICE", "EposICE", "[kWh]")
- AddToErg("\\EnegICE", "EnegICE", "[kWh]")
- AddToErg("\\Eair", "Eair", "[kWh]")
- AddToErg("\\Eroll", "Eroll", "[kWh]")
- AddToErg("\\Egrad", "Egrad", "[kWh]")
- AddToErg("\\Eacc", "Eacc", "[kWh]")
- AddToErg("\\Eaux", "Eaux", "[kWh]")
- AddToErg("\\Ebrake", "Ebrake", "[kWh]")
- AddToErg("\\Etransm", "Etransm", "[kWh]")
- AddToErg("\\Mass", "Mass", "[kg]")
- AddToErg("\\Loading", "Loading", "[kg]")
-
- 'CylceKin
- CylceKin = New cCycleKin
- For Each ErgEntry In CylceKin.ErgEntries
- AddToErg("\\" & ErgEntry.Head, ErgEntry.Head, ErgEntry.Unit)
- Next
-
- End If
-
- 'ErgListe sortieren damit g/km und g/h nebeneinander liegen |@@| Sort ErgListe so that g/km and g/h are side-by-side
- iDim = ErgEntryList.Count - 1
-
- For i1 = 0 To iDim - 1
- str = ErgEntries(ErgEntryList(i1)).Head
- For i2 = i1 + 1 To iDim
- If ErgEntries(ErgEntryList(i2)).Head = str Then
- ErgEntryList.Insert(i1 + 1, ErgEntryList(i2))
- ErgEntryList.RemoveAt(i2 + 1)
- End If
- Next
- Next
-
- 'Sort Aux
- For i1 = 0 To iDim - 1
- str = ErgEntries(ErgEntryList(i1)).Head
- If str.Length > 4 AndAlso Left(str, 4) = "Eaux" Then
- For i2 = i1 + 1 To iDim
- If ErgEntries(ErgEntryList(i2)).Head.Length > 4 AndAlso Left(ErgEntries(ErgEntryList(i2)).Head, 4) = "Eaux" Then
- ErgEntryList.Insert(i1 + 1, ErgEntryList(i2))
- ErgEntryList.RemoveAt(i2 + 1)
- End If
- Next
- End If
- Next
-
-
-
- Return True
-
- End Function
-
Public Function ErgHead() As String
Dim s As New System.Text.StringBuilder
Dim key As String
@@ -546,13 +236,13 @@ Class cERG
If Em0.WriteOutput Then
If FCerror Then
- If Em0.NormID = tEmNorm.x Or GEN.VehMode = tVehMode.EngineOnly Or PHEMmode = tPHEMmode.ModeADVANCE Then
+ If Em0.NormID = tEmNorm.x Or GEN.VehMode = tVehMode.EngineOnly Then
ErgEntries(Em0.IDstring).ValueString = "ERROR"
Else
ErgEntries(Em0.IDstring & "_km").ValueString = "ERROR"
End If
Else
- If Em0.NormID = tEmNorm.x Or GEN.VehMode = tVehMode.EngineOnly Or PHEMmode = tPHEMmode.ModeADVANCE Then
+ If Em0.NormID = tEmNorm.x Or GEN.VehMode = tVehMode.EngineOnly Then
ErgEntries(Em0.IDstring).ValueString = Em0.FinalAvg.ToString
Else
ErgEntries(Em0.IDstring & "_km").ValueString = (Em0.FinalAvg / Vquer).ToString
@@ -775,7 +465,27 @@ Class cERG
End Sub
- Public Function Init(ByVal GenFile As String) As Boolean
+ Public Function Init(ByVal GenFile As String) As Boolean
+ Dim GENs As New List(Of String)
+ Dim str As String
+ Dim str1 As String
+ Dim iGEN As Integer
+ Dim file As New cFile_V3
+ Dim GEN0 As cGEN
+ Dim MAP0 As cMAP
+ Dim ENG0 As cENG
+ Dim Em0 As cEmComp
+ Dim HEVorEVdone As Boolean
+ Dim EVdone As Boolean
+ Dim EngOnly As Boolean
+ Dim NonEngOnly As Boolean
+ Dim ErgEntry As cErgEntry
+ Dim CylceKin As cCycleKin
+ Dim i1 As Integer
+ Dim i2 As Integer
+ Dim iDim As Integer
+ Dim DRI0 As cDRI
+
Dim MsgSrc As String
MsgSrc = "SUMALL/Init"
@@ -823,6 +533,254 @@ Class cERG
Lic.FileSigning.AddFile(ERGpath)
+ ErgEntries = New Dictionary(Of String, cErgEntry)
+ ErgEntryList = New List(Of String)
+
+
+ '********************** GEN-Liste raussuchen. Bei ADVANCE aus Flotte sonst aus Jobliste '********************** |@@| Select GEN-list for ADVANCE either from Fleet or from Job-list '**********************
+ For Each str In JobFileList
+ GENs.Add(fFileRepl(str))
+ Next
+ iGEN = GENs.Count - 1
+
+
+ '********************** Create Erg-entries '**********************
+ EVdone = False
+ HEVorEVdone = False
+ EngOnly = False
+ NonEngOnly = False
+
+ 'Vehicle type-independent
+ AddToErg("\\T", "time", "[s]")
+ AddToErg("\\Prated", "Prated", "[kW]")
+
+ 'For each GEN-file check Mode and Map
+ For Each str In GENs
+
+ GEN0 = New cGEN
+
+ GEN0.FilePath = str
+
+ Try
+ If Not GEN0.ReadFile Then
+ WorkerMsg(tMsgID.Err, "Can't read .gen file '" & str & "' !", MsgSrc)
+ Return False
+ End If
+ Catch ex As Exception
+ WorkerMsg(tMsgID.Err, "File read error! (" & str & ")", MsgSrc)
+ Return False
+ End Try
+
+ If GEN0.VehMode = tVehMode.EngineOnly Then
+
+ If Not EngOnly Then
+
+ 'nothing...
+
+ EngOnly = True
+
+ End If
+
+ Else
+
+ If Not NonEngOnly Then
+
+ AddToErg("\\S", "distance", "[km]")
+ AddToErg("\\V", "speed", "[km/h]")
+ AddToErg("\\G", "∆altitude", "[m]")
+
+ NonEngOnly = True
+
+ End If
+
+ 'Auxiliary energy consumption
+ If GEN0.AuxDef Then
+ For Each str1 In GEN0.AuxPaths.Keys
+ AddToErg("\\Eaux_" & UCase(str1), "Eaux_" & str1, "[kWh]")
+ Next
+ End If
+
+ End If
+
+
+ 'Electric-Vehicle / Hybrid
+ If GEN0.VehMode = tVehMode.EV Or GEN0.VehMode = tVehMode.HEV Then
+
+ 'EV & HEV
+ If Not HEVorEVdone Then
+
+ AddToErg("\\PeEM+", "PeEM+", "[kW]")
+ AddToErg("\\PeBat+", "PeBat+", "[kW]")
+ AddToErg("\\PiBat+", "PiBat+", "[kW]")
+ AddToErg("\\PeEM-", "PeEM-", "[kW]")
+ AddToErg("\\PeBat-", "PeBat-", "[kW]")
+ AddToErg("\\PiBat-", "PiBat-", "[kW]")
+ AddToErg("\\EiBat+", "EiBat+", "[kWh]")
+ AddToErg("\\EiBat-", "EiBat-", "[kWh]")
+ AddToErg("\\EtaEM", "EtaEM", "[%]")
+ AddToErg("\\EtaBat", "EtaBat", "[%]")
+ AddToErg("\\∆SOC", "∆SOC", "[%]")
+
+ HEVorEVdone = True
+
+ End If
+
+ 'Only EV:
+ If GEN0.VehMode = tVehMode.EV And Not EVdone Then
+
+ AddToErg("\\EC", "EC", "[kWh/km]")
+
+ EVdone = True
+
+ End If
+
+
+ End If
+
+
+ 'Conventional / Hybrid (Everything except EV)
+ If GEN0.VehMode <> tVehMode.EV Then
+
+ 'Conventional vehicles ...
+ 'AddToErg("\\n_norm", "n_norm", "[-]")
+ 'AddToErg("\\Pe_norm", "Pe_norm", "[-]")
+ AddToErg("\\Ppos", "Ppos", "[-]")
+ AddToErg("\\Pneg", "Pneg", "[-]")
+
+ If GEN0.CreateMap Then
+
+ 'From the measured data
+ DRI0 = New cDRI
+ DRI0.FilePath = GEN0.CycleFiles(0).FullPath
+
+ Try
+ If Not DRI0.ReadFile Then Return False
+ Catch ex As Exception
+ WorkerMsg(tMsgID.Err, "File read error! (" & GEN0.CycleFiles(0).FullPath & ")", MsgSrc)
+ Return False
+ End Try
+
+ For Each Em0 In DRI0.EmComponents.Values
+
+ If Em0.WriteOutput Then
+
+ 'Dump x/h if in ADVANCE mode -or- EngineOnly -or- Units not in x/h and therefore Conversion into x/km is not possible
+ If Em0.NormID = tEmNorm.x Or GEN0.VehMode = tVehMode.EngineOnly Then
+ AddToErg(Em0.IDstring, Em0.Name, Em0.Unit, False)
+ Else
+ AddToErg(Em0.IDstring, Em0.Name, "[" & Em0.RawUnit & "/km]", True)
+ End If
+
+ End If
+
+ Next
+
+ AddToErg(sKey.MAP.Extrapol, fMapCompName(tMapComp.Extrapol), "[-]")
+
+ Else
+
+ 'From the Engine-Map
+ ENG0 = New cENG
+ ENG0.FilePath = GEN0.PathENG
+
+ Try
+ If Not ENG0.ReadFile Then Return False
+ Catch ex As Exception
+ WorkerMsg(tMsgID.Err, "File read error! (" & GEN0.PathENG & ")", MsgSrc)
+ Return False
+ End Try
+
+ MAP0 = New cMAP(GEN0.PKWja)
+ MAP0.FilePath = ENG0.PathMAP
+
+ Try
+ If Not MAP0.ReadFile(False) Then Return False 'Fehlermeldungen werden auch bei "MsgOutput = False" ausgegeben
+ Catch ex As Exception
+ WorkerMsg(tMsgID.Err, "File read error! (" & ENG0.PathMAP & ")", MsgSrc)
+ Return False
+ End Try
+
+
+ For Each str1 In MAP0.EmList
+
+ Em0 = MAP0.EmComponents(str1)
+
+ If Em0.WriteOutput Then
+
+ 'Dump x/h if ADVANCE mode -or- EngineOnly -or- Units not in x/h and therefore Conversion into x/km is not possible
+ If Em0.NormID = tEmNorm.x Or GEN0.VehMode = tVehMode.EngineOnly Then
+ AddToErg(Em0.IDstring, Em0.Name, Em0.Unit, False)
+ Else
+ AddToErg(Em0.IDstring, Em0.Name, "[" & Em0.RawUnit & "/km]", True)
+ End If
+
+ End If
+
+ Next
+
+ End If
+
+ End If
+
+ Next
+
+
+ If EngOnly Then
+
+ 'currently nothing
+
+ End If
+
+ If NonEngOnly Then
+
+ 'Vehicle-related fields
+ AddToErg("\\Pbrake", "Pbrake", "[-]")
+ AddToErg("\\EposICE", "EposICE", "[kWh]")
+ AddToErg("\\EnegICE", "EnegICE", "[kWh]")
+ AddToErg("\\Eair", "Eair", "[kWh]")
+ AddToErg("\\Eroll", "Eroll", "[kWh]")
+ AddToErg("\\Egrad", "Egrad", "[kWh]")
+ AddToErg("\\Eacc", "Eacc", "[kWh]")
+ AddToErg("\\Eaux", "Eaux", "[kWh]")
+ AddToErg("\\Ebrake", "Ebrake", "[kWh]")
+ AddToErg("\\Etransm", "Etransm", "[kWh]")
+ AddToErg("\\Mass", "Mass", "[kg]")
+ AddToErg("\\Loading", "Loading", "[kg]")
+
+ 'CylceKin
+ CylceKin = New cCycleKin
+ For Each ErgEntry In CylceKin.ErgEntries
+ AddToErg("\\" & ErgEntry.Head, ErgEntry.Head, ErgEntry.Unit)
+ Next
+
+ End If
+
+ 'ErgListe sortieren damit g/km und g/h nebeneinander liegen |@@| Sort ErgListe so that g/km and g/h are side-by-side
+ iDim = ErgEntryList.Count - 1
+
+ For i1 = 0 To iDim - 1
+ str = ErgEntries(ErgEntryList(i1)).Head
+ For i2 = i1 + 1 To iDim
+ If ErgEntries(ErgEntryList(i2)).Head = str Then
+ ErgEntryList.Insert(i1 + 1, ErgEntryList(i2))
+ ErgEntryList.RemoveAt(i2 + 1)
+ End If
+ Next
+ Next
+
+ 'Sort Aux
+ For i1 = 0 To iDim - 1
+ str = ErgEntries(ErgEntryList(i1)).Head
+ If str.Length > 4 AndAlso Left(str, 4) = "Eaux" Then
+ For i2 = i1 + 1 To iDim
+ If ErgEntries(ErgEntryList(i2)).Head.Length > 4 AndAlso Left(ErgEntries(ErgEntryList(i2)).Head, 4) = "Eaux" Then
+ ErgEntryList.Insert(i1 + 1, ErgEntryList(i2))
+ ErgEntryList.RemoveAt(i2 + 1)
+ End If
+ Next
+ End If
+ Next
+
Return True
End Function