--- a/MCELevelControlSecondary.cpp
+++ b/MCELevelControlSecondary.cpp
@@ -33,8 +33,10 @@
 	m_b2D_map_Visible = FALSE;
     m_bTransparentSurface = FALSE;
     m_fTransparency_level = 0.5;
+    m_map_surface = TRUE;
 	//}}AFX_DATA_INIT
 	m_pMCEView = NULL;
+    m_calculate_trajectories = FALSE;
 }
 
 
@@ -50,8 +52,10 @@
 	DDX_Scroll(pDX, IDC_LAYER2_SCROLL, m_nLayer2Scroll);
 	DDX_Text(pDX, IDC_LAYER2_VALUE, m_fLayer2Value);
 	DDX_Check(pDX, IDC_LAYER2_VISIBLE, m_bLayer2Visible);
+    DDX_Check(pDX, IDC_CHECK_TRAJECTORIES2, m_calculate_trajectories);    
 	DDX_Scroll(pDX, IDC_LAYER3_SCROLL, m_nLayer3Scroll);
 	DDX_Text(pDX, IDC_LAYER3_VALUE, m_fLayer3Value);
+    DDX_Check(pDX, IDC_CHECK_MAP_SURFACE2, m_map_surface); 
 	DDX_Check(pDX, IDC_LAYER3_VISIBLE, m_bLayer3Visible);
 	DDX_Check(pDX, IDC_LAYER1_VISIBLE, m_bLayer1Visible);
 	DDX_Text(pDX, IDC_2D_LEVEL, m_n2D_map_level);
@@ -60,6 +64,7 @@
 	DDX_Control(pDX, IDC_SEXPONENCIAL_SB, m_bSExponencialSB);
 	DDX_Radio(pDX, IDC_CONTOUR_LINES_SEC, m_iMapMode);
 	DDX_Check(pDX, IDC_REVERSE_NORMALS_SEC, m_bReverseNormals);
+    DDX_Check(pDX, IDC_SURFACE_LIKE_LINES2, m_bSurfaceLikeLines);
     DDX_Check(pDX, IDC_TRANSPARENT_SURFACE_SEC, m_bTransparentSurface);
     DDX_Text(pDX, IDC_TRANSPARENCY_LEVEL_SEC, m_fTransparency_level);
 
@@ -79,6 +84,7 @@
     ON_WM_CTLCOLOR()
 	//}}AFX_MSG_MAP
     ON_BN_CLICKED(IDC_BUTTON_CUSTOM2, &CMCELevelControlSecondary::OnBnClickedButtonCustom2)
+    ON_BN_CLICKED(IDC_BUTTON_CUSTOM_TRAJ2, &CMCELevelControlSecondary::OnBnClickedButtonCustomTraj2)
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -337,21 +343,41 @@
 	m_bSExponencialSB.SetCheck(0);
 
 	RefreshScrollValues();
-	CComboBox* pCombo;
-	pCombo = (CComboBox*)GetDlgItem(IDC_COMBO6);
-	pCombo->ResetContent();
-	pCombo->AddString("XY - direction"); //0
-	pCombo->AddString("ZX - direction"); //1
-	pCombo->AddString("YZ - direction"); //2
-	pCombo->SelectString(0, "XY - direction");
+    CComboBox* pCombo;
+    pCombo = (CComboBox*)GetDlgItem(IDC_COMBO6);
+    pCombo->ResetContent();
+    pCombo->AddString("XY - direction"); //0
+    pCombo->AddString("ZX - direction"); //1
+    pCombo->AddString("YZ - direction"); //2
+    pCombo->SetCurSel(m_nDropList2DMapDirection);
+    /*
+    if(m_nDropList2DMapDirection==2) {
+        pCombo->SelectString(0, "YZ - direction");
+    } else if(m_nDropList2DMapDirection==1) {
+        pCombo->SelectString(0, "ZX - direction");
+    } else {        
+        pCombo->SelectString(0, "XY - direction");
+    }
+    */
 
     pCombo = (CComboBox*)GetDlgItem(IDC_COMBO_COLOR_SCHEME2);
     pCombo->ResetContent();
     pCombo->AddString("lines"); //0
     pCombo->AddString("two colors"); //1
     pCombo->AddString("lines and two colors"); //2
-    pCombo->AddString("two colors with 3D map"); //3
-    pCombo->SelectString(0, "lines and two colors");
+    pCombo->AddString("two colors with 3D map"); //3 
+    pCombo->SetCurSel(m_nDropList2DMapStyle);
+    /*
+    if(m_nDropList2DMapStyle==3) {
+        pCombo->SelectString(0, "two colors with 3D map");
+    } else if(m_nDropList2DMapStyle==2) {
+        pCombo->SelectString(0, "lines and two colors");
+    } else if(m_nDropList2DMapStyle ==1) {        
+        pCombo->SelectString(0, "two colors");
+    } else {
+        pCombo->SelectString(0, "lines");
+    }
+    */
 	
 	return TRUE;  // return TRUE unless you set the focus to a control
 }
@@ -416,3 +442,24 @@
     }
     CMCELevelControlSecondary::OnApply();
 }
+
+
+void CMCELevelControlSecondary::OnBnClickedButtonCustomTraj2()
+{
+    TrajectoriesSetting dlg;
+    dlg.m_nb_traj = m_traj_nb_traj;
+    dlg.m_starting_distance = m_traj_starting_distance;
+    dlg.m_step_size = m_traj_step_size;
+    dlg.m_col[0] = m_traj_col[0];
+    dlg.m_col[1] = m_traj_col[1];
+    dlg.m_col[2] = m_traj_col[2];
+    if (dlg.DoModal() == IDOK) { 
+        m_traj_nb_traj = dlg.m_nb_traj;
+        m_traj_starting_distance = dlg.m_starting_distance;
+        m_traj_step_size =  dlg.m_step_size;
+        m_traj_col[0] = dlg.m_col[0];
+        m_traj_col[1] = dlg.m_col[1];
+        m_traj_col[2] = dlg.m_col[2];        
+    }
+    CMCELevelControlSecondary::OnApply();
+}