MitLib v1.39.15

Change-Id: Ibfa8bc968a906ad850147dfa061a7990d1f4c604

MITLIB/GuiDLL/GuiDLL.rc

@@ -153,7 +153,7 @@ END
 IDD_MAINTENANCE_PAGE DIALOGEX 0, 0, 663, 316
 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "I/O && Motors"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Valve1",IDC_OUTPUT_CHK1,185,12,80,35,BS_CENTER | 
                     BS_MULTILINE | WS_GROUP
@@ -305,7 +305,7 @@ BEGIN
     GROUPBOX        "Motor Status",IDC_MOTOR_SPEED_SETTING2,353,227,220,45
     GROUPBOX        "Maintenance Message",IDC_MOTOR_SPEED_SETTING3,353,272,
                     220,40
-    EDITTEXT        IDC_MESSAGE_EDIT1,356,283,213,27,ES_MULTILINE | 
+    EDITTEXT        IDC_MESSAGE_EDIT1,356,283,213,25,ES_MULTILINE | 
                     ES_READONLY | WS_VSCROLL,WS_EX_DLGMODALFRAME | 
                     WS_EX_CLIENTEDGE | WS_EX_STATICEDGE
     PUSHBUTTON      "Motor On",IDC_MTR_ON_BUTTON,583,159,70,30
@@ -1208,8 +1208,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO
 #else
 VS_VERSION_INFO VERSIONINFO
 #endif
- FILEVERSION 1,0,24,14
- PRODUCTVERSION 1,0,24,14
+ FILEVERSION 1,0,24,13
+ PRODUCTVERSION 1,0,24,13
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1224,17 +1224,17 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments", "1. Solve Auto logout did not inform application level that user login has changed\r\n2. Solve motor position + index cannot have more than 50\r\n3. Increase Maintanence Page message box so that it can display 2 lines of message\r\n4. Select Secondary langauage will Prompt Error when using New Hardward Entry Method\r\n5. Configurable color for E10 and Mode display in Handler GUI"
+            VALUE "Comments", "1. Solve software crash when post maintance message to GUI and motor no = 0\0"
             VALUE "CompanyName", "MIT \0"
             VALUE "FileDescription", "GuiDLL\0"
-            VALUE "FileVersion", "1, 0, 24, 14\0"
+            VALUE "FileVersion", "1, 0, 24, 13\0"
             VALUE "InternalName", "GuiDLL\0"
             VALUE "LegalCopyright", "Copyright ?2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "GuiDLL.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "MIT  GuiDLL\0"
-            VALUE "ProductVersion", "1, 0, 24, 14\0"
+            VALUE "ProductVersion", "1, 0, 24, 13\0"
             VALUE "SpecialBuild", "\0"
         END
     END

MITLIB/GuiDLL/MaintenancePage.h

@@ -2,12 +2,11 @@
 // General information section.
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 // $Author:yongkiang$ User who last changed the file
-// $Date:5/23/2013 10:43:30 AM$ Date and time of last check in
-// $Revision:1.12$ Visual SourceSafe version number
+// $Date:6/26/2012 5:04:29 PM$ Date and time of last check in
+// $Revision:1.11$ Visual SourceSafe version number
 // $Workfile::   MaintenancePage.h                                     $ Filename
 // End =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 //{{AFX_INCLUDES()
-
 #include "MyTreeCtrl.h"
 #include "structure.h"
 #include "MyPropertyPage.h"
@@ -15,9 +14,6 @@
 #include "OutputController.h"
 #include "MotionController.h"
 #include "ShadeButtonST.h"
-
-#include <map>
-
 //}}AFX_INCLUDES
 #if !defined(AFX_MAINTENANCEPAGE_H__61C5CDF7_71EB_11D6_A7FC_005004C029CA__INCLUDED_)
 #define AFX_MAINTENANCEPAGE_H__61C5CDF7_71EB_11D6_A7FC_005004C029CA__INCLUDED_
@@ -182,7 +178,7 @@ private:
 //	clear all motor text when module has no motor
 	void ClearAllMtrText();
 
-	int GetSubField(CString csPosName, std::map<int, CString>  &strItem);
+	int GetSubField(CString csPosName, CString strItem[50]);
 
 //	Get sub Motor Position and update to control
 	void GetSubFieldPosValue();

MITLIB/GuiDLL/runview.h

@@ -1,9 +1,9 @@
 // Start =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 // General information section.
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-// $Author:yongkiang$ User who last changed the file
-// $Date:6/25/2013 7:06:09 PM$ Date and time of last check in
-// $Revision:1.13$ Visual SourceSafe version number
+// $Author:Gary Lam$ User who last changed the file
+// $Date:25/07/12 5:41:15 PM$ Date and time of last check in
+// $Revision:1.12$ Visual SourceSafe version number
 // $Workfile::   runview.h                                             $ Filename
 // End =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 //{{AFX_INCLUDES()
@@ -246,13 +246,6 @@ private:
 	DWORD m_dwAutoLogoutStartTimer;
 
 	bool m_bAutoLogoutOnlyWhenEngineeringSwitchOFF;
-
-	// Phyu 17June2013 V1.24.15, different COLORREF for E10 State
-	bool	m_bDisplayColorByE10Status;
-	COLORREF	m_colorE10Status[E10_MAX_STATUS];
-	// Phyu 17June2013 V1.24.15, different COLORREF for Main Mode
-	bool	m_bDisplayColorByModeStatus;
-	COLORREF	m_colorModeStatus[MAINMODE_MAX];
 };
 ///////////////////////////////////////////////////////////////
 // Call this function to get a pointer to the view’s document. 

MITLIB/Include/commondef.h

@@ -1,9 +1,9 @@
 // Start =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 // General information section.
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-// $Author:yongkiang$ User who last changed the file
-// $Date:6/25/2013 7:08:30 PM$ Date and time of last check in
-// $Revision:1.6$ Visual SourceSafe version number
+// $Author:Gary Lam$ User who last changed the file
+// $Date:13/09/2010 3:11:15 PM$ Date and time of last check in
+// $Revision:1.5$ Visual SourceSafe version number
 // $Workfile::   commondef.h                                           $ Filename
 // End =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #if !defined __COMMONDEF_H__
@@ -242,28 +242,4 @@ static const char *MAINT_PORT_NUM = "Port No";
 #define		LIGHT_GREEN		2
 #define		LIGHT_BUZZER	3
 
-//phyu add in 17June2013
-enum E10_STATUS
-{
-	E10_PRODUCTIVE,
-	E10_STANDBY,
-	E10_ENGINEERING,
-	E10_SCHEDULED_DOWN,
-	E10_UNSCHEDULED_DOWN,
-	E10_NONSCHEDULED,
-	E10_MAX_STATUS,
-};
-
-//phyu add in 17June2013
-enum MAINMODE
-{
-	NOMATERIAL_MODE,
-	PRODUCTION_MODE,
-	ENGINEERING_MODE,
-	SCHEDULED_MODE,
-	NON_SCHEDULED_MODE,
-	MAINMODE_MAX,
-
-};
-
 #endif // !defined __COMMONDEF_H__