--- trunk/H7 Server/H7 ServerDlg.cpp	2007/01/29 14:35:42	8
+++ trunk/H7 Server/H7 ServerDlg.cpp	2007/01/29 16:18:31	11
@@ -135,45 +135,8 @@
 /**********************************************************************/
 	// TODO: Add extra initialization here
 	
-	// Sets values in baud-rate combo box	
-	m_BaudRate.AddString("1200");					
-	m_BaudRate.AddString("2400");					
-	m_BaudRate.AddString("4800");	// Don't work, used for error test.			
-	m_BaudRate.AddString("9600");					
-	m_BaudRate.AddString("19200");
-
-	// Checks how many COM ports there are.
-	std::vector<CString> Serial = GetAvailableComPorts();
-	for (unsigned int i=0; i<Serial.size(); i++)
-		m_Serial.AddString(Serial[i]);
-	m_Serial.SetCurSel(0);
-
-	// Load saved settings from regedit.
-	unsigned long Port;
-	unsigned long BaudRate;
-//	CString LoadCom;
-
-// Used to format the loaded values.
-	CString TPort;
-	CString TBaudRate;
-
-	CRegKey reg;
-	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
-	reg.QueryDWORDValue("Port", Port);
-	reg.QueryDWORDValue("BaudRate", BaudRate);
-
-	char LoadCom[20];
-	unsigned long size = 20;
-	reg.QueryStringValue("Serial", LoadCom, &size);
-
-	TPort.Format("%d", Port);
-	TBaudRate.Format("%d", BaudRate);
-//	TLoadCom.Format("%s", TLoadCom);
+	ServerInit();
 
-	m_Port.SetWindowText(TPort);
-	m_BaudRate.SetWindowText(TBaudRate);
-	m_Serial.SetWindowText(LoadCom);
-	MessageBox(LoadCom);
 /**********************************************************************/
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -229,54 +192,146 @@
 
 void CH7ServerDlg::OnBnClickedStart()
 {
+// Get TCp port 
 	CRegKey reg;
 	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
 	unsigned long Port;
 	reg.QueryDWORDValue("Port", Port);
 
-	CString tmp;
-	tmp.Format("%d", Port);
-	m_Port.SetWindowText(tmp);
+// Add's user defined Baud-Rate to regedit before the server start.
+	CString Baud;
+	m_BaudRate.GetWindowText(Baud);
+	reg.SetDWORDValue("BaudRate", atoi(Baud) );
+
+	StartTcp();
 }
 
 int CH7ServerDlg::StartTcp(void)
 {
+// Gets the TCP Port number from regedit.
 	unsigned long Port;
 	CRegKey reg;
 	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
 	reg.QueryDWORDValue("Port", Port);
+	reg.Close();
+
+// Restats the TCP Connection
 	TcpServer.Close();
 
 	TcpServer.Create(Port);
 	TcpServer.Listen();
+
+// Prints TCP Port number to the status box.
+	CString tmp;
+	tmp.Format("%d", Port);
+	m_Port.SetWindowText(tmp);
+
 	return 0;
 }
 
-void CH7ServerDlg::OnBnClickedTest()
+void CH7ServerDlg::OnBnClickedRestart()
 {
-	//**************** <TCP Port section> ****************/
-	CString Port = "";
-	
+	CWaitCursor wait;		// Musen viser timeglas.
+	CString Port;
 	m_Port.GetWindowText(Port);
-// Saving Port number in regedit as int
 	CRegKey reg;
 	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
 	reg.SetDWORDValue("Port", atoi(Port) );
+	
+	CString tmp;
+	m_Serial.GetWindowText(tmp);
+	reg.SetStringValue("Serial",tmp);
 	reg.Close();
-// Debug info to the status edit box.
-	m_Status.SetWindowText(Port);
-//**************** </TCP Port section> ****************/
 	StartTcp();
 }
 
-
-void CH7ServerDlg::OnBnClickedRestart()
+void CH7ServerDlg::OnBnClickedTest()
 {
-	CWaitCursor wait;		// Musen viser timeglas.
-	CString Port;
-	m_Port.GetWindowText(Port);
+	
+}
+void CH7ServerDlg::ServerInit(void)
+{
+	int i;
 	CRegKey reg;
+// Sets values in baud-rate combo box	
+	m_BaudRate.AddString("1200");					
+	m_BaudRate.AddString("2400");					
+	m_BaudRate.AddString("4800");	// Don't work, used for error test.			
+	m_BaudRate.AddString("9600");					
+	m_BaudRate.AddString("19200");
+
+	unsigned long Baud;
+	CString GetBaud;
 	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
-	reg.SetDWORDValue("Port", atoi(Port) );
-	StartTcp();
+	reg.QueryDWORDValue("BaudRate", Baud);
+
+	switch (Baud)
+	{
+	case 1200:
+		m_BaudRate.SetCurSel(0);
+		break;
+	case 2400:
+		m_BaudRate.SetCurSel(1);
+		break;
+	case 4800:
+		m_BaudRate.SetCurSel(2);
+		break;
+	case 9600:
+		m_BaudRate.SetCurSel(3);
+		break;
+	case 19200:
+		m_BaudRate.SetCurSel(4);
+		break;
+	default:
+		m_BaudRate.SetCurSel(3);
+		break;
+	}
+
+	m_BaudRate.GetWindowText(GetBaud);
+	reg.SetDWORDValue("BaudRate", atoi(GetBaud) );
+
+// Checks how many COM ports there are.
+	std::vector<CString> Serial = GetAvailableComPorts();
+	for (i=0; i<Serial.size(); i++)
+		m_Serial.AddString(Serial[i]);
+
+// Load saved settings from regedit.
+	unsigned long Port;
+	unsigned long BaudRate;
+
+	// Used to format the loaded values.
+	CString TPort;
+	CString TBaudRate;
+
+	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
+	reg.QueryDWORDValue("Port", Port);
+	reg.QueryDWORDValue("BaudRate", BaudRate);
+
+	char LoadCom[20];
+	unsigned long size = 20;
+	reg.QueryStringValue("Serial", LoadCom, &size);
+
+	TPort.Format("%d", Port);
+	TBaudRate.Format("%d", BaudRate);
+
+	m_Port.SetWindowText(TPort);
+	m_BaudRate.SetWindowText(TBaudRate);
+	m_Serial.SetWindowText(LoadCom);
+
+// Checks for valid COM port in regedit.
+	for (i=0; i< Serial.size() ; i++)
+	{
+		if (LoadCom == Serial[i])
+		{
+			m_Serial.SetCurSel(i);
+			break;
+		}
+	}
+	if (i == Serial.size() )
+	{
+		m_Serial.SetCurSel(0);
+		reg.SetStringValue("Serial", Serial[0]);
+	}
+	reg.Close();
+
 }