diff --git a/examples/point_cloud_demo/CANape.png b/examples/point_cloud_demo/CANape.png new file mode 100644 index 0000000..d73d7a4 Binary files /dev/null and b/examples/point_cloud_demo/CANape.png differ diff --git a/examples/point_cloud_demo/CANape/CANape.ini b/examples/point_cloud_demo/CANape/CANape.ini index eb7a9c0..b5410cc 100644 --- a/examples/point_cloud_demo/CANape/CANape.ini +++ b/examples/point_cloud_demo/CANape/CANape.ini @@ -6,7 +6,7 @@ ;------------------------------------------------------------------------------- [!!!!!_CONSISTENCY_CHECK_START_SECTION_!!!!!] -GUID={250EC90A-7E23-4BC5-A5FF-4D8E3F19B559} +GUID={443AE3E4-B960-4C13-A40C-71BAA3CDE097} [FILE_INFO] Identification=CANape-Project-File @@ -20,8 +20,8 @@ PrgDate=08.07.2024 Description= CreationTime=19:37 CreationDate=06/23/2024 ; Month/Day/Year -ModificationTime=18:52 -ModificationDate=08/05/2024 ; Month/Day/Year +ModificationTime=11:02 +ModificationDate=08/06/2024 ; Month/Day/Year Protected=0 CurrentWindowsACP=1252 @@ -204,7 +204,7 @@ WINDOW_HEADER_OFF=0 USER_FONT_FOR_WINDOW_TITLE=0 WINDOW_HEADER_POSITION=0 BINFORMAT_REPRESENTATION=0 -TIME_DISPLAY_ROUND_FACTOR_NS=1000 +TIME_DISPLAY_ROUND_FACTOR_NS=1000000 GLOBAL_ECU_CALIBRATION_OFFSET=1 DATABASE_CACHE_COUNT=2 LAYOUT_AXIS_COUNT_AFTER_VALUES=0 @@ -383,6 +383,8 @@ AlgorithmConfiguratioDialog_PortColumn_Configuration= REOPEN_FUNCTIONS_BROWSER=0 SHOW_MESSAGE_BEFORE_CLOSE_FB_AT_MEASUREMENT=1 +TIME_AXIS_TEMPLATE_LIST_COLUMN_CONFIGURATION= +TIME_AXIS_TEMPLATE_LIST_COLUMN_CONFIGURATION_dpi96= [WRITEWINDOW] @@ -398,7 +400,7 @@ SHOW_MESSAGE_BEFORE_CLOSE_FB_AT_MEASUREMENT=1 ; 0x20 Show command messages (with a hand symbol) ; 0x1000 Suppress CASL runtime errors (ATTENTION: When true CASL runtime errors are suppressed, so that the errors are displayed with the default flags to not change the behaviour of existing projects.) ; As default all messages are shown -SHOW_MESSAGES=4351 +SHOW_MESSAGES=255 LOG=0 LOGFILE=WriteWindow_log.TXT LOG_OVERWRITE=0 @@ -967,7 +969,7 @@ DIMENSION_LINE_COUNT=0 ScreenDPIinSection=192 POSX=702 POSX_dpi96=351 -POSY=289 +POSY=290 POSY_dpi96=145 SIZEX=1750 SIZEX_dpi96=875 @@ -983,7 +985,7 @@ TREEX_dpi96=225 TREEY=1209 TREEY_dpi96=605 ACTIVEPANE=0 -SELECTED_TREENODE=Geräte/xcp_lite_Device/Speichersegmente +SELECTED_TREENODE=Geräte/xcp_lite_Device/Datenbasis FIRSTVISIBLE_TREENODE=Geräte TREEEXPAND_COUNT=4 TREEEXPAND_0=Geräte @@ -1010,7 +1012,7 @@ Height=1138 Height_dpi96=569 [Dialog_MdiCfgDlg_Typ1] -LastOpenedDlgType=1 +LastOpenedDlgType=9 TreeWidth=240 TreeWidth_dpi96=120 ScreenDPIinSection=192 @@ -1020,18 +1022,18 @@ WindowTop=696 WindowTop_dpi96=348 WindowWidth=2678 WindowWidth_dpi96=1339 -WindowHeight=818 -WindowHeight_dpi96=409 +WindowHeight=978 +WindowHeight_dpi96=489 [DISTRIBUTED_HIGH_PERFORMANCE_RECORDING] ConfigurationJson={"RemoteServiceDataList":[{"DisplayName":"CANape Master","Ip":"127.0.0.1","ComputerName":"CANape Master","Platform":"Windows_x86_64","DeviceDataList":[]}],"UiModel":{"Column1Width":170,"Column2Width":170,"Column3Width":170}} [DlgCommentWrapper] ScreenDPIinSection=192 -WindowLeft=1127 -WindowLeft_dpi96=564 -WindowTop=660 -WindowTop_dpi96=330 +WindowLeft=1101 +WindowLeft_dpi96=551 +WindowTop=632 +WindowTop_dpi96=316 WindowWidth=1350 WindowWidth_dpi96=675 WindowHeight=923 @@ -1039,10 +1041,10 @@ WindowHeight_dpi96=462 [DlgMdfComment] ScreenDPIinSection=192 -WindowLeft=1140 -WindowLeft_dpi96=570 -WindowTop=718 -WindowTop_dpi96=359 +WindowLeft=1114 +WindowLeft_dpi96=557 +WindowTop=690 +WindowTop_dpi96=345 WindowWidth=1324 WindowWidth_dpi96=662 WindowHeight=786 @@ -1185,7 +1187,7 @@ COUNT=0 [MEASUREMENT_0] FileId=Measurement1 -MeasurementId=00308818-5f05-42d2-8487-b9d276ad879b +MeasurementId=f54af004-73b5-4b36-af16-e1f06c80526e MeasurementMapped=0 [MEASUREMENTS] @@ -1397,8 +1399,8 @@ COPY_COMPLETED_AS_READ_ONLY=0 COPY_QUALITY_DATA=0 CHANGED_FROM_LAST=0 SD_FIELD_ORDER=0 -PREDEFINED_ENTRY_00=---2024-08-05T18:21:04 -PREDEFINED_ENTRY_01=changed2024-08-05T18:21:04 +PREDEFINED_ENTRY_00=---2024-08-06T10:36:37 +PREDEFINED_ENTRY_01=changed2024-08-06T10:36:37 PREDEFINED_ENTRY_COUNT=2 SD_FIELD_ENTRY_1= SD_FIELD_ENTRY_2= @@ -1532,6 +1534,9 @@ COLUMNS_TYP2097152_CONTEXT1_ScreenDPI=192 COLUMNS_TYP2097152_CONTEXT4= COLUMNS_TYP2097152_CONTEXT4_dpi96= COLUMNS_TYP2097152_CONTEXT4_ScreenDPI=192 +COLUMNS_TYP1_CONTEXT2= +COLUMNS_TYP1_CONTEXT2_dpi96= +COLUMNS_TYP1_CONTEXT2_ScreenDPI=192 [VIEW_ITEM_DIALOG] ScreenDPIinSection=192 @@ -1600,10 +1605,10 @@ ColWidthDisplay=462 ShowMore=0 MoreHeight=566 MoreHeight_dpi96=283 -WindowLeft=1181 -WindowLeft_dpi96=591 -WindowTop=802 -WindowTop_dpi96=401 +WindowLeft=1155 +WindowLeft_dpi96=578 +WindowTop=774 +WindowTop_dpi96=387 WindowWidth=1242 WindowWidth_dpi96=621 WindowHeight=260 @@ -2296,162 +2301,6 @@ WindowState=0 X=87.5 Y=533.5 -[MEASUREMENT_DISPLAY] -ScreenDPIinSection=192 -POSX=0 -POSX_dpi96=0 -POSY=0 -POSY_dpi96=0 -SIZEX=2192 -SIZEX_dpi96=1096 -SIZEY=1322 -SIZEY_dpi96=661 -SHOWTOOLBAR=1 -SHOWSTATUSBAR=1 -SHOWGRID=0 -RIGHTPANE2HEIGHT=434 -RIGHTPANE2HEIGHT_dpi96=217 -TREEX=450 -TREEX_dpi96=225 -TREEY=1131 -TREEY_dpi96=566 -ACTIVEPANE=1 -SELECTED_TREENODE=Messsignale/tokio_demo -FIRSTVISIBLE_TREENODE=Messoptionen -TREEEXPAND_COUNT=3 -TREEEXPAND_0=Messsignale -TREEEXPAND_1=Messsignale/tokio_demo -TREEEXPAND_2=Rekorderliste -LAST_FOCUSED_LISTCOLUMN=0 -LAST_FOCUSED_LISTINDEX=12 -LAST_TOP_LISTINDEX=0 -DAQLISTS=2 -STATUSBAR_BYTES=1 -DIALOGFILEEXTEXPORT=vsf -LABELLISTMEAMODE=0 -LABELLISTBUSSIGNALMODE=0 -TEXT_SEARCH= -VXIIColumnsAdded=0 -SHOWONLYACTIVE=0 - -[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_CUSTOM] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_KEY] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_SYSTEM] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=196608 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_SYSTEM_DEVICE] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_KNOWN_DYNAMIC_COLUMNS_NORMAL] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 -VERSION=100 - -[MEASUREMENT_DISPLAY_COLUMNLIST_NORMAL] -ScreenDPIinSection=192 -ColumnCount=8 -Column_0=65542, 100 -Column_0_dpi96=65542, 50 -Column_1=29, 88 -Column_1_dpi96=29, 44 -Column_2=34, 96 -Column_2_dpi96=34, 48 -Column_3=31, 324 -Column_3_dpi96=31, 162 -Column_4=65540, 408 -Column_4_dpi96=65540, 204 -Column_5=65541, 120 -Column_5_dpi96=65541, 60 -Column_6=65597, 200 -Column_6_dpi96=65597, 100 -Column_7=98305, 160 -Column_7_dpi96=98305, 80 -ColumnIdSort=65542 -SortUpward=1 -VERSION=100 - -[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDER] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 -VERSION=100 - -[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDER_BUSLOGGING] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDERS] -ScreenDPIinSection=192 -ColumnCount=6 -Column_0=327711, 400 -Column_0_dpi96=327711, 200 -Column_1=327684, 120 -Column_1_dpi96=327684, 60 -Column_2=327709, 300 -Column_2_dpi96=327709, 150 -Column_3=327695, 130 -Column_3_dpi96=327695, 65 -Column_4=327681, 400 -Column_4_dpi96=327681, 200 -Column_5=327683, 400 -Column_5_dpi96=327683, 200 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_SOUNDS] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_TARA_ACTIVE_SIGNALS] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_TARA_ALL_SIGNALS] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_COLUMNLIST_VIO] -ScreenDPIinSection=192 -ColumnCount=0 -ColumnIdSort=-1 -SortUpward=1 - -[MEASUREMENT_DISPLAY_DYNAMIC_COLUMNS] -Count=0 - [MEASUREMENT_DISPLAY_SELECT] ScreenDPIinSection=192 POSX=0 @@ -2624,64 +2473,6 @@ POSITION_dpi96=448 511 1435 918 COLUMNS=282 112 184 382 282 156 98 COLUMNS_dpi96=141 56 92 191 141 78 49 -[DEVICE_EXPLORER_COLUMNLIST_CHANNELS] -ScreenDPIinSection=192 -ColumnCount=4 -Column_0=0, 306 -Column_0_dpi96=0, 153 -Column_1=1245185, 132 -Column_1_dpi96=1245185, 66 -Column_2=1245186, 66 -Column_2_dpi96=1245186, 33 -Column_3=1245187, 106 -Column_3_dpi96=1245187, 53 -ColumnIdSort=-1 -SortUpward=1 - -[DEVICE_EXPLORER_COLUMNLIST_DEVICES] -ScreenDPIinSection=192 -ColumnCount=10 -Column_0=34, 96 -Column_0_dpi96=34, 48 -Column_1=0, 460 -Column_1_dpi96=0, 230 -Column_2=131078, 160 -Column_2_dpi96=131078, 80 -Column_3=131103, 100 -Column_3_dpi96=131103, 50 -Column_4=131079, 100 -Column_4_dpi96=131079, 50 -Column_5=262145, 240 -Column_5_dpi96=262145, 120 -Column_6=131085, 200 -Column_6_dpi96=131085, 100 -Column_7=131080, 240 -Column_7_dpi96=131080, 120 -Column_8=131081, 160 -Column_8_dpi96=131081, 80 -Column_9=196609, 100 -Column_9_dpi96=196609, 50 -ColumnIdSort=-1 -SortUpward=1 - -[DEVICE_EXPLORER_COLUMNLIST_NETWORKS] -ScreenDPIinSection=192 -ColumnCount=6 -Column_0=34, 64 -Column_0_dpi96=34, 32 -Column_1=0, 304 -Column_1_dpi96=0, 152 -Column_2=983041, 192 -Column_2_dpi96=983041, 96 -Column_3=983042, 530 -Column_3_dpi96=983042, 265 -Column_4=983043, 252 -Column_4_dpi96=983043, 126 -Column_5=983044, 300 -Column_5_dpi96=983044, 150 -ColumnIdSort=-1 -SortUpward=1 - [Module_xcp_lite] SEGMENTS_SHOWN_IN_SETTINGS=0 FLAGS=1 @@ -2871,7 +2662,7 @@ BUSY_TIMEOUT=15000 RETRY_CTR=0 IGNORE_CTR_FAULTS=0 CHECK_OVERFLOW=0 -LOAD_GRANULARITY=210 +LOAD_GRANULARITY=212 LOAD_CHECKSUM=1 READBACK_DISABLED=0 IFDATA_QUERY=1 @@ -3005,22 +2796,22 @@ CALPAGE_SINGLE_SEGMENT_SWITCHING=0 MEMORY_SEGMENTS_V8_COMPATIBILITY_MODE=0 FLASH_TOOL=Protocol FLASH_EXTERNAL_CONVERTER= -FLASH_GRANULARITY=210 -CHECKSUM_TYPE=0 +FLASH_GRANULARITY=212 +CHECKSUM_TYPE=10 CHECKSUM_TYPE_INCA=0x0 -CHECKSUM_ENABLED=0 -CHECKSUM_DLL_NAME=chksum.dll -CHECKSUM_MAX_BLOCKSIZE=4294967295 +CHECKSUM_ENABLED=1 +CHECKSUM_DLL_NAME= +CHECKSUM_MAX_BLOCKSIZE=65535 ENABLE_CHECKSUM_OUTPUT=0 CHECKSUM_TYPE_MAPPING_2=3 -SELECT_CAL_PAGE=0 +SELECT_CAL_PAGE=1 INIT_CAL_PAGE=0 RAM_PAGE_ID=0x0 -ROM_PAGE_ID=0x0 +ROM_PAGE_ID=0x1 RAM_PAGE_ID_EXT=0x0 ROM_PAGE_ID_EXT=0x0 FLASH_PAGE_ADDRESS_MAPPING_ENABLED=1 -MEMORY_SEGMENT_COUNT=1 +MEMORY_SEGMENT_COUNT=2 MEMORY_SEGMENT_NAME_1=epk MEMORY_SEGMENT_TYPE_1=FLASH,DATA,INTERN MEMORY_SEGMENT_SIZE_1=0x00000003 @@ -3037,7 +2828,7 @@ CALRAM_SECTOR_ADDR_EXT_1=0x00 CALRAM_SECTOR_ATTRIBUTE_1=0x00000001 CALRAM_SECTOR_FLASH_OFFSET_1=0x00000000 CALRAM_SECTOR_ADDRESS_MAPPING_1= -CALRAM_SECTOR_COUNT=1 +CALRAM_SECTOR_COUNT=2 FLASH_SECTOR_COUNT=0 FLASH_GROUP_COUNT=0 TRANSPORT_LAYER_INSTANCE_NAME= @@ -3103,10 +2894,105 @@ VLAN_CONFIG_COUNT=0 Databases_COUNT=0 CHANNELX=255 USE_ASAP2_DATABASE=1 +MEMORY_SEGMENT_NAME_2=Params +MEMORY_SEGMENT_TYPE_2=FLASH,DATA,INTERN +MEMORY_SEGMENT_SIZE_2=0x00000030 +MEMORY_SEGMENT_ADDR_2=0x80010000 +MEMORY_SEGMENT_ADDR_EXT_2=0x00 +MEMORY_SEGMENT_ATTRIBUTE_2=0x00000000 +MEMORY_SEGMENT_FLASH_OFFSET_2=0x00000000 +MEMORY_SEGMENT_ADDRESS_MAPPING_2= +CALRAM_SECTOR_NAME_2=Params +CALRAM_SECTOR_TYPE_2=FLASH,DATA,INTERN +CALRAM_SECTOR_SIZE_2=0x00000030 +CALRAM_SECTOR_ADDR_2=0x80010000 +CALRAM_SECTOR_ADDR_EXT_2=0x00 +CALRAM_SECTOR_ATTRIBUTE_2=0x00000000 +CALRAM_SECTOR_FLASH_OFFSET_2=0x00000000 +CALRAM_SECTOR_ADDRESS_MAPPING_2= [xcp_lite_ECDMVariants] ECDM_DEVICE=0 +[Dialog_MdiCfgDlg_Typ17179869184] +LastOpenedDlgType=8 +TreeWidth=240 +TreeWidth_dpi96=120 +ScreenDPIinSection=192 +WindowLeft=1402 +WindowLeft_dpi96=701 +WindowTop=992 +WindowTop_dpi96=496 +WindowWidth=1130 +WindowWidth_dpi96=565 +WindowHeight=608 +WindowHeight_dpi96=304 + +[DLG_AXIS_TEMPLATE] +ScreenDPIinSection=192 +DIALOG_WIDTH=1642 +DIALOG_WIDTH_dpi96=821 +DIALOG_HEIGHT=895 +DIALOG_HEIGHT_dpi96=448 + +[DEVICE_EXPLORER_COLUMNLIST_CHANNELS] +ScreenDPIinSection=192 +ColumnCount=4 +Column_0=0, 306 +Column_0_dpi96=0, 153 +Column_1=1245185, 132 +Column_1_dpi96=1245185, 66 +Column_2=1245186, 66 +Column_2_dpi96=1245186, 33 +Column_3=1245187, 106 +Column_3_dpi96=1245187, 53 +ColumnIdSort=-1 +SortUpward=1 + +[DEVICE_EXPLORER_COLUMNLIST_DEVICES] +ScreenDPIinSection=192 +ColumnCount=10 +Column_0=34, 96 +Column_0_dpi96=34, 48 +Column_1=0, 460 +Column_1_dpi96=0, 230 +Column_2=131078, 160 +Column_2_dpi96=131078, 80 +Column_3=131103, 100 +Column_3_dpi96=131103, 50 +Column_4=131079, 100 +Column_4_dpi96=131079, 50 +Column_5=262145, 240 +Column_5_dpi96=262145, 120 +Column_6=131085, 200 +Column_6_dpi96=131085, 100 +Column_7=131080, 240 +Column_7_dpi96=131080, 120 +Column_8=131081, 160 +Column_8_dpi96=131081, 80 +Column_9=196609, 100 +Column_9_dpi96=196609, 50 +ColumnIdSort=-1 +SortUpward=1 + +[DEVICE_EXPLORER_COLUMNLIST_NETWORKS] +ScreenDPIinSection=192 +ColumnCount=6 +Column_0=34, 64 +Column_0_dpi96=34, 32 +Column_1=0, 304 +Column_1_dpi96=0, 152 +Column_2=983041, 192 +Column_2_dpi96=983041, 96 +Column_3=983042, 530 +Column_3_dpi96=983042, 265 +Column_4=983043, 252 +Column_4_dpi96=983043, 126 +Column_5=983044, 300 +Column_5_dpi96=983044, 150 +ColumnIdSort=-1 +SortUpward=1 + [COLOR_SCHEME_LIST] COLOR_SCHEME0=COLOR_SCHEMEUSER_DEFINED SCHEMES_COUNT=1 @@ -3242,23 +3128,164 @@ MODE=12 VALUE_COUNT=0 HISTORY_COUNT=0 -[Dialog_MdiCfgDlg_Typ17179869184] -LastOpenedDlgType=8 -TreeWidth=240 -TreeWidth_dpi96=120 +[MEASUREMENT_DISPLAY] ScreenDPIinSection=192 -WindowLeft=1402 -WindowLeft_dpi96=701 -WindowTop=992 -WindowTop_dpi96=496 -WindowWidth=1130 -WindowWidth_dpi96=565 -WindowHeight=608 -WindowHeight_dpi96=304 +POSX=0 +POSX_dpi96=0 +POSY=0 +POSY_dpi96=0 +SIZEX=2192 +SIZEX_dpi96=1096 +SIZEY=1322 +SIZEY_dpi96=661 +SHOWTOOLBAR=1 +SHOWSTATUSBAR=1 +SHOWGRID=0 +RIGHTPANE2HEIGHT=434 +RIGHTPANE2HEIGHT_dpi96=217 +TREEX=450 +TREEX_dpi96=225 +TREEY=1131 +TREEY_dpi96=566 +ACTIVEPANE=1 +SELECTED_TREENODE=Rekorderliste/Rekorder +FIRSTVISIBLE_TREENODE=Messoptionen +TREEEXPAND_COUNT=2 +TREEEXPAND_0=Messsignale +TREEEXPAND_1=Rekorderliste +LAST_FOCUSED_LISTCOLUMN=0 +LAST_FOCUSED_LISTINDEX=2 +LAST_TOP_LISTINDEX=0 +DAQLISTS=2 +STATUSBAR_BYTES=1 +DIALOGFILEEXTEXPORT=vsf +LABELLISTMEAMODE=0 +LABELLISTBUSSIGNALMODE=0 +TEXT_SEARCH= +VXIIColumnsAdded=0 +SHOWONLYACTIVE=0 + +[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_CUSTOM] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_KEY] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_SYSTEM] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=196608 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_EVENTS_SYSTEM_DEVICE] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_KNOWN_DYNAMIC_COLUMNS_NORMAL] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 +VERSION=100 + +[MEASUREMENT_DISPLAY_COLUMNLIST_NORMAL] +ScreenDPIinSection=192 +ColumnCount=8 +Column_0=65542, 100 +Column_0_dpi96=65542, 50 +Column_1=29, 88 +Column_1_dpi96=29, 44 +Column_2=34, 96 +Column_2_dpi96=34, 48 +Column_3=31, 324 +Column_3_dpi96=31, 162 +Column_4=65540, 408 +Column_4_dpi96=65540, 204 +Column_5=65541, 120 +Column_5_dpi96=65541, 60 +Column_6=65597, 200 +Column_6_dpi96=65597, 100 +Column_7=98305, 160 +Column_7_dpi96=98305, 80 +ColumnIdSort=65542 +SortUpward=1 +VERSION=100 + +[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDER] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 +VERSION=100 + +[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDER_BUSLOGGING] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_RECORDERS] +ScreenDPIinSection=192 +ColumnCount=6 +Column_0=327711, 400 +Column_0_dpi96=327711, 200 +Column_1=327684, 120 +Column_1_dpi96=327684, 60 +Column_2=327709, 300 +Column_2_dpi96=327709, 150 +Column_3=327695, 130 +Column_3_dpi96=327695, 65 +Column_4=327681, 400 +Column_4_dpi96=327681, 200 +Column_5=327683, 400 +Column_5_dpi96=327683, 200 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_SOUNDS] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_TARA_ACTIVE_SIGNALS] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_TARA_ALL_SIGNALS] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_COLUMNLIST_VIO] +ScreenDPIinSection=192 +ColumnCount=0 +ColumnIdSort=-1 +SortUpward=1 + +[MEASUREMENT_DISPLAY_DYNAMIC_COLUMNS] +Count=0 [SIGNSELWND_DYNAMIC_COLUMNS] Count=0 [~~~~~_CONSISTENCY_CHECK_END_SECTION_~~~~~] -GUID={250EC90A-7E23-4BC5-A5FF-4D8E3F19B559} +GUID={443AE3E4-B960-4C13-A40C-71BAA3CDE097} diff --git a/examples/point_cloud_demo/CANape/point_cloud.cna b/examples/point_cloud_demo/CANape/point_cloud.cna index f351002..4d4d423 100644 --- a/examples/point_cloud_demo/CANape/point_cloud.cna +++ b/examples/point_cloud_demo/CANape/point_cloud.cna @@ -10,8 +10,8 @@ PrgDate=08.07.2024 Description= CreationTime=18:15 CreationDate=08/05/2024 ; Month/Day/Year -ModificationTime=18:52 -ModificationDate=08/05/2024 ; Month/Day/Year +ModificationTime=11:02 +ModificationDate=08/06/2024 ; Month/Day/Year Protected=0 CurrentWindowsACP=1252 @@ -22,7 +22,73 @@ Count=1 Count=0 [CALIBRATION_LIST] -Count=0 +Count=6 + +[CALIBRATION_OBJECT_1] +EditOffset=1 +EditFactor=2 +EditFormat=2 +ShowWorkingPoint=0 +FollowWorkingPoint=0 +Module=xcp_lite +Name=Params.ampl_x +StimMode=0 +IsFallback=0 + +[CALIBRATION_OBJECT_2] +EditOffset=1 +EditFactor=2 +EditFormat=2 +ShowWorkingPoint=0 +FollowWorkingPoint=0 +Module=xcp_lite +Name=Params.ampl_y +StimMode=0 +IsFallback=0 + +[CALIBRATION_OBJECT_3] +EditOffset=0.1 +EditFactor=2 +EditFormat=2 +ShowWorkingPoint=0 +FollowWorkingPoint=0 +Module=xcp_lite +Name=Params.period_x +StimMode=0 +IsFallback=0 + +[CALIBRATION_OBJECT_4] +EditOffset=0.1 +EditFactor=2 +EditFormat=2 +ShowWorkingPoint=0 +FollowWorkingPoint=0 +Module=xcp_lite +Name=Params.period_y +StimMode=0 +IsFallback=0 + +[CALIBRATION_OBJECT_5] +EditOffset=0.1 +EditFactor=2 +EditFormat=2 +ShowWorkingPoint=0 +FollowWorkingPoint=0 +Module=xcp_lite +Name=Params.phi_x +StimMode=0 +IsFallback=0 + +[CALIBRATION_OBJECT_6] +EditOffset=1 +EditFactor=2 +EditFormat=2 +ShowWorkingPoint=0 +FollowWorkingPoint=0 +Module=xcp_lite +Name=Params.phi_y +StimMode=0 +IsFallback=0 [CANAPE_ENVIRONMENT] OBJECT_COUNT=0 @@ -46,7 +112,7 @@ OptionCSVListSeparator=0 OptionCSVExport=0 OptionMARMFExport=0 OptionMARMFExtended=0 -OptionSuppressCASLRuntimeErrors=1 +OptionSuppressCASLRuntimeErrors=0 FromTime=-1 FromActive=0 FromTimePartActive=0 @@ -67,7 +133,7 @@ Count=0 Name= Comment= Maximized=0 -ActiveWindow=7 +ActiveWindow=9 IsReportPage=0 TimeAxisSynchronized=0 PrintLayout=Default @@ -118,7 +184,7 @@ Count=0 [MEASUREMENT_LIST] Count=2 -OfflineFileName=Rekorder_2024-08-05_18-51-24.mf4 +OfflineFileName=Rekorder_2024-08-06_10-57-57.mf4 OfflineFileCount=1 MeaCfgLabellistName= @@ -134,20 +200,40 @@ MeaReferenced=1 ArchivBy_1=Rekorder IsFallback=0 HasManagedDisplay=0 +DisplayCount=0 + +[MEASUREMENT_OBJECT_2] +Components=3 +Module=xcp_lite +Name=$point_cloud$ +Disabled=0 +Mode=2147483648 +Rate=0 +Row=0 +Column=0 +MeaReferenced=1 +ArchivBy_1=Rekorder +IsFallback=0 +HasManagedDisplay=1 DisplayCount=1 -[MEASUREMENT_OBJECT_1_DISPLAY_1] -Window=2 -Index=0 -Color=65280 +[MEASUREMENT_OBJECT_2_CO1] +Name=$point_cloud$$Points$$[0]$x +IsFallback=0 +DisplayCount=2 + +[MEASUREMENT_OBJECT_2_CO1_DISPLAY_1] +Window=4 +Index=2 +Color=255 ApplyColorToBackground=0 ColorFunction=0 ColorFunctionScope=1 LineTyp=2 -YMinHome=0 -YMaxHome=1e+12 -YMin=0 -YMax=1e+12 +YMinHome=-25 +YMaxHome=25 +YMin=-25 +YMax=25 XOffsetNS=0 XOffset=0 ValueFormat=3 @@ -162,7 +248,7 @@ LineWidth=1 Precision=-2 Digits=6 Enabled=1 -StoredFocused=1 +StoredFocused=0 SublMask=1 MeaSublMask=3 LockScaling=0 @@ -180,38 +266,18 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_40d51064-badd-4341-9aa3-da5e68997b3e - -[MEASUREMENT_OBJECT_2] -Components=3 -Module=xcp_lite -Name=$point_cloud$ -Disabled=0 -Mode=2147483648 -Rate=0 -Row=0 -Column=0 -MeaReferenced=1 -ArchivBy_1=Rekorder -IsFallback=0 -HasManagedDisplay=1 -DisplayCount=1 - -[MEASUREMENT_OBJECT_2_CO1] -Name=$point_cloud$$Points$$[0]$x -IsFallback=0 -DisplayCount=1 +GUID=DISPLAY_11b14481-581a-4f81-a4a8-597ef0f0b965 -[MEASUREMENT_OBJECT_2_CO1_DISPLAY_1] +[MEASUREMENT_OBJECT_2_CO1_DISPLAY_2] Window=6 -Index=2 +Index=0 Color=255 ApplyColorToBackground=0 ColorFunction=0 ColorFunctionScope=1 LineTyp=2 -YMinHome=-10 -YMaxHome=10 +YMinHome=-15.9375 +YMaxHome=15.9375 YMin=-10 YMax=10 XOffsetNS=0 @@ -246,25 +312,26 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_fd870ad8-4475-45aa-bf89-7de2b3372abb +GUID=DISPLAY_94dbeaf3-5d51-4838-b547-50ec4976cf33 +XDisplayIndex=0 [MEASUREMENT_OBJECT_2_CO2] Name=$point_cloud$$Points$$[0]$y IsFallback=0 -DisplayCount=1 +DisplayCount=2 [MEASUREMENT_OBJECT_2_CO2_DISPLAY_1] -Window=6 +Window=4 Index=1 Color=65535 ApplyColorToBackground=0 ColorFunction=0 ColorFunctionScope=1 LineTyp=2 -YMinHome=-10 -YMaxHome=10 -YMin=-10 -YMax=10 +YMinHome=-15 +YMaxHome=35 +YMin=-15 +YMax=35 XOffsetNS=0 XOffset=0 ValueFormat=3 @@ -297,7 +364,54 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_0e652c95-8fce-44cc-bd22-799b8d6e1a78 +GUID=DISPLAY_d9938b0b-c5ab-4ec6-bee1-a01271b52b24 + +[MEASUREMENT_OBJECT_2_CO2_DISPLAY_2] +Window=6 +Index=1 +Color=65535 +ApplyColorToBackground=0 +ColorFunction=0 +ColorFunctionScope=1 +LineTyp=2 +YMinHome=-13.4569271758 +YMaxHome=17.7930728242 +YMin=-13.4569271758 +YMax=17.7930728242 +XOffsetNS=0 +XOffset=0 +ValueFormat=3 +BitMask=1 +ShowYAxis=1 +Width=10 +LineStyle=1 +MarkerType=1 +SRMainValue=0 +InvalidValueDrawMode=3 +LineWidth=1 +Precision=-2 +Digits=6 +Enabled=1 +StoredFocused=1 +SublMask=1 +MeaSublMask=3 +LockScaling=0 +RightAxis=0 +MapMode=2 +OverlayGridColor=0 +ShadingMode=3 +EditOffset=1 +EditFactor=2 +WAxisLabel= +XAxisLabel= +YAxisLabel= +AxisCaption= +Row=0 +Col=0 +YAxis_ID=0 +AxisTemplate= +GUID=DISPLAY_b2725cda-12eb-4736-9fe6-f475bbafb434 +XDisplayIndex=0 [MEASUREMENT_OBJECT_2_CO3] Name=$point_cloud$$Points$$[0]$z @@ -305,17 +419,17 @@ IsFallback=0 DisplayCount=1 [MEASUREMENT_OBJECT_2_CO3_DISPLAY_1] -Window=6 +Window=4 Index=0 Color=16776960 ApplyColorToBackground=0 ColorFunction=0 ColorFunctionScope=1 LineTyp=2 -YMinHome=-5 -YMaxHome=5 -YMin=-5 -YMax=5 +YMinHome=-25 +YMaxHome=25 +YMin=-25 +YMax=25 XOffsetNS=0 XOffset=0 ValueFormat=3 @@ -351,7 +465,7 @@ AxisTemplate= GUID=DISPLAY_4451598d-cf80-4913-b158-f64c2a1fb73b [MEASUREMENT_OBJECT_2_DISPLAY_1] -Window=4 +Window=2 Index=0 Color=65280 ApplyColorToBackground=0 @@ -464,10 +578,10 @@ Count=0 WindowTextExtended=1 WindowTextExtendedNew=1 WindowSymbols=1 -GlobalCursor=0 -GlobalCursorTime=0 -GlobalCursorTimeNs=0 -MainWindowPos=1, 39, 20, 3527, 2202 ;cmd, x, y, w, h +GlobalCursor=1 +GlobalCursorTime=36420 +GlobalCursorTimeNs=36420069851 +MainWindowPos=1, 28, 0, 3497, 2186 ;cmd, x, y, w, h [PAR_COMMENT] 1="Name","" @@ -529,7 +643,7 @@ DisplayCount=0 Name=Rekorder Type=0 Comment= -FilenameTemplate={RECORDER}_{YEAR}-{MONTH}-{DAY}_{HOUR}-{MINUTE}-{SECOND}.mf4 +FilenameTemplate=point_cloud.mf4 ConverterId= TEXT_SEARCH= RecStartStopEnabled=0 @@ -628,8 +742,9 @@ TreeExpand_6=Alle\Ger TreeExpand_7=Alle\Geräte\xcp_lite\xcp_lite_autodetect.a2l\point_cloud TreeExpand_8=Alle\Geräte\xcp_lite\xcp_lite_autodetect.a2l\point_cloud\point_cloud TreeExpand_9=Alle\Geräte\xcp_lite\xcp_lite_autodetect.a2l\point_cloud\point_cloud\point_cloud.Points -TreeExpand_10=$Alle\Geräte -TreeExpand_11=#Alle\Geräte\xcp_lite\xcp_lite_autodetect.a2l\point_cloud\point_cloud +TreeExpand_10=Alle\Geräte\xcp_lite\xcp_lite_autodetect.a2l\point_cloud\point_cloud\point_cloud.Points\Points +TreeExpand_11=$Alle\Geräte +TreeExpand_12=#Alle\Geräte\xcp_lite\xcp_lite_autodetect.a2l\point_cloud\point_cloud TextSearchCaseSensitive=0 TextSearchUseMode=1 TextSearchSearchFullText=1 @@ -640,93 +755,6 @@ TextSearchSearchInDisplayNames=1 Count=0 [WINDOW_1] -ComponentCount=1 -Title= -Type=65536 -Comment=Multi-View-Fenster -Number=1 -GUID=WINDOW_408b5314-6d42-4845-b77c-ad166522788a -ScreenDPIinSection=192 -Position=0, 72, 96, 1654, 590 ;cmd, x, y, w, h -Position_dpi96=0, 36, 48, 827, 295 ;cmd, x, y, w, h -Position_Page01=0, 72, 96, 1654, 590 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 36, 48, 827, 295 ;cmd, x, y, w, h -FloatingWindow=0 -ShowSignalComments=1 -DisplayMask=1 ; pages 1 - -[WINDOW_2] -XLen=3600000 -XMin=0 -XMinNs=0 -XMax=45611 -XMaxNs=45611477581 -Grid=1 -Mark=1 -YValue=1 -ShowLegend=2 -ShowLegendHeader=1 -LegendPixWidth=334 -LegendPixWidth_dpi96=167 -LegendPixHeight=196 -LegendPixHeight_dpi96=98 -LegendPos=2 -Optimize=1 -Average=0 -ShowMinMax=1 -XYModeIndexP1=-1 -DisplayModeAuto=0 -XStart=0 -AbsoluteTimeMode=0 -YAxisWidth=204 -YAxisWidth_dpi96=102 -RightYAxisWidth=0 -RightYAxisWidth_dpi96=0 -ObjectMode=0 -DisplayMode=0 -ShowSignalMode=0 -AxisScrollPos2=0 -LegendScrollPos=0 -LegendShowLifeValues=1 -ShowXScrollbar=1 -ShowWholeTimeRange=0 -YAxisDynScaleEnabled=0 -YAxisDynScaleEnlarge=25 -TimeStickToZero=0 -XYModeRedrawEnabled=0 -MARKER_TIME_1=5000000000 -MARKER_TIME_2=15000000000 -OscilloscopeEnabled=0 -OsciEventCount=0 -EventCompareModeEnabled=0 -ObjectCount=0 -Title=Grafik {DISPLAYED_FILENAME} -Type=1 -Comment=Grafikfenster -Number=2 -GUID=WINDOW_1dc445de-8e69-4125-a2c7-87527ccab2fd -ScreenDPIinSection=192 -Position=0, 0, 0, 0, 0 ;cmd, x, y, w, h -Position_dpi96=0, 0, 0, 0, 0 ;cmd, x, y, w, h -Position_Page01=0, 0, 0, 0, 0 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 0, 0, 0, 0 ;cmd, x, y, w, h -FloatingWindow=0 -JointIndex=1 -ShowSignalComments=1 -ComponentOrder=0 -ComponentSpace=100 -LEGEND_HSCROLL_POS=0 -LEGEND_SHARED_COLUMNS=1 -TimeAxisTemplate= -DisplayMask=1 ; pages 1 - -[WINDOW_2_LEG_COLUMNS] -ScreenDPIinSection=192 -COUNT=1 -COL_0=31, 334 -COL_0_dpi96=31, 167 - -[WINDOW_3] ShowTime=1 TimeWidth=180 CopyColumnTitles=1 @@ -743,18 +771,18 @@ Column_2_dpi96=23, 650 Title=Write Type=128 Comment=Write-Fenster -Number=3 +Number=1 GUID=WINDOW_a3d6c8a5-781b-4380-b8d1-96455c2183d1 ScreenDPIinSection=192 -Position=0, 26, 26, 1600, 400 ;cmd, x, y, w, h -Position_dpi96=0, 13, 13, 800, 200 ;cmd, x, y, w, h -Position_Page01=0, 26, 26, 1600, 400 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 13, 13, 800, 200 ;cmd, x, y, w, h +Position=0, 26, 18, 2078, 392 ;cmd, x, y, w, h +Position_dpi96=0, 13, 9, 1039, 196 ;cmd, x, y, w, h +Position_Page01=0, 26, 18, 2078, 392 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 13, 9, 1039, 196 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 DisplayMask=1 ; pages 1 -[WINDOW_4] +[WINDOW_2] ObjectCount=0 Expanded_Root_0_GUID=DISPLAY_502a5939-387b-4df6-b412-0d1da31819f2 Expanded_Root_0_0=point_cloud @@ -763,7 +791,8 @@ Expanded_Root_0_2=point_cloud.Points[0] Expanded_Root_0_3=point_cloud.Points[1] Expanded_Root_0_4=point_cloud.Points[2] Expanded_Root_0_5=point_cloud.Points[3] -Expanded_Root_0_Count=6 +Expanded_Root_0_6=point_cloud.Points[4] +Expanded_Root_0_Count=7 Expanded_Root_Count=1 Omit_Root_0_GUID=DISPLAY_502a5939-387b-4df6-b412-0d1da31819f2 Omit_Root_0_Count=0 @@ -782,7 +811,7 @@ Table_Component_Column_Name_0=Name/Typ Table_Component_Column_Width_0=230 Table_Component_Column_Visible_0=1 Table_Component_Column_OriginalName_1=encapsulation -Table_Component_Column_Id_1=3145729 +Table_Component_Column_Id_1=3145728 Table_Component_Column_Name_1=encapsulation Table_Component_Column_Width_1=100 Table_Component_Column_Visible_1=1 @@ -792,18 +821,14 @@ Table_Hide_Root_0_GUID=DISPLAY_502a5939-387b-4df6-b412-0d1da31819f2 Table_Hide_Root_0_Count=0 Table_Hide_Root_Count=1 ScreenDPIinSection=192 -ColumnCount=4 -Column_0=0, 460 -Column_0_dpi96=0, 230 +ColumnCount=2 +Column_0=0, 350 +Column_0_dpi96=0, 175 Column_1=65560, 240 Column_1_dpi96=65560, 120 -Column_2=16, 140 -Column_2_dpi96=16, 70 -Column_3=3, 500 -Column_3_dpi96=3, 250 RecommendedWidths_Count=4 -RecWidth_0=0, 460 -RecWidth_0_dpi96=0, 230 +RecWidth_0=0, 350 +RecWidth_0_dpi96=0, 175 RecWidth_1=3, 500 RecWidth_1_dpi96=3, 250 RecWidth_2=16, 140 @@ -826,38 +851,38 @@ FilterHistorySize=0 Title=Daten Type=262144 Comment=Datenfenster -Number=4 +Number=2 GUID=WINDOW_addb03ce-24d4-498b-8d08-07fbf4e6afb1 -Position=0, 168, 208, 1378, 893 ;cmd, x, y, w, h -Position_dpi96=0, 84, 104, 689, 447 ;cmd, x, y, w, h -Position_Page01=0, 168, 208, 1378, 893 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 84, 104, 689, 447 ;cmd, x, y, w, h +Position=0, 2130, 18, 672, 812 ;cmd, x, y, w, h +Position_dpi96=0, 1065, 9, 336, 406 ;cmd, x, y, w, h +Position_Page01=0, 2130, 18, 672, 812 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 1065, 9, 336, 406 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 DisplayMask=1 ; pages 1 -[WINDOW_5] +[WINDOW_3] ComponentCount=1 Title= Type=65536 Comment=Multi-View-Fenster -Number=5 +Number=3 GUID=WINDOW_48d37c1e-340a-4f05-9c56-4576c03f9d40 ScreenDPIinSection=192 -Position=0, 34, 726, 1000, 400 ;cmd, x, y, w, h -Position_dpi96=0, 17, 363, 500, 200 ;cmd, x, y, w, h -Position_Page01=0, 34, 726, 1000, 400 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 17, 363, 500, 200 ;cmd, x, y, w, h +Position=0, 26, 446, 1066, 514 ;cmd, x, y, w, h +Position_dpi96=0, 13, 223, 533, 257 ;cmd, x, y, w, h +Position_Page01=0, 26, 446, 1066, 514 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 13, 223, 533, 257 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 DisplayMask=1 ; pages 1 -[WINDOW_6] +[WINDOW_4] XLen=84239 XMin=0 XMinNs=0 -XMax=45611 -XMaxNs=45611477581 +XMax=89695 +XMaxNs=89695375901 Grid=1 Mark=1 YValue=1 @@ -875,8 +900,8 @@ XYModeIndexP1=-1 DisplayModeAuto=0 XStart=0 AbsoluteTimeMode=0 -YAxisWidth=71 -YAxisWidth_dpi96=36 +YAxisWidth=112 +YAxisWidth_dpi96=56 RightYAxisWidth=0 RightYAxisWidth_dpi96=0 ObjectMode=0 @@ -891,7 +916,7 @@ YAxisDynScaleEnabled=0 YAxisDynScaleEnlarge=25 TimeStickToZero=0 XYModeRedrawEnabled=0 -MARKER_TIME_1=5000000000 +MARKER_TIME_1=36420069851 MARKER_TIME_2=15000000000 OscilloscopeEnabled=0 OsciEventCount=0 @@ -900,7 +925,7 @@ ObjectCount=0 Title=Grafik {DISPLAYED_FILENAME} Type=1 Comment=Grafikfenster -Number=6 +Number=4 GUID=WINDOW_8e3c9700-05e7-42c9-8abd-491ef1fcbffb ScreenDPIinSection=192 Position=0, 0, 0, 0, 0 ;cmd, x, y, w, h @@ -908,7 +933,7 @@ Position_dpi96=0, 0, 0, 0, 0 ;cmd, x, y, w, h Position_Page01=0, 0, 0, 0, 0 ;cmd, x, y, w, h Position_Page01_dpi96=0, 0, 0, 0, 0 ;cmd, x, y, w, h FloatingWindow=0 -JointIndex=5 +JointIndex=3 ShowSignalComments=1 ComponentOrder=0 ComponentSpace=100 @@ -917,35 +942,464 @@ LEGEND_SHARED_COLUMNS=1 TimeAxisTemplate= DisplayMask=1 ; pages 1 -[WINDOW_6_LEG_COLUMNS] +[WINDOW_4_LEG_COLUMNS] ScreenDPIinSection=192 COUNT=1 COL_0=31, 224 COL_0_dpi96=31, 112 -[WINDOW_7] -ProgID= -PROPERTIES_COUNT=1 -PROPERTY_1=4fb49974-7466-464d-844c-c84e4a2c006e1.0.0.0TrueTrueFalse6015010101020500FalseTrueTrueFalse2556363632550002557573730.52346667.634705-4.096809false32.7401100.52359885050505050truefalseLeftRightRightFalseFalseFalseTrueFalseTrueFalseFalseTrueTrue10010FalseTrue -OBJECTS_COUNT=0 -ObjectCount=0 -HiddenDisplayCount=0 -Title=Szenen-Fenster 1 -Type=17179869184 -Comment=Szenen-Fenster 1 -Number=7 -GUID=WINDOW_fb9e9e34-956d-4ecd-8de1-d4fe70834a16 +[WINDOW_5] +ComponentCount=1 +Title= +Type=65536 +Comment=Multi-View-Fenster +Number=5 +GUID=WINDOW_b7709c5c-103e-4355-ba71-9cee0a27a518 +ScreenDPIinSection=192 +Position=0, 34, 984, 1066, 722 ;cmd, x, y, w, h +Position_dpi96=0, 17, 492, 533, 361 ;cmd, x, y, w, h +Position_Page01=0, 34, 984, 1066, 722 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 17, 492, 533, 361 ;cmd, x, y, w, h +FloatingWindow=0 +ShowSignalComments=1 +DisplayMask=1 ; pages 1 + +[WINDOW_6] +XLen=48707 +XMin=0 +XMinNs=0 +XMax=85424 +XMaxNs=85424167525 +Grid=1 +Mark=1 +YValue=1 +ShowLegend=2 +ShowLegendHeader=1 +LegendPixWidth=224 +LegendPixWidth_dpi96=112 +LegendPixHeight=196 +LegendPixHeight_dpi96=98 +LegendPos=2 +Optimize=1 +Average=0 +ShowMinMax=1 +XYModeIndexP1=1 +DisplayModeAuto=0 +XStart=0 +AbsoluteTimeMode=0 +YAxisWidth=72 +YAxisWidth_dpi96=36 +RightYAxisWidth=0 +RightYAxisWidth_dpi96=0 +ObjectMode=0 +DisplayMode=2 +ShowSignalMode=0 +AxisScrollPos2=0 +LegendScrollPos=0 +LegendShowLifeValues=1 +ShowXScrollbar=1 +ShowWholeTimeRange=0 +YAxisDynScaleEnabled=0 +YAxisDynScaleEnlarge=25 +TimeStickToZero=0 +XYModeRedrawEnabled=1 +MARKER_TIME_1=36420069851 +MARKER_TIME_2=15000000000 +OscilloscopeEnabled=0 +OsciEventCount=0 +EventCompareModeEnabled=0 +ObjectCount=0 +Title=Grafik {DISPLAYED_FILENAME} +Type=1 +Comment=Grafikfenster +Number=6 +GUID=WINDOW_13f42c97-fa7f-46f2-a2a2-fcc83ec52a8a +ScreenDPIinSection=192 +Position=0, 0, 0, 0, 0 ;cmd, x, y, w, h +Position_dpi96=0, 0, 0, 0, 0 ;cmd, x, y, w, h +Position_Page01=0, 0, 0, 0, 0 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 0, 0, 0, 0 ;cmd, x, y, w, h +FloatingWindow=0 +JointIndex=5 +ShowSignalComments=1 +ComponentOrder=0 +ComponentSpace=100 +LEGEND_HSCROLL_POS=0 +LEGEND_SHARED_COLUMNS=1 +TimeAxisTemplate= +DisplayMask=1 ; pages 1 + +[WINDOW_6_LEG_COLUMNS] +ScreenDPIinSection=192 +COUNT=1 +COL_0=31, 224 +COL_0_dpi96=31, 112 + +[WINDOW_7] +ProgID= +PROPERTIES_COUNT=1 +PROPERTY_1=7d875669-2751-4051-9b26-103be1b7d5a51.0.0.0TrueTrueFalse6015010101020500FalseTrueTrueFalse255636363255000255757373-0.9450845-4.8540446.502305false26.03774-0.38999980.24359875050505050truefalseLeftRightRightFalseFalseFalseTrueFalseTrueFalseFalseTrueTrue10010FalseTrue +OBJECTS_COUNT=0 +ObjectCount=0 +HiddenDisplayCount=0 +Title=Szenen-Fenster 1 +Type=17179869184 +Comment=Szenen-Fenster 1 +Number=7 +GUID=WINDOW_b8bb0114-43f9-42b4-9442-fa4e8752f3b9 +ScreenDPIinSection=192 +Position=0, 1132, 838, 1672, 920 ;cmd, x, y, w, h +Position_dpi96=0, 566, 419, 836, 460 ;cmd, x, y, w, h +Position_Page01=0, 1132, 838, 1672, 920 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 566, 419, 836, 460 ;cmd, x, y, w, h +FloatingWindow=0 +ShowSignalComments=1 +DisplayMask=1 ; pages 1 + +[WINDOW_8] +ProgID= +PROPERTIES_COUNT=1 +PROPERTY_1={"Version":"1.3.0.0","Configuration":{"ArrayWindowSubControlConfiguration":{"NumericGraphicCompositeWidth":317,"NumericGraphicCompositeHeight":178,"LegendCoordinatePoint":{"X":0,"Y":0},"LegendWidth":0,"LegendHeight":0,"LegendLayoutGroupSizeWidth":0,"LegendLayoutGroupSizeHeight":0,"NumericCoordinatePoint":{"X":1,"Y":24},"NumericWidth":315,"NumericHeight":153,"NumericLayoutGroupSizeWidth":315,"NumericLayoutGroupSizeHeight":153,"Intersection2DXWCoordinatePoint":{"X":0,"Y":0},"Intersection2DXWWidth":0,"Intersection2DXWHeight":0,"Intersection2DXWLayoutGroupSizeWidth":0,"Intersection2DXWLayoutGroupSizeHeight":0,"Intersection2DYWCoordinatePoint":{"X":0,"Y":0},"Intersection2DYWWidth":0,"Intersection2DYWHeight":0,"Intersection2DYWLayoutGroupSizeWidth":0,"Intersection2DYWLayoutGroupSizeHeight":0,"Graphic3DCoordinatePoint":{"X":0,"Y":0},"Graphic3DWidth":0,"Graphic3DHeight":0,"Graphic3DLayoutGroupSizeWidth":0,"Graphic3DLayoutGroupSizeHeight":0},"ShowCalibrationBar":true,"ShowHorizontalChartLines":false,"ShowVerticalChartLines":false,"NonSelectedIntersectionLineTransparency":0.100000024,"FocusedValueSymbol":"DEVICE:\"xcp_lite\":\"Params.period_y\":P","ValueObjectConfigurations":[{"Symbol":"DEVICE:\"xcp_lite\":\"Params.ampl_x\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":0.001,"ValueAxisMax":100,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"xcp_lite\":\"Params.ampl_y\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":0.001,"ValueAxisMax":100,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"xcp_lite\":\"Params.period_x\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":0.001,"ValueAxisMax":10,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"xcp_lite\":\"Params.period_y\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":0.001,"ValueAxisMax":10,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"xcp_lite\":\"Params.phi_x\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":0,"ValueAxisMax":1,"CustomAxisLabels":["","","","","",""]},{"Symbol":"DEVICE:\"xcp_lite\":\"Params.phi_y\":P","SerializationColor":{"R":0,"G":0,"B":0,"A":255},"Collapsed":false,"SerializationFrameColor":{"R":0,"G":0,"B":0,"A":255},"ValueFormat":0,"AxisValueFormats":[],"NumericFormat":4,"AxisNumericFormats":[],"NumericFormatDigits":6,"IsActive":true,"CurrentChartViewType":2,"PointMarker":1,"IsValueAnnotationEnabled":false,"ValueAxisMin":0,"ValueAxisMax":2,"CustomAxisLabels":["","","","","",""]}],"NumericGraphicControlPosition":0,"NumericGraphicControlSelectedTab":0,"GraphicControlPosition":0,"Height2DXControl":1,"Height2DYControl":1,"Height3DControl":2,"HeightNumericControl":1,"HeightChartControl":1,"HeightLegendControl":0.44999998807907104,"Width2DXControl":1,"Width2DYControl":1,"Width3DControl":2,"WidthNumericControl":2,"WidthChartControl":2,"WidthLegendControl":0.30000001192092896,"HeightValueControl":1,"WidthValueControl":1,"HeightNumericGraphicControl":1,"WidthNumericGraphicControl":1,"Height2DChartsControl":1,"Width2DChartsControl":1,"IsXAxisHeightSynchronizedBetweenCharts":true,"SyncedXAxisHeight":NaN,"XWChartXAxisHeight":NaN,"YWChartXAxisHeight":NaN,"LegendPosition":0,"LegendViewType":0,"LegendTableColumnAttributes":[{"TypeId":"1048594","Size":40},{"TypeId":"1048601","Size":45},{"TypeId":"31","Size":100},{"TypeId":"3","Size":250},{"TypeId":"16","Size":70},{"TypeId":"1048627","Size":100},{"TypeId":"1048631","Size":100},{"TypeId":"1048634","Size":100}],"LegendTabItemAttributes":[{"TypeId":"31","Size":100}],"FlipAxes":false,"AxisDisplayNameMode":3,"ReversedAxis":[false,false],"ShowUnits":false,"ShowObjectColor":false,"SortDescending":false,"SortAttributeId":null,"ShowWorkingPointHistory":false,"NumericViewValueObjectDisplayOption":1,"ValueColumnWidth":129,"ValueColumnWidthDouble":129.5,"ParameterGroup":"","ModuleName":"","GroupIsFunction":false,"NumericControlAxisAttributes":[],"NumericControlColumnAttributes":[{"TypeId":"31","Size":146.5}],"ChartViewValueObjectDisplayOption":1,"SerializationCameraPosition":{"X":1,"Y":1,"Z":-1},"SerializationCameraTarget":{"X":0,"Y":0.5,"Z":0},"IsValueAnnotationRotated":false,"EquidistantAxisPoints":false,"BarThickness":0.6,"WorkingPointMarker":0,"LinearWorkingPointInterpolation":true,"ShowAllIntersectionLines":false,"IsValueAxisIndependent":true,"TickLabelRotationAngle":-90,"IsTickLabelRotationEnabled":false,"IsTickLabelRightAligned":false,"ShowBoundarySurface":true,"ShowBoundarySurfaceGradient":false,"ShowCursorAsCrosshair":false,"XAxisAutoRange":true,"ValueAxisAutoRange":true,"ShowAllValueAxes":false,"CurrentColumnChartType":0,"SerializationCursorCrosshairColor":{"R":0,"G":0,"B":0,"A":255},"AlignBarToZero":true,"DefaultChartViewType":2,"AttributeColumnPositioning":1}} +OBJECTS_COUNT=6 +OBJECT_1=DEVICE:"xcp_lite":"Params.ampl_x":P +OBJECT_2=DEVICE:"xcp_lite":"Params.ampl_y":P +OBJECT_3=DEVICE:"xcp_lite":"Params.period_x":P +OBJECT_4=DEVICE:"xcp_lite":"Params.period_y":P +OBJECT_5=DEVICE:"xcp_lite":"Params.phi_x":P +OBJECT_6=DEVICE:"xcp_lite":"Params.phi_y":P +ObjectCount=6 +HiddenDisplayCount=0 +Title=Allgemeines Verstellen +Type=137438953472 +Comment=Allgemeines Verstellen +Number=8 +GUID=WINDOW_2573b853-28b8-4a7c-a0a7-e51c8ce10281 +ScreenDPIinSection=192 +Position=0, 1122, 424, 640, 396 ;cmd, x, y, w, h +Position_dpi96=0, 561, 212, 320, 198 ;cmd, x, y, w, h +Position_Page01=0, 1122, 424, 640, 396 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 561, 212, 320, 198 ;cmd, x, y, w, h +FloatingWindow=0 +ShowSignalComments=1 +DisplayMask=1 ; pages 1 + +[WINDOW_8_OBJECT_1] +Type=2 +Module=xcp_lite +Name=Params.ampl_x +Window=8 +Index=0 +Color=0 +ApplyColorToBackground=0 +ColorFunction=0 +ColorFunctionScope=1 +LineTyp=2 +YMinHome=0.001 +YMaxHome=100 +YMin=0.001 +YMax=100 +XOffsetNS=0 +XOffset=0 +ValueFormat=3 +BitMask=1 +ShowYAxis=1 +Width=10 +LineStyle=1 +MarkerType=1 +SRMainValue=0 +InvalidValueDrawMode=3 +LineWidth=1 +Precision=-2 +Digits=6 +Enabled=1 +StoredFocused=0 +SublMask=0 +MeaSublMask=0 +LockScaling=0 +RightAxis=0 +MapMode=2 +OverlayGridColor=0 +ShadingMode=3 +EditOffset=1 +EditFactor=2 +WAxisLabel= +XAxisLabel= +YAxisLabel= +AxisCaption= +Row=0 +Col=0 +YAxis_ID=0 +AxisTemplate= +GUID=DISPLAY_9823620a-29fe-4439-a089-ac04fe5c33a1 + +[WINDOW_8_OBJECT_2] +Type=2 +Module=xcp_lite +Name=Params.ampl_y +Window=8 +Index=1 +Color=0 +ApplyColorToBackground=0 +ColorFunction=0 +ColorFunctionScope=1 +LineTyp=2 +YMinHome=0.001 +YMaxHome=100 +YMin=0.001 +YMax=100 +XOffsetNS=0 +XOffset=0 +ValueFormat=3 +BitMask=1 +ShowYAxis=1 +Width=10 +LineStyle=1 +MarkerType=1 +SRMainValue=0 +InvalidValueDrawMode=3 +LineWidth=1 +Precision=-2 +Digits=6 +Enabled=1 +StoredFocused=0 +SublMask=0 +MeaSublMask=0 +LockScaling=0 +RightAxis=0 +MapMode=2 +OverlayGridColor=0 +ShadingMode=3 +EditOffset=1 +EditFactor=2 +WAxisLabel= +XAxisLabel= +YAxisLabel= +AxisCaption= +Row=0 +Col=0 +YAxis_ID=0 +AxisTemplate= +GUID=DISPLAY_b0d7989a-d724-45c0-97fe-ae0cdb205906 + +[WINDOW_8_OBJECT_3] +Type=2 +Module=xcp_lite +Name=Params.period_x +Window=8 +Index=2 +Color=0 +ApplyColorToBackground=0 +ColorFunction=0 +ColorFunctionScope=1 +LineTyp=2 +YMinHome=0.001 +YMaxHome=10 +YMin=0.001 +YMax=10 +XOffsetNS=0 +XOffset=0 +ValueFormat=3 +BitMask=1 +ShowYAxis=1 +Width=10 +LineStyle=1 +MarkerType=1 +SRMainValue=0 +InvalidValueDrawMode=3 +LineWidth=1 +Precision=-2 +Digits=6 +Enabled=1 +StoredFocused=0 +SublMask=0 +MeaSublMask=0 +LockScaling=0 +RightAxis=0 +MapMode=2 +OverlayGridColor=0 +ShadingMode=3 +EditOffset=1 +EditFactor=2 +WAxisLabel= +XAxisLabel= +YAxisLabel= +AxisCaption= +Row=0 +Col=0 +YAxis_ID=0 +AxisTemplate= +GUID=DISPLAY_296107e5-50ce-4460-9c4d-82b945a7cbb2 + +[WINDOW_8_OBJECT_4] +Type=2 +Module=xcp_lite +Name=Params.period_y +Window=8 +Index=3 +Color=0 +ApplyColorToBackground=0 +ColorFunction=0 +ColorFunctionScope=1 +LineTyp=2 +YMinHome=0.001 +YMaxHome=10 +YMin=0.001 +YMax=10 +XOffsetNS=0 +XOffset=0 +ValueFormat=3 +BitMask=1 +ShowYAxis=1 +Width=10 +LineStyle=1 +MarkerType=1 +SRMainValue=0 +InvalidValueDrawMode=3 +LineWidth=1 +Precision=-2 +Digits=6 +Enabled=1 +StoredFocused=0 +SublMask=0 +MeaSublMask=0 +LockScaling=0 +RightAxis=0 +MapMode=2 +OverlayGridColor=0 +ShadingMode=3 +EditOffset=1 +EditFactor=2 +WAxisLabel= +XAxisLabel= +YAxisLabel= +AxisCaption= +Row=0 +Col=0 +YAxis_ID=0 +AxisTemplate= +GUID=DISPLAY_57bf71e2-7e53-40c8-923e-c1622fb78257 + +[WINDOW_8_OBJECT_5] +Type=2 +Module=xcp_lite +Name=Params.phi_x +Window=8 +Index=4 +Color=0 +ApplyColorToBackground=0 +ColorFunction=0 +ColorFunctionScope=1 +LineTyp=2 +YMinHome=0 +YMaxHome=1 +YMin=0 +YMax=1 +XOffsetNS=0 +XOffset=0 +ValueFormat=3 +BitMask=1 +ShowYAxis=1 +Width=10 +LineStyle=1 +MarkerType=1 +SRMainValue=0 +InvalidValueDrawMode=3 +LineWidth=1 +Precision=-2 +Digits=6 +Enabled=1 +StoredFocused=0 +SublMask=0 +MeaSublMask=0 +LockScaling=0 +RightAxis=0 +MapMode=2 +OverlayGridColor=0 +ShadingMode=3 +EditOffset=1 +EditFactor=2 +WAxisLabel= +XAxisLabel= +YAxisLabel= +AxisCaption= +Row=0 +Col=0 +YAxis_ID=0 +AxisTemplate= +GUID=DISPLAY_636d1cc1-f89b-40a3-9da8-4d17003c33ce + +[WINDOW_8_OBJECT_6] +Type=2 +Module=xcp_lite +Name=Params.phi_y +Window=8 +Index=5 +Color=0 +ApplyColorToBackground=0 +ColorFunction=0 +ColorFunctionScope=1 +LineTyp=2 +YMinHome=0 +YMaxHome=2 +YMin=0 +YMax=2 +XOffsetNS=0 +XOffset=0 +ValueFormat=3 +BitMask=1 +ShowYAxis=1 +Width=10 +LineStyle=1 +MarkerType=1 +SRMainValue=0 +InvalidValueDrawMode=3 +LineWidth=1 +Precision=-2 +Digits=6 +Enabled=1 +StoredFocused=0 +SublMask=0 +MeaSublMask=0 +LockScaling=0 +RightAxis=0 +MapMode=2 +OverlayGridColor=0 +ShadingMode=3 +EditOffset=1 +EditFactor=2 +WAxisLabel= +XAxisLabel= +YAxisLabel= +AxisCaption= +Row=0 +Col=0 +YAxis_ID=0 +AxisTemplate= +GUID=DISPLAY_f5178b93-2137-4da5-91a3-6c83a0bba6d8 + +[WINDOW_9] +ProgID= +PROPERTIES_COUNT=1 +PROPERTY_1=1.0.0.027d875669-2751-4051-9b26-103be1b7d5a59ee5ba33-4e4f-4116-a0e8-f2cf7e83dedf7d875669-2751-4051-9b26-103be1b7d5a5 +OBJECTS_COUNT=0 +ObjectCount=0 +HiddenDisplayCount=0 +Title=ADAS-Explorer 1 +Type=68719476736 +Comment=ADAS-Explorer 1 +Number=9 +GUID=WINDOW_a3582fc2-eda7-4422-a215-85df6aa3e338 ScreenDPIinSection=192 -Position=0, 1118, 611, 1643, 1057 ;cmd, x, y, w, h -Position_dpi96=0, 559, 306, 822, 529 ;cmd, x, y, w, h -Position_Page01=0, 1118, 611, 1643, 1057 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 559, 306, 822, 529 ;cmd, x, y, w, h +Position=0, 1338, 424, 776, 368 ;cmd, x, y, w, h +Position_dpi96=0, 669, 212, 388, 184 ;cmd, x, y, w, h +Position_Page01=0, 1338, 424, 776, 368 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 669, 212, 388, 184 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 DisplayMask=1 ; pages 1 [WINDOWS] -Count=7 +Count=9 [Y_COMMON_AXIS_LIST] Count=0 diff --git a/examples/point_cloud_demo/CANape/point_cloud.cnaxml b/examples/point_cloud_demo/CANape/point_cloud.cnaxml index 07237e3..b149965 100644 --- a/examples/point_cloud_demo/CANape/point_cloud.cnaxml +++ b/examples/point_cloud_demo/CANape/point_cloud.cnaxml @@ -201,7 +201,7 @@ false false false - 20.5,155.5 + 15,145.5 \ No newline at end of file diff --git a/examples/point_cloud_demo/CANape/point_cloud.gvc b/examples/point_cloud_demo/CANape/point_cloud.gvc index f207f17..797fd9d 100644 --- a/examples/point_cloud_demo/CANape/point_cloud.gvc +++ b/examples/point_cloud_demo/CANape/point_cloud.gvc @@ -1,14 +1,16 @@  - + - 215f5a78-7c44-4e26-b8f2-3b1b189680ab - + 9ee5ba33-4e4f-4116-a0e8-f2cf7e83dedf + + 7d875669-2751-4051-9b26-103be1b7d5a5 + - 215f5a78-7c44-4e26-b8f2-3b1b189680ab + 9ee5ba33-4e4f-4116-a0e8-f2cf7e83dedf 2 point_cloud @@ -16,91 +18,71 @@ MEQwRUFBQjY2NjA0RjA4MDYwNjBCODFERjZCNTZBMzgtNURFNEVFNjlEQkU2NUM0NzhDNUE5ODU2RTNFMkVEQjI= - point_cloud.Points[*] + point_cloud {"ObjectName":"point_cloud","SourceName":"xcp_lite","TypeIdentifier":"MEQwRUFBQjY2NjA0RjA4MDYwNjBCODFERjZCNTZBMzgtNURFNEVFNjlEQkU2NUM0NzhDNUE5ODU2RTNFMkVEQjI="} - Points + point_cloud point_cloud - Points[*] + point_cloud xcp_lite false - - - -1 - 0 - 0 - true - - + - 1 + 0 Vector.PointCloud, Vector.DA.DynamicObject.D7-7F-54-F1-E9-53-81-8C-C1-89-89-17-99-27-5E-92, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - {"ObjectName":"point_cloud","SourceName":"xcp_lite","TypeIdentifier":"MEQwRUFBQjY2NjA0RjA4MDYwNjBCODFERjZCNTZBMzgtNURFNEVFNjlEQkU2NUM0NzhDNUE5ODU2RTNFMkVEQjI="} - point_cloud - point_cloud - point_cloud - xcp_lite - - false - - - 0 - Vector.PointCloud, Vector.DA.DynamicObject.D7-7F-54-F1-E9-53-81-8C-C1-89-89-17-99-27-5E-92, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - Points[*] - Points - true - Vector.Point, Vector.DA.DynamicObject.D7-7F-54-F1-E9-53-81-8C-C1-89-89-17-99-27-5E-92 + + + Points + Points + true + Vector.Point, Vector.DA.DynamicObject.D7-7F-54-F1-E9-53-81-8C-C1-89-89-17-99-27-5E-92 + + true - false + + -1 + 0 + 0 + false + + + + Collection + + + x + x + false + System.Single, mscorlib - - -1 - 0 - 0 - true - + false + - - Collection - - - x - x - false - System.Single, mscorlib - - false - - - - - y - y - false - System.Single, mscorlib - - false - - - - - z - z - false - System.Single, mscorlib - - false - - - - - - - + + + y + y + false + System.Single, mscorlib + + false + + + + + z + z + false + System.Single, mscorlib + + false + + + + + + Explicit Cartesian @@ -265,7 +247,7 @@ Z-Position eines Punktes mit kartesischen Koordinaten - ConstantColor_2 + ConstantColor_0 true @@ -349,17 +331,17 @@ X-Position eines Punktes mit kartesischen Koordinaten - Points[*] + Points Points Vector.Point, Vector.DA.DynamicObject.D7-7F-54-F1-E9-53-81-8C-C1-89-89-17-99-27-5E-92 - false + true -1 0 0 - true + false @@ -398,17 +380,17 @@ Y-Position eines Punktes mit kartesischen Koordinaten - Points[*] + Points Points Vector.Point, Vector.DA.DynamicObject.D7-7F-54-F1-E9-53-81-8C-C1-89-89-17-99-27-5E-92 - false + true -1 0 0 - true + false @@ -447,17 +429,17 @@ Z-Position eines Punktes mit kartesischen Koordinaten - Points[*] + Points Points Vector.Point, Vector.DA.DynamicObject.D7-7F-54-F1-E9-53-81-8C-C1-89-89-17-99-27-5E-92 - false + true -1 0 0 - true + false @@ -474,8 +456,8 @@ Z-Position eines Punktes mit kartesischen Koordinaten - QuickInformation - Vector.DA.Gfx.QuickInformation.QuickInfo, Vector.DA.Gfx + QuickInfoDataList + Vector.DA.Gfx.QuickInformation.QuickInfoData, Vector.DA.Gfx Schnellinformationen QuickInfoEditor @@ -486,11 +468,128 @@ Z-Position eines Punktes mit kartesischen Koordinaten System.ComponentModel.ExpandableObjectConverter, System - QuickInformation + QuickInfoDataList Simple false - + + DisplayObjectName + System.Boolean, mscorlib + + DisplayObjectName + EmptyTemplate + false + false + + + Boolean + true + true + true + + + 1 + 0 + + + + Format + System.String, mscorlib + + Format + FormatEditor + false + false + + + String + true + true + + + + 1 + 0 + + + + InfoType + Vector.DA.Gfx.QuickInformation.FormatTemplate, Vector.DA.Gfx + + InfoType + EnumEditor + false + false + + + FormatTemplate + true + true + Custom + + + 1 + 0 + + + + Values + System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Double, mscorlib]], mscorlib + + Values + false + false + System.ComponentModel.ExpandableObjectConverter, System + + + 0, Culture=neutral, PublicKeyToken=b77a5c561934e089]] + Collection + false + System.Collections.Generic.KeyValuePair`2[[System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[System.Double, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Key + System.String, mscorlib + + Key + TextEditor + true + true + + + String + true + true + + + + 1 + 0 + + + + Value + System.Double, mscorlib + + Value + NumericDecimalEditor + true + true + + + Double + true + true + 0 + + + 1 + 0 + + + + + QuickInfoDataList System.Collections.Generic.List`1[[Vector.DA.Gfx.QuickInformation.QuickInfoData, Vector.DA.Gfx]], mscorlib @@ -604,26 +703,6 @@ Z-Position eines Punktes mit kartesischen Koordinaten - - DisplayObjectName - System.Boolean, mscorlib - - DisplayObjectName - EmptyTemplate - false - false - - - Boolean - true - true - true - - - 1 - 0 - - @@ -643,69 +722,6 @@ Z-Position eines Punktes mit kartesischen Koordinaten Simple false - - DisplayObjectName - System.Boolean, mscorlib - - Schnellinformationen - QuickInfoEditor - Anzeige - Erweitert die formatierte Datenvorschau. - false - true - System.ComponentModel.ExpandableObjectConverter, System - - - Boolean - true - true - true - - - 1 - 0 - - - - Format - System.String, mscorlib - - Format - FormatEditor - false - false - - - String - true - true - Welt: X:{0}m, Y:{1}m, Z:{2}m - - - 1 - 0 - - - - InfoType - Vector.DA.Gfx.QuickInformation.FormatTemplate, Vector.DA.Gfx - - InfoType - EnumEditor - false - false - - - FormatTemplate - true - true - World - - - 1 - 0 - - Values System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.Double, mscorlib]], mscorlib @@ -792,6 +808,69 @@ Z-Position eines Punktes mit kartesischen Koordinaten + + DisplayObjectName + System.Boolean, mscorlib + + Schnellinformationen + QuickInfoEditor + Anzeige + Erweitert die formatierte Datenvorschau. + false + true + System.ComponentModel.ExpandableObjectConverter, System + + + Boolean + true + true + true + + + 1 + 0 + + + + Format + System.String, mscorlib + + Format + FormatEditor + false + false + + + String + true + true + Welt: X:{0}m, Y:{1}m, Z:{2}m + + + 1 + 0 + + + + InfoType + Vector.DA.Gfx.QuickInformation.FormatTemplate, Vector.DA.Gfx + + InfoType + EnumEditor + false + false + + + FormatTemplate + true + true + World + + + 1 + 0 + + @@ -800,7 +879,7 @@ Z-Position eines Punktes mit kartesischen Koordinaten SpacialRotation Vector.DA.Gfx.EulerRotation, Vector.DA.Gfx - Räumliche Drehung + Quaternion SpacialRotationsEditor Basis Beschreibt die Drehung eines Objekts durch Euler-Winkel und eine gegebene Drehreihenfolge. @@ -1044,7 +1123,7 @@ Größe der Punkte in Pixeln. Double true true - 5 + 20 1 @@ -1100,7 +1179,7 @@ Priorität (Reihenfolge des Zeichnens) des Objekts. 1 = höchste Priorität -> true - 215f5a78-7c44-4e26-b8f2-3b1b189680ab + 9ee5ba33-4e4f-4116-a0e8-f2cf7e83dedf @@ -1108,7 +1187,7 @@ Priorität (Reihenfolge des Zeichnens) des Objekts. 1 = höchste Priorität -> - ConstantColor_2 + ConstantColor_0 #FFFF0000 diff --git a/examples/point_cloud_demo/CANape/xcp_lite.HEX b/examples/point_cloud_demo/CANape/xcp_lite.HEX index 35effaf..d294066 100644 --- a/examples/point_cloud_demo/CANape/xcp_lite.HEX +++ b/examples/point_cloud_demo/CANape/xcp_lite.HEX @@ -1,4 +1,7 @@ :020000020000FC :020000040000FA +:02000004800179 +:20000000000000000000004000000000000024400000000000000000000000000000F83F05 +:10002000000000000000244000000000000000006C :00000001FF  \ No newline at end of file diff --git a/examples/point_cloud_demo/README.md b/examples/point_cloud_demo/README.md index ee481ca..f8404e1 100644 --- a/examples/point_cloud_demo/README.md +++ b/examples/point_cloud_demo/README.md @@ -1,6 +1,6 @@ # Point Cloud Demo -Use CANape to visualize a point cloud +Use CANape to visualize a point cloud ![CANape](CANape.png) diff --git a/examples/point_cloud_demo/point_cloud.a2l b/examples/point_cloud_demo/point_cloud.a2l index 71eab90..a8ee8b6 100644 --- a/examples/point_cloud_demo/point_cloud.a2l +++ b/examples/point_cloud_demo/point_cloud.a2l @@ -64,7 +64,17 @@ /begin MEMORY_SEGMENT epk "" DATA FLASH INTERN 0x80000000 3 -1 -1 -1 -1 -1 /end MEMORY_SEGMENT - + + /begin MEMORY_SEGMENT + Params "" DATA FLASH INTERN 0x80010000 48 -1 -1 -1 -1 -1 + /begin IF_DATA XCP + /begin SEGMENT /* index: */ 1 /* pages: */ 2 /* ext: */ 0 0 0 + /begin CHECKSUM XCP_ADD_44 MAX_BLOCK_SIZE 0xFFFF EXTERNAL_FUNCTION "" /end CHECKSUM + /begin PAGE 0x0 ECU_ACCESS_DONT_CARE XCP_READ_ACCESS_DONT_CARE XCP_WRITE_ACCESS_DONT_CARE /end PAGE + /begin PAGE 0x1 ECU_ACCESS_DONT_CARE XCP_READ_ACCESS_DONT_CARE XCP_WRITE_ACCESS_NOT_ALLOWED /end PAGE + /end SEGMENT + /end IF_DATA + /end MEMORY_SEGMENT /end MOD_PAR /begin IF_DATA XCP @@ -113,7 +123,20 @@ /end IF_DATA - +/begin CHARACTERISTIC Params.ampl_x "" VALUE 0x80010008 F64 0 NO_COMPU_METHOD 0.001 100 PHYS_UNIT "m" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.ampl_y "" VALUE 0x80010020 F64 0 NO_COMPU_METHOD 0.001 100 PHYS_UNIT "m" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.period_x "" VALUE 0x80010000 F64 0 NO_COMPU_METHOD 0.001 10 PHYS_UNIT "s" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.period_y "" VALUE 0x80010018 F64 0 NO_COMPU_METHOD 0.001 10 PHYS_UNIT "s" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.phi_x "" VALUE 0x80010010 F64 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "PI" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.phi_y "" VALUE 0x80010028 F64 0 NO_COMPU_METHOD 0 2 PHYS_UNIT "PI" /end CHARACTERISTIC +/begin GROUP Params "" /begin REF_CHARACTERISTIC +Params.ampl_x +Params.ampl_y +Params.period_x +Params.period_y +Params.phi_x +Params.phi_y +/end REF_CHARACTERISTIC /end GROUP /begin MEASUREMENT mainloop_counter1 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0xD0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT /begin CHARACTERISTIC point_cloud "point cloud demo" ASCII 0x0 U8 0 NO_COMPU_METHOD 0 255 READ_ONLY NUMBER 200 ECU_ADDRESS_EXTENSION 2 diff --git a/examples/point_cloud_demo/src/main.rs b/examples/point_cloud_demo/src/main.rs index 26cab7e..31b837a 100644 --- a/examples/point_cloud_demo/src/main.rs +++ b/examples/point_cloud_demo/src/main.rs @@ -9,16 +9,22 @@ use std::{ time::{Duration, Instant}, }; -use serde::Serialize; +use serde::{Deserialize, Serialize}; -use xcp::*; -//use xcp_type_description_derive::XcpTypeDescription; +//----------------------------------------------------------------------------- +// Defaults const BIND_ADDR: [u8; 4] = [192, 168, 0, 83]; // [172, 19, 11, 24]; // [192, 168, 0, 83]; // [127, 0, 0, 1]; -const POINT_COUNT: usize = 3; +const POINT_COUNT: usize = 16; const AMPL: f64 = 10.0; -const PERIOD: f64 = 3.0; +const PERIOD: f64 = 10.0; + +//----------------------------------------------------------------------------- +// XCP + +use xcp::*; +use xcp_type_description_derive::XcpTypeDescription; //----------------------------------------------------------------------------- // Application start time @@ -27,6 +33,51 @@ lazy_static::lazy_static! { static ref START_TIME: Instant = Instant::now(); } +//----------------------------------------------------------------------------- +// Parameters + +#[derive(Debug, Clone, Copy, Serialize, Deserialize, XcpTypeDescription)] +struct Params { + #[unit = "s"] + #[min = "0.001"] + #[max = "10"] + period_x: f64, + + #[unit = "m"] + #[min = "0.001"] + #[max = "100"] + ampl_x: f64, + + #[unit = "PI"] + #[min = "0.0"] + #[max = "1.0"] + phi_x: f64, + + #[unit = "s"] + #[min = "0.001"] + #[max = "10"] + period_y: f64, + + #[unit = "m"] + #[min = "0.001"] + #[max = "100"] + ampl_y: f64, + + #[unit = "PI"] + #[min = "0.0"] + #[max = "2.0"] + phi_y: f64, +} + +const PARAMS: Params = Params { + period_x: PERIOD, + ampl_x: AMPL, + phi_x: 0.0, + period_y: PERIOD, + ampl_y: AMPL, + phi_y: 0.0, +}; + //--------------------------------------------------------------------------------------- fn main() { @@ -42,37 +93,66 @@ fn main() { .start_server(XcpTransportLayer::Udp, BIND_ADDR, 5555, 8000 - 20 - 8) .unwrap(); - let mut event_point_cloud = daq_create_event!("point_cloud", 200); + let params = Xcp::create_calseg("Params", &PARAMS, true); + + let mut event_point_cloud = daq_create_event!("point_cloud", POINT_COUNT * 12 + 8); let mut mainloop_counter1: u64 = 0; daq_register!(mainloop_counter1, event_point_cloud); + #[derive(Serialize)] + struct Point { + x: f32, + y: f32, + z: f32, + } + + let mut point_cloud = Vec::with_capacity(4); + for _ in 0..POINT_COUNT { + point_cloud.push(Point { + x: 0.0, + y: 0.0, + z: 0.0, + }); + } + + let mut phi = 0.0; + let mut h = 0.0; loop { - thread::sleep(Duration::from_millis(50)); + thread::sleep(Duration::from_millis(10)); + let t = START_TIME.elapsed().as_micros() as f64 * 0.000001; // s mainloop_counter1 += 1; + if mainloop_counter1 > 256 { + mainloop_counter1 = 0; + } - // Serialize a struct into the event capture buffer - #[derive(Serialize)] - struct Point { - x: f32, - y: f32, - z: f32, + phi += 2.0 * PI / POINT_COUNT as f64 * 0.001; + if phi > 2.0 * PI / POINT_COUNT as f64 { + phi = 0.0; + } + h += 0.01; + if h > 30.0 { + h = 0.0; } - let mut point_cloud = Vec::with_capacity(4); - for i in 0..POINT_COUNT { - // Calculate demo measurement variable depending on calibration parameters (sine signal with ampl and period) - let time = START_TIME.elapsed().as_micros() as f64 * 0.000001; // s - - let x: f32 = (AMPL * (PI * time / PERIOD).sin()) as f32; - let y: f32 = (AMPL * (PI * time / PERIOD).cos()) as f32; - let z: f32 = i as f32; - point_cloud.push(Point { x, y, z }); + for (i, p) in point_cloud.iter_mut().enumerate() { + let a_x: f64 = params.ampl_x; + let a_y: f64 = params.ampl_y; + let omega_x = 2.0 * PI / params.period_x; + let omega_y = 2.0 * PI / params.period_y; + let phi_x = 1.0 * PI / POINT_COUNT as f64 * i as f64 + phi; + let phi_y = 1.0 * PI / POINT_COUNT as f64 * i as f64 + phi; + + p.x = (a_x * (omega_x * t + phi_x).cos()) as f32; + p.y = (a_y * (omega_y * t + phi_y).sin()) as f32; + p.z = h * (i as f32 * 0.03); } + // Serialize into the event capture buffer daq_serialize!(point_cloud, event_point_cloud, "point cloud demo"); event_point_cloud.trigger(); + params.sync(); xcp.write_a2l(); } } diff --git a/examples/point_cloud_demo/xcp_lite_autodetect.a2l b/examples/point_cloud_demo/xcp_lite_autodetect.a2l index 71eab90..a8ee8b6 100644 --- a/examples/point_cloud_demo/xcp_lite_autodetect.a2l +++ b/examples/point_cloud_demo/xcp_lite_autodetect.a2l @@ -64,7 +64,17 @@ /begin MEMORY_SEGMENT epk "" DATA FLASH INTERN 0x80000000 3 -1 -1 -1 -1 -1 /end MEMORY_SEGMENT - + + /begin MEMORY_SEGMENT + Params "" DATA FLASH INTERN 0x80010000 48 -1 -1 -1 -1 -1 + /begin IF_DATA XCP + /begin SEGMENT /* index: */ 1 /* pages: */ 2 /* ext: */ 0 0 0 + /begin CHECKSUM XCP_ADD_44 MAX_BLOCK_SIZE 0xFFFF EXTERNAL_FUNCTION "" /end CHECKSUM + /begin PAGE 0x0 ECU_ACCESS_DONT_CARE XCP_READ_ACCESS_DONT_CARE XCP_WRITE_ACCESS_DONT_CARE /end PAGE + /begin PAGE 0x1 ECU_ACCESS_DONT_CARE XCP_READ_ACCESS_DONT_CARE XCP_WRITE_ACCESS_NOT_ALLOWED /end PAGE + /end SEGMENT + /end IF_DATA + /end MEMORY_SEGMENT /end MOD_PAR /begin IF_DATA XCP @@ -113,7 +123,20 @@ /end IF_DATA - +/begin CHARACTERISTIC Params.ampl_x "" VALUE 0x80010008 F64 0 NO_COMPU_METHOD 0.001 100 PHYS_UNIT "m" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.ampl_y "" VALUE 0x80010020 F64 0 NO_COMPU_METHOD 0.001 100 PHYS_UNIT "m" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.period_x "" VALUE 0x80010000 F64 0 NO_COMPU_METHOD 0.001 10 PHYS_UNIT "s" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.period_y "" VALUE 0x80010018 F64 0 NO_COMPU_METHOD 0.001 10 PHYS_UNIT "s" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.phi_x "" VALUE 0x80010010 F64 0 NO_COMPU_METHOD 0 1 PHYS_UNIT "PI" /end CHARACTERISTIC +/begin CHARACTERISTIC Params.phi_y "" VALUE 0x80010028 F64 0 NO_COMPU_METHOD 0 2 PHYS_UNIT "PI" /end CHARACTERISTIC +/begin GROUP Params "" /begin REF_CHARACTERISTIC +Params.ampl_x +Params.ampl_y +Params.period_x +Params.period_y +Params.phi_x +Params.phi_y +/end REF_CHARACTERISTIC /end GROUP /begin MEASUREMENT mainloop_counter1 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1000000000000 PHYS_UNIT "" ECU_ADDRESS 0xD0 ECU_ADDRESS_EXTENSION 2 /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end MEASUREMENT /begin CHARACTERISTIC point_cloud "point cloud demo" ASCII 0x0 U8 0 NO_COMPU_METHOD 0 255 READ_ONLY NUMBER 200 ECU_ADDRESS_EXTENSION 2 diff --git a/src/daq/daq_event.rs b/src/daq/daq_event.rs index cf462c9..92e288c 100644 --- a/src/daq/daq_event.rs +++ b/src/daq/daq_event.rs @@ -29,7 +29,7 @@ impl Xcp { x_dim, y_dim, event, - 0, // byte_offset + 0, // byte_offset 0, 1.0, // factor 0.0, // offset @@ -180,10 +180,7 @@ impl DaqEvent { let b = &self.buffer as *const _ as usize; // base address debug!( "add_stack: {} {:?} ptr={:p} base={:p}", - name, - datatype, - ptr, - &self.buffer as *const _ + name, datatype, ptr, &self.buffer as *const _ ); let o: i64 = p as i64 - b as i64; // variable - base address assert!( @@ -210,7 +207,6 @@ impl DaqEvent { )); } - /// Associate a variable on stack to this DaqEvent and register it #[allow(clippy::too_many_arguments)] pub fn add_heap( @@ -225,14 +221,8 @@ impl DaqEvent { unit: &'static str, comment: &'static str, ) { - debug!( - "add_heap: {} {:?} ptr={:p} ", - name, - datatype, - ptr, - - ); - + debug!("add_heap: {} {:?} ptr={:p} ", name, datatype, ptr,); + Xcp::get() .get_registry() .lock() @@ -251,7 +241,6 @@ impl DaqEvent { unit, )); } - } //----------------------------------------------------------------------------- @@ -267,13 +256,13 @@ impl DaqEvent { #[macro_export] macro_rules! daq_create_event { // Without capture buffer - ( $name:expr, $capacity: literal ) => {{ + ( $name:expr, $capacity: expr ) => {{ // Scope for lazy static XCP_EVENT__, create the XCP event only once lazy_static::lazy_static! { static ref XCP_EVENT__: XcpEvent = Xcp::get().create_event($name, false); } // Create the DAQ event every time the thread is running through this code - DaqEvent::<$capacity>::new_from(&XCP_EVENT__) + DaqEvent::<{ $capacity }>::new_from(&XCP_EVENT__) }}; // With capture buffer capacity ( $name:expr ) => {{