Subversion Repositories f9daq

Compare Revisions

Regard whitespace Rev 261 → Rev 262

/cvi/apps/RedPitaya/soccli/redpitaya_gui.h
84,8 → 84,10
#define PANEL_LOGY_4 69 /* control type: radioButton, callback function: SetGraphLogYCB */
#define PANEL_LOGY_3 70 /* control type: radioButton, callback function: SetGraphLogYCB */
#define PANEL_LOGY_2 71 /* control type: radioButton, callback function: SetGraphLogYCB */
#define PANEL_LOGY_1 72 /* control type: radioButton, callback function: SetGraphLogYCB */
#define PANEL_AUTOX 73 /* control type: radioButton, callback function: SetGraphPropertiesCB */
#define PANEL_EXCLUDE_2 72 /* control type: radioButton, callback function: (none) */
#define PANEL_EXCLUDE_1 73 /* control type: radioButton, callback function: (none) */
#define PANEL_LOGY_1 74 /* control type: radioButton, callback function: SetGraphLogYCB */
#define PANEL_AUTOX 75 /* control type: radioButton, callback function: SetGraphPropertiesCB */
 
 
/* Control Arrays: */
/cvi/apps/RedPitaya/soccli/redpitaya_gui.uir
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/cvi/apps/RedPitaya/soccli/soccli.c
22,6 → 22,7
static int plothandle[2]= {0,0};
static int tdcplothandle[2]= {0,0};
static int adcplothandle[2]= {0,0};
static int excludefirst[2]= {0,0};
int debug ;
int initialized = 0;
#define MAX_THREADS 10
347,7 → 348,8
}
if (fdata[k]< athreshold && fdata[k-1]> athreshold) {
double t0= tp+(athreshold-fdata[k-1])/(fdata[k]-fdata[k-1])* (t-tp);
H1D_Fill(3+id, t0,1);
if (ntdc>0) H1D_Fill(3+id, t0,1);
if (ntdc==0 && !excludefirst[id]) H1D_Fill(3+id, t0,1);
finfo[*ninfo+4+ntdc]=t0;
ntdc++;
}
521,6 → 523,8
case PANEL_START: {
int state;
GetCtrlVal(panel,PANEL_START, &state);
GetCtrlVal(panel,PANEL_EXCLUDE_1, &excludefirst[0]);
GetCtrlVal(panel,PANEL_EXCLUDE_2, &excludefirst[1]);
if (state && eventData1==0) {
histoinit();
/* decimation n (=1,8,64...) : frequency = 125/n MHz*/
/cvi/apps/RedPitaya/soccli/soccli.cws
1,13 → 1,13
[Workspace Header]
Version = 1302
Pathname = "/c/home/CVI/RedPitaya/soccli/soccli.cws"
CVI Dir = "/c/program files/national instruments/cvi2013"
CVI Shared Dir = "/C/Program Files/National Instruments/Shared/CVI"
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"
CVI Pub Global Dir = "/C/ProgramData/National Instruments/CVI"
IVI Standard Root Dir = "/C/Program Files/IVI Foundation/IVI"
IVI Standard Root Dir = "/C/Program Files (x86)/IVI Foundation/IVI"
IVI Standard Root 64-bit Dir = "/C/Program Files/IVI Foundation/IVI"
VXIplug&play Framework Dir = "/C/Program Files/IVI Foundation/VISA/winnt"
VXIplug&play Framework Dir = "/C/Program Files (x86)/IVI Foundation/VISA/winnt"
VXIplug&play Framework 64-bit Dir = "/C/Program Files/IVI Foundation/VISA/win64"
Number of Projects = 2
Active Project = 1
15,11 → 15,11
Project 0002 = "/c/home/CVI/RedPitaya/RedPitaya.prj"
Project 0002 Folder User Interface Files Collapsed = True
Project 0002 FolderId 0 Collapsed = True
Drag Bar Left = 184
Window Top = 32
Window Left = 9
Window Bottom = 751
Window Right = 1271
Drag Bar Left = 202
Window Top = 137
Window Left = 83
Window Bottom = 846
Window Right = 1538
Maximized = False
Maximized Children = True
Max32 Number Of Errors = 20
35,7 → 35,7
Sort Type = "File Name"
Number of Opened Files = 8
Window Confinement Region Enabled = True
MainColumnWidth = 167
MainColumnWidth = 185
FileDateColumnWidth = 70
FileSizeColumnWidth = 70
 
60,33 → 60,23
[File 0001]
Path = "/c/home/CVI/instr/HISTO/H1D.fp"
File Type = "Function Panel"
Disk Date = 3568705022
Disk Date = 3572599564
In Projects = "1,"
 
[File 0002]
Path = "/c/home/CVI/RedPitaya/RedPitaya.c"
File Type = "CSource"
Disk Date = 3574162675
In Projects = "2,"
Window Top = 31
Window Z-Order = 6
Source Window State = "1,43,43,43,0,26,26,0,0,80,0,0,0,0,0,18,241,0,252,37,258,683,1,0,"
 
[File 0003]
Path = "/c/home/CVI/RedPitaya/soccli/soccli.c"
File Type = "CSource"
Disk Date = 3574185297
Disk Date = 3574749869
In Projects = "1,"
Window Top = 33
Window Left = 10
Window Z-Order = 1
Source Window State = "1,430,430,430,10,49,10,0,0,130,29,433,0,455,13,2,145,0,147,0,349,595,1,9601,"
Breakpoint 0001 = "148,0,enabled,"
Source Window State = "0,525,525,525,10,62,62,0,0,152,26,588,0,548,87,2,111,0,412,0,349,595,1,9601,"
 
[File 0004]
[File 0003]
Path = "/c/home/CVI/RedPitaya/soccli/redpitaya_gui.uir"
File Type = "User Interface Resource"
Disk Date = 3574163726
Disk Date = 3574749504
In Projects = "1,"
Window Top = 64
Window Left = 26
94,41 → 84,51
Window Width = 595
Window Z-Order = 2
 
[File 0005]
[File 0004]
Path = "/c/home/CVI/RedPitaya/RedPitaya_ui.uir"
File Type = "User Interface Resource"
Disk Date = 3574162676
Disk Date = 3570150778
In Projects = "2,"
Window Top = 64
Window Left = 26
Window Height = 323
Window Width = 683
Window Z-Order = 7
Window Z-Order = 6
 
[File 0005]
Path = "/c/home/CVI/RedPitaya/RedPitaya.c"
File Type = "CSource"
Disk Date = 3572435669
In Projects = "2,"
Window Top = 126
Window Left = 58
Window Z-Order = 8
Source Window State = "1,43,43,43,0,26,26,0,0,80,0,0,0,0,0,18,112,0,131,17,258,683,1,0,"
 
[File 0006]
Path = "/c/home/CVI/instr/HISTO/H1D.c"
File Type = "CSource"
Disk Date = 3574162672
Disk Date = 3574395592
In Projects = ""
Window Top = 126
Window Left = 58
Window Z-Order = 4
Source Window State = "1,153,153,153,26,31,31,0,3,80,0,0,0,0,0,23,138,0,153,26,323,683,1,0,"
Window Z-Order = 3
Source Window State = "1,107,107,107,0,11,11,0,0,80,0,0,0,0,0,23,96,0,107,0,323,683,1,0,"
 
[File 0007]
Path = "/c/home/CVI/instr/DRS/drs4.c"
File Type = "CSource"
Disk Date = 3574162673
Disk Date = 3572599563
In Projects = ""
Window Top = 126
Window Left = 58
Window Z-Order = 8
Window Z-Order = 7
Source Window State = "1,542,542,542,8,54,8,0,3,80,0,0,0,0,0,18,528,0,542,54,258,683,1,0,"
 
[File 0008]
Path = "/c/home/CVI/RedPitaya/soccli/mH1D.h"
File Type = "Include"
Disk Date = 3574162675
Disk Date = 3572872297
In Projects = ""
Window Top = 33
Window Left = 10
138,30 → 138,30
[File 0009]
Path = "/c/home/CVI/instr/HISTO/H1D.h"
File Type = "Include"
Disk Date = 3574162672
Disk Date = 3573119642
In Projects = ""
Window Top = 64
Window Left = 26
Window Z-Order = 3
Window Z-Order = 4
Source Window State = "1,39,39,39,0,54,54,0,0,80,0,0,0,0,0,23,28,0,36,0,323,683,1,0,"
 
[File 0010]
Path = "/c/home/CVI/RedPitaya/soccli/soccli.h"
File Type = "Include"
Disk Date = 3574162675
Disk Date = 3572536657
In Projects = "1,"
Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
[File 0011]
Path = "/c/home/CVI/RedPitaya/soccli/plottdc.cxx"
Path = "/c/home/CVI/RedPitaya/soccli/H1Dload.cxx"
File Type = "Unknown"
Disk Date = 0
Disk Date = 3574312155
In Projects = "1,"
 
[File 0012]
Path = "/c/home/CVI/RedPitaya/RedPitaya_ui.h"
File Type = "Include"
Disk Date = 3574162675
Disk Date = 3570148232
In Projects = "2,"
Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"
 
168,7 → 168,7
[File 0013]
Path = "/c/home/CVI/RedPitaya/plottdc.cxx"
File Type = "Unknown"
Disk Date = 3574162678
Disk Date = 3572604225
In Projects = "2,"
 
[Tab Order]
182,7 → 182,7
Tab 0008 = "/c/home/CVI/instr/HISTO/H1D.h"
 
[Default Build Config 0001 Debug]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Batch Build = False
Profile = "Disabled"
194,7 → 194,7
External Process Path = ""
 
[Default Build Config 0001 Release]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Batch Build = False
Profile = "Disabled"
206,7 → 206,7
External Process Path = ""
 
[Default Build Config 0001 Debug64]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Batch Build = False
Profile = "Disabled"
218,7 → 218,7
External Process Path = ""
 
[Default Build Config 0001 Release64]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Batch Build = False
Profile = "Disabled"
233,7 → 233,7
Number of Dependencies = 0
 
[Build Options 0001]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Execution Trace = "Disabled"
Profile = "Disabled"
270,7 → 270,7
Environment Options = ""
 
[Default Build Config 0002 Debug]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Batch Build = False
Profile = "Disabled"
282,7 → 282,7
External Process Path = ""
 
[Default Build Config 0002 Release]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Batch Build = False
Profile = "Disabled"
294,7 → 294,7
External Process Path = ""
 
[Default Build Config 0002 Debug64]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Batch Build = False
Profile = "Disabled"
306,7 → 306,7
External Process Path = ""
 
[Default Build Config 0002 Release64]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Batch Build = False
Profile = "Disabled"
321,7 → 321,7
Number of Dependencies = 0
 
[Build Options 0002]
Generate Browse Info = True
Generate Browse Info = False
Enable Uninitialized Locals Runtime Warning = True
Execution Trace = "Disabled"
Profile = "Disabled"
/cvi/apps/RedPitaya/soccli/soccli.prj
83,12 → 83,11
Res Id = 5
Path Is Rel = True
Path Rel To = "Project"
Path Rel Path = "plottdc.cxx"
Path = "/c/home/CVI/RedPitaya/soccli/plottdc.cxx"
Path Rel Path = "H1Dload.cxx"
Path = "/c/home/CVI/RedPitaya/soccli/H1Dload.cxx"
Exclude = False
Project Flags = 0
Folder = "Instrument Files"
Folder Id = 3
Folder = "Not In A Folder"
 
[Custom Build Configs]
Num Custom Build Configs = 0
231,6 → 230,32
Using LoadExternalModule = False
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 = ""
Company Name Ex = "%company"
File Description = "soccli (Release x86)"
File Description Ex = "%application (%rel_dbg %arch)"
File Version = "1.0"
File Version Ex = "%f1.%f2"
Internal Name = "soccli"
Internal Name Ex = "%basename"
Legal Copyright = "Copyright © 2017"
Legal Copyright Ex = "Copyright © %company %Y"
Legal Trademarks = ""
Legal Trademarks Ex = ""
Original Filename = "soccli.exe"
Original Filename Ex = "%filename"
Private Build = ""
Private Build Ex = ""
Product Name = " soccli"
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"
398,6 → 423,32
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 = ""
Company Name Ex = "%company"
File Description = "soccli (Release x86)"
File Description Ex = "%application (%rel_dbg %arch)"
File Version = "1.0"
File Version Ex = "%f1.%f2"
Internal Name = "soccli"
Internal Name Ex = "%basename"
Legal Copyright = "Copyright © 2017"
Legal Copyright Ex = "Copyright © %company %Y"
Legal Trademarks = ""
Legal Trademarks Ex = ""
Original Filename = "soccli.exe"
Original Filename Ex = "%filename"
Private Build = ""
Private Build Ex = ""
Product Name = " soccli"
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