26.11.1999 U. Sacklowski Vergleich RTK-Sourcen - XCTL-Sourcen ================================================================ Nachfolgend das Ergebnis des Vergleiches aller Source-Files unserer bisher verwendeten Sourcen unter ~sacklows/PROJ_SE_WS98/Programme/Windows/RTK.zip und der neuen Sourcen unter ~sacklows/PROJ_SE_WS98/Programme/Windows/XCTL9702.zip verwendetes Kommando: %diff Gleiche Files sind gekennzeichnet mit: *********************** Ungleiche Files sind gekennzeichnet mit: ----------------------- Bei Ungleichheit beziehen sich die Zahlen auf die Zeilennummern ================================================================ Los geht's: am9513.cpp ************************** am9513a.h ************************** braunpsd.cpp --------------------------------------- 231a232 > char aBuf[MaxString]; 246a248,252 > > sprintf(aBuf,"%u",uEnergyHigh); > WritePrivateProfileString(Ident,"EnergyHigh",aBuf,GetCFile()); > sprintf(aBuf,"%u",uEnergyLow); > WritePrivateProfileString(Ident,"EnergyLow",aBuf,GetCFile()); 689a696 > #ifndef __WIN32__ 780a788 > #endif c_8x2.inc *************************** c_layer.cpp --------------------------------------- 19c19 < static char dlVersion[] = "V 1.55 ("__DATE__")"; --- > static char dlVersion[] = "V 1.52 ("__DATE__")"; c_layer.h ***************************** comclass.h **************************** comhead.h **************************** counters.cpp ----------------------------------------- 1620c1620 < void TRadicon::SetSpecificParametersDlg(void) --- > void TRadicon::SetSpezificParametersDlg(void) counters.def ***************************** counters.rc ------------------------------------------- RTK: englisch XCTL: deutsch dfkisl.h *********************************** dlg_tpl.cpp --------------------------------------------- 152,155c152 < HINSTANCE hin = GetMainInstance(); < HANDLE han = GetFrameHandle(); < < hWindow = CreateDialog(hin,RC_Name,GetFocus(),dialogFunc); --- > hWindow = CreateDialog(GetMainInstance(),RC_Name,GetFrameHandle(),ModelessProc); dlg_tpl.h *************************************** gpib.cpp ***************************************** help_def.h *************************************** ieee.h **************************************** kisl1.c **************************************** kmpt1.c **************************************** l_layer.cpp -------------------------------------------------- RTK: engl. XCTL: dt. 15c15 < static char spVersion[] = "V 1.55 ("__DATE__")"; --- > static char spVersion[] = "V 1.51 ("__DATE__")"; 103c103 < strcpy(HeadLine,"About Steuerprogramm"); --- > strcpy(HeadLine,"Über Steuerprogramm"); 116c116 < MessageBox(GetFocus(),WorkAddress,"Address",MBINFO); --- > MessageBox(GetFocus(),WorkAddress,"Adresse",MBINFO); 120c120 < MessageBox(GetFocus(),AuthorAddress,"Address",MBINFO); --- > MessageBox(GetFocus(),AuthorAddress,"Adresse",MBINFO); l_layer.h ************************************* m_arscan.cpp ----------------------------------------------------- XCTL ist wesentlich kuerzer RTL: 87804 XCTL: 84805 m_curve.cpp ----------------------------------------------------- 202,203c202,203 < if(MaxPointIdx > (MaxMemIdx-5)) < FastOpen(); --- > if(MaxPointIdx > (MaxMemIdx-5)) > FastOpen(); 454c454,455 < FILE* hFile; --- > OFSTRUCT of; > int hFile; 458,459c459,460 < hFile = fopen(filename,"w+"); < if(!hFile) --- > hFile = OpenFile(filename,&of,OF_CREATE); > if(-1 == hFile) 462,463c463 < sprintf(buf,"# Value Number : %d # \n",MaxPointIdx + 1); < fwrite((LPSTR)buf,strlen(buf),1,hFile); --- > _llseek(hFile,0,SEEK_END); 469,470c469,470 < sprintf(buf,"%.4f\n",y); < fwrite((LPSTR)buf,strlen(buf),1,hFile); --- > sprintf(buf,"%.5f\n",y); > _lwrite(hFile,(LPSTR)buf,strlen(buf)); 474c474 < fclose(hFile); --- > _lclose(hFile); m_curve.h ******************************************* m_data.cpp ----------------------------------------------------------- umfangreiche Aenderungen Laenge: RTK: 56753 XCTL: 52569 m_data.h ******************************************* m_devcom.h ******************************************* m_devhw.h ------------------------------------------------------- umfangreiche Aenderungen Laenge: RTK: 2573 XCTL: 4417 m_device.cpp *************************************** m_dlg.cpp *************************************** m_dlg.h *************************************** m_layer.cpp ------------------------------------------------------- 10c10 < static char mlVersion[] = "V 1.55 ("__DATE__")"; --- > static char mlVersion[] = "V 1.51 ("__DATE__")"; m_layer.h ***************************************** m_lscan.h ------------------------------------------------------- existiert nur in XCTL m_main.cpp ***************************************** m_motcom.h ***************************************** m_mothw.h ***************************************** m_psd.h ***************************************** m_scan.cpp ***************************************** m_steerg.cpp ------------------------------------------------------ groessere Aenderungen Hauptunterschied: RTK: engl. XCTL: dt. Laenge: RTK: 75244 XCTL: 76332 m_steerg.h ***************************************** m_topo.cpp ***************************************** m_topo.h ***************************************** m_xscan.h ------------------------------------------------------- 319,323d318 < int InitializeInterface(void); < BOOL GetPortBit(void); < int GetCounterValue(void); < BOOL MShouldStarted(void); < BOOL MShouldStopped(void); 324a320 > BOOL bCalibrationOk; 325a322 > float fOldPsdStep; 329d325 < int nLastCounterValue; 332d327 < char aFileName[127]; 336,341c331 < int nIOPortAddr; < int nBitNumber; < BOOL bStateTriggered; < int nDifference; < BOOL bMeasureActive; < BOOL bInitiateSaving; --- > char aFileName[127]; main.rc ------------------------------------------------------ groessere Aenderungen Laenge: RTK: 66620 XCTL: 80895 motors.cpp ------------------------------------------------------ groessere Aenderungen Laenge: RTK: 86099 XCTL: 87287 motors.rc ------------------------------------------------------ groessere Aenderungen Laenge: RTK: 7610 XCTL: 11598 pcl_830.inc ************************************* Prkmpt1.h ************************************* radicon.h ************************************* rc_def.h ------------------------------------------------------ 6a7 > #define IDC_InterruptPSDCycle 103 10,12d10 < #define IDC_StateTriggered 105 < #define IDC_PollTime 103 < #define IDC_BitNumber 109 Scanner.rc ------------------------------------------------------ neu bei XCTL sphelp.hpj *************************************** splib.rc ------------------------------------------------------ RTK: engl. XCTL: dt. 27,28c27,28 < FILEVERSION 1, 1, 22, 1 < PRODUCTVERSION 1, 5, 5, 0 --- > FILEVERSION 1, 1, 82, 1 > PRODUCTVERSION 1, 5, 0, 0 38c38 < VALUE "FileVersion", "1.55\000\000" --- > VALUE "FileVersion", "1.82\000\000" 40,41c40,41 < VALUE "LegalCopyright", "Heiko Damerow © 1993,97\000\000" < VALUE "OriginalFilename", "splib.dll\000" --- > VALUE "LegalCopyright", "Heiko Damerow © 1993,96\000\000" > VALUE "OriginalFilename", "SPLib.dll\000" St_layer.cpp, St_layer.h --------------------------------------------------------- neu bei XCTL stoe_psd.inc ***************************************** Timer.CPP *****************************************