Changeset 833 for applications/doprava/aimsun_bdm

Timestamp:

02/23/10 14:52:04 (15 years ago)

Author:

prikryl

Message:

Cleaned the handling of szBasePath.

Files:

• applications/doprava/aimsun_bdm/aimsun_ds.cpp (modified) (2 diffs)

applications/doprava/aimsun_bdm/aimsun_ds.cpp

@@ -67 +67 @@
         intptr_t hPid;
 
-        TCHAR * last;
-
         int verIndex = 1; //@TODO@: 0 is for release, 1 for debug build of the DLL libraries.
 
-        /* Determine the root directory of the simulator installation on
-           this machine. Start with the full path to the directory where
-           this executable resides. */
-        //GetModuleFileName ( NULL, szBasePath, MAX_PATH );
+        /* The root directory of the simulator tree is defined externally
+           in "CMakeLists.txt". */
         StringCbCopy ( szBasePath, MAX_PATH_BYTES, BASE_PATH );
-        /* Now move up. The root of the installation is one directory above
-           the directory of this executable, but the current value of the
-           path contains also the executable name.
-           The first search for backslash removes the executable from the
-           path.*/
-        //last = _tcsrchr ( szBasePath, '\\' );
-        //*last = '\0';
-        /* The second moves to the root of the installation. */
-        //last = _tcsrchr ( szBasePath, '\\' );
-        //*last = '\0';
 
         /* Create the path to DLL directory.
@@ -291 +277 @@
   Drv = RV ( "{"
     "495_VA  495_VB   495_VC   495_VD   495_VE   495_VF "
-    "495iDVA 495iDVB  495iDVA1 495iDVB1 495iDVC  495iDVD  495iDVE  495iDVF  495iDVF1 "
-    "495iS1  495iS2   495iS3   495iS4   495iS5   495iS5a "
-    "495oDVA 495oDVB  495oDVA1 495oDVB1 495oDVC  495oDVD  495oDVE  495oDVF  495oDVF1 "
-    "495oS1  495oS2   495oS3   495oS4   495oS5   495oS5a "
+    "495_DVA 495_DVB  495_DVA1 495_DVB1 495_DVC  495_DVD  495_DVE  495_DVF  495_DVF1 "
+    "495_S1  495_S2   495_S3   495_S4   495_S5   495_S5a "
     "601_VA  601_VB   601_VC   601_VD   601_VE   601_SE "
-    "601iDVA 601iDVAa 601iDVB  601iDVBa 601iDVB1 601iDVC  601iDVD  601iDVD1 601iDSE 601iDVE 601iDSE1 601iDVE1 "
-    "601iS6  601iS6a  601iS7   601iS8   601iS9   601iS9a "
-    "601oDVA 601oDVAa 601oDVB  601oDVBa 601oDVB1 601oDVC  601oDVD  601oDVD1 601oDSE 601oDVE 601oDSE1 601oDVE1 "
-    "601oS6  601oS6a  601oS7   601oS8   601oS9   601oS9a "
+        "601_DVA 601_DVAa 601_DVB  601_DVBa 601_DVB1 601_DVC  601_DVD  601_DVD1 601_DSE 601_DVE 601_DSE1 601_DVE1 "
+    "601_S6  601_S6a  601_S7   601_S8   601_S9   601_S9a "
     "}" );
   /* Remember the size of the data vector. */