Subversion Repositories f9daq

Compare Revisions

Ignore whitespace Rev 133 → Rev 132

/cvi/instr/MIKRO/MIKRO.c
315,12 → 315,8
 
if (InitCVIRTE (hInstance, 0, 0) == 0) return -1; /* out of memory */
 
#ifdef _CVI_DEBUG_
p1_h = LoadPanel (0,"MIKRO_ui.uir", P1);
# else
// p1_h = LoadPanel (0,"MIKRO_ui.uir", P1);
p1_h = BuildP1 (0);
#endif /* _CVI_DEBUG_ */
ierr = DisplayPanel (p1_h);
ierr = SetActiveCtrl (p1_h,P1_B1);
ierr = SetActiveCtrl (p1_h,P1_B2);
/cvi/instr/MIKRO/MIKRO.prj
1,6 → 1,6
[Project Header]
Version = 1302
Pathname = "/c/home/cvi/instr/MIKRO/MIKRO.prj"
Pathname = "/c/SAMO/Programi/NI/cvi/instr/MIKRO/MIKRO.prj"
CVI Dir = "/c/program files (x86)/national instruments/cvi2013"
CVI Shared Dir = "/C/Program Files (x86)/National Instruments/Shared/CVI"
CVI Pub Local Dir = "/C/ProgramData/National Instruments/CVI2013"
34,7 → 34,7
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "MIKRO.c"
Path = "/c/home/cvi/instr/MIKRO/MIKRO.c"
Path = "/c/SAMO/Programi/NI/cvi/instr/MIKRO/MIKRO.c"
Exclude = False
Compile Into Object File = False
Project Flags = 0
47,7 → 47,7
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "MIKRO_uic.c"
Path = "/c/home/cvi/instr/MIKRO/MIKRO_uic.c"
Path = "/c/SAMO/Programi/NI/cvi/instr/MIKRO/MIKRO_uic.c"
Exclude = False
Compile Into Object File = False
Project Flags = 0
60,7 → 60,7
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "MIKRO.h"
Path = "/c/home/cvi/instr/MIKRO/MIKRO.h"
Path = "/c/SAMO/Programi/NI/cvi/instr/MIKRO/MIKRO.h"
Exclude = False
Project Flags = 0
Folder = "Include Files"
72,7 → 72,7
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "MIKRO_uic.h"
Path = "/c/home/cvi/instr/MIKRO/MIKRO_uic.h"
Path = "/c/SAMO/Programi/NI/cvi/instr/MIKRO/MIKRO_uic.h"
Exclude = False
Project Flags = 0
Folder = "Include Files"
84,7 → 84,7
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "MIKRO.fp"
Path = "/c/home/cvi/instr/MIKRO/MIKRO.fp"
Path = "/c/SAMO/Programi/NI/cvi/instr/MIKRO/MIKRO.fp"
Exclude = False
Project Flags = 0
Folder = "Instrument Files"
96,7 → 96,7
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "MIKRO_ui.uir"
Path = "/c/home/cvi/instr/MIKRO/MIKRO_ui.uir"
Path = "/c/SAMO/Programi/NI/cvi/instr/MIKRO/MIKRO_ui.uir"
Exclude = False
Project Flags = 0
Folder = "User Interface Files"
162,7 → 162,7
Numeric Prod Version = "1,0,0,0"
Comments = ""
Comments Ex = ""
Company Name = "Jozef Stefan Institute"
Company Name = ""
Company Name Ex = "%company"
File Description = "MIKRO_dbg (Debug x86)"
File Description Ex = "%application (%rel_dbg %arch)"
170,7 → 170,7
File Version Ex = "%f1.%f2"
Internal Name = "MIKRO_dbg"
Internal Name Ex = "%basename"
Legal Copyright = "Copyright © Jozef Stefan Institute 2015"
Legal Copyright = "Copyright © 2014"
Legal Copyright Ex = "Copyright © %company %Y"
Legal Trademarks = ""
Legal Trademarks Ex = ""
178,7 → 178,7
Original Filename Ex = "%filename"
Private Build = ""
Private Build Ex = ""
Product Name = "Jozef Stefan Institute MIKRO_dbg"
Product Name = " MIKRO_dbg"
Product Name Ex = "%company %application"
Product Version = "1.0"
Product Version Ex = "%p1.%p2"
217,7 → 217,7
Stack Commit = 4096
Image Base Address = 4194304
Image Base Address x64 = 4194304
Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DMIKRO_MAIN"
Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DTEST"
Sign = False
Sign Store = ""
Sign Certificate = ""
243,32 → 243,6
Using LoadExternalModule = True
DLL Exports = "Include File Symbols"
Register ActiveX Server = False
Numeric File Version = "1,0,0,0"
Numeric Prod Version = "1,0,0,0"
Comments = ""
Comments Ex = ""
Company Name = "Jozef Stefan Institute"
Company Name Ex = "%company"
File Description = "MIKRO (Release x86)"
File Description Ex = "%application (%rel_dbg %arch)"
File Version = "1.0"
File Version Ex = "%f1.%f2"
Internal Name = "MIKRO"
Internal Name Ex = "%basename"
Legal Copyright = "Copyright © Jozef Stefan Institute 2015"
Legal Copyright Ex = "Copyright © %company %Y"
Legal Trademarks = ""
Legal Trademarks Ex = ""
Original Filename = "MIKRO.exe"
Original Filename Ex = "%filename"
Private Build = ""
Private Build Ex = ""
Product Name = "Jozef Stefan Institute MIKRO"
Product Name Ex = "%company %application"
Product Version = "1.0"
Product Version Ex = "%p1.%p2"
Special Build = ""
Special Build Ex = ""
Add Type Lib To DLL = False
Include Type Lib Help Links = False
TLB Help Style = "HLP"
414,15 → 388,18
Image Base Address x64 = 4194304
 
[Compiler Defines]
Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DMIKRO_MAIN"
Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DTEST"
 
[Create Executable]
Executable File_Debug Is Rel = True
Executable File_Debug Rel To = "Project"
Executable File_Debug Rel Path = "MIKRO_dbg.exe"
Executable File_Debug = "/c/home/cvi/instr/MIKRO/MIKRO_dbg.exe"
Executable File_Release Is Rel = False
Executable File_Release = "MIKRO.exe"
Executable File_Debug = "/c/SAMO/Programi/NI/cvi/instr/MIKRO/MIKRO_dbg.exe"
Executable File_Release Is Rel = True
Executable File_Release Rel To = "CVI"
Executable File_Release Rel To Override = "CVI"
Executable File_Release Rel Path = "instr/MIKRO_old/MIKRO.exe"
Executable File_Release = "/c/program files (x86)/national instruments/cvi2013/instr/MIKRO_old/MIKRO.exe"
Executable File_Debug64 Is Rel = True
Executable File_Debug64 Rel To = "CVI"
Executable File_Debug64 Rel To Override = "CVI"
436,32 → 413,6
Icon File Is Rel = False
Icon File = ""
Application Title = ""
Numeric File Version = "1,0,0,0"
Numeric Prod Version = "1,0,0,0"
Comments = ""
Comments Ex = ""
Company Name = "Jozef Stefan Institute"
Company Name Ex = "%company"
File Description = "MIKRO (Release x86)"
File Description Ex = "%application (%rel_dbg %arch)"
File Version = "1.0"
File Version Ex = "%f1.%f2"
Internal Name = "MIKRO"
Internal Name Ex = "%basename"
Legal Copyright = "Copyright © Jozef Stefan Institute 2015"
Legal Copyright Ex = "Copyright © %company %Y"
Legal Trademarks = ""
Legal Trademarks Ex = ""
Original Filename = "MIKRO.exe"
Original Filename Ex = "%filename"
Private Build = ""
Private Build Ex = ""
Product Name = "Jozef Stefan Institute MIKRO"
Product Name Ex = "%company %application"
Product Version = "1.0"
Product Version Ex = "%p1.%p2"
Special Build = ""
Special Build Ex = ""
DLL Exports = "Include File Symbols"
Use IVI Subdirectories for Import Libraries = False
Use VXIPNP Subdirectories for Import Libraries = False
/cvi/instr/MIKRO/MIKRO_ui.uir
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/cvi/instr/MIKRO/MIKRO_uic.c
6,7 → 6,7
//
// Implementation file for UI build functions
//
// Date: 10-17-2015
// Date: 11-29-2014
//
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
1980,7 → 1980,7
// errChk(SetCtrlAttribute (hPanel, P1_PORT, ATTR_SHOW_RADIX, 0));
// ****WARNING**** Skipped ATTR_DISABLE_RADIX = False
// ****WARNING**** Skipped ATTR_INCDEC_WIDTH = 9
errChk(SetCtrlAttribute (hPanel, P1_PORT, ATTR_DFLT_VALUE, 3));
errChk(SetCtrlAttribute (hPanel, P1_PORT, ATTR_DFLT_VALUE, 8));
errChk(DefaultCtrl (hPanel, P1_PORT));
// errChk(SetCtrlAttribute (hPanel, P1_PORT, ATTR_SHOW_INCDEC_ARROWS, 1));
// errChk(SetCtrlAttribute (hPanel, P1_PORT, ATTR_NO_EDIT_TEXT, 0));
2267,7 → 2267,7
errChk(GetMonitorFromPanel (hPanel, &monitorId));
errChk(GetMonitorAttribute (monitorId, ATTR_HEIGHT, &screenHeight));
errChk(GetMonitorAttribute (monitorId, ATTR_WIDTH, &screenWidth));
SFv = (((float)screenHeight/1040)-1)*0.01*resAdjustment+1;
SFv = (((float)screenHeight/1200)-1)*0.01*resAdjustment+1;
errChk(SetPanelAttribute (hPanel, ATTR_HEIGHT, (int)(387*SFv)));
SFh = (((float)screenWidth/1920)-1)*0.01*resAdjustment+1;
errChk(SetPanelAttribute (hPanel, ATTR_WIDTH, (int)(606*SFh)));
/cvi/instr/MIKRO/MIKRO_uic.h
7,7 → 7,7
// Declaration and include file for UI build functions
//
 
// Date: 10-17-2015
// Date: 11-29-2014
//
 
//----------------------------------------------------------------------------------------------------