diff --git a/examples/multi_thread_demo/src/main.rs b/examples/multi_thread_demo/src/main.rs index a298cb6..6582d74 100644 --- a/examples/multi_thread_demo/src/main.rs +++ b/examples/multi_thread_demo/src/main.rs @@ -53,7 +53,7 @@ const CAL_PAGE: CalPage1 = CalPage1 { // A task executed in multiple threads sharing a calibration parameter segment fn demo_task(id: u32, cal_seg: CalSeg) { - // Create a thread local event instance + // Create a thread local event instance // The capacity of the event capture buffer is 16 bytes let mut event = daq_create_event_tli!("demo_task", 16); println!("Task {id} started"); @@ -81,7 +81,7 @@ fn demo_task(id: u32, cal_seg: CalSeg) { daq_capture_tli!(sine, event, "sine: f64", "Volt", 1.0, 0.0); // Trigger the measurement event - // Take a event timestamp send the captured data + // Take a event timestamp send the captured data event.trigger(); // Synchronize calibration operations @@ -115,7 +115,7 @@ fn main() -> Result<()> { calseg.register_fields(); // Register all struct fields (with meta data from annotations) in the A2L registry // Start multiple instances of the demo task - // Each instance will create its own measurement variable and event instances + // Each instance will create its own measurement variable and event instances // The calibration segment is shared between the tasks (comparable to an Arc>) let mut t = Vec::new(); for i in 0..=9 { diff --git a/examples/point_cloud_demo/CANape/CANape.ini b/examples/point_cloud_demo/CANape/CANape.ini index 7b0e9b7..8c7b1bd 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={1F7D881D-E381-4389-85AE-0C2DB0F18295} +GUID={6A212C4B-99A4-48D7-850F-D79C87B98F0A} [FILE_INFO] Identification=CANape-Project-File @@ -20,8 +20,8 @@ PrgDate=05.11.2024 Description= CreationTime=19:37 CreationDate=06/23/2024 ; Month/Day/Year -ModificationTime=22:24 -ModificationDate=11/08/2024 ; Month/Day/Year +ModificationTime=17:45 +ModificationDate=11/14/2024 ; Month/Day/Year Protected=0 CurrentWindowsACP=1252 @@ -151,7 +151,7 @@ VALUE_LIMIT_BKCOLOR_RIGHT_INTENSITY=10 TOOLTIP_INITIAL_TIME=300 TOOLTIP_AUTOPOP_TIME=20000 TOOLTIP_RESHOW_TIME=100 -GRAPH_MARKER_RECT_SIZE=8 +GRAPH_MARKER_RECT_SIZE=10 GRAPH_MARKER_RECT_SIZE_dpi96=8 GRAPH_MARKER_RECT_LINE_SIZE=2 GRAPH_MARKER_HORIZONTAL_LINE=1 @@ -337,7 +337,7 @@ CREATION_FROM_MAPFILE_INDIVIDUAL=0 CREATION_FROM_MAPFILE_UPDATE_TREE=1 SN_SEPARATOR_LEFT=. @ SN_SEPARATOR_RIGHT=. -CACHE_SYNC_SHOW_SIMPLE_DIALOG=1 +CACHE_SYNC_SHOW_SIMPLE_DIALOG=0 CHECK_PROJECT_OPTIMIZATION=1 SAVE_NEW_MAPFILE_IF_NOT_FOUND=0 AXIS_TEMP_AUTOSCALE_MIN_INTERVAL_DRAW_UNITS_CNT=1 @@ -404,7 +404,7 @@ TEMPORARY_IMPORT_CONFIG_VARIABLES=0 ; 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 @@ -608,7 +608,7 @@ ColorMarker1CurveMode=F56DF3 ColorMarker2CurveMode=277FFF [COMMENT_FIELDS] -ScreenDPIinSection=96 +ScreenDPIinSection=120 Count=5 MaxHistoryEntries=5 @@ -787,13 +787,13 @@ Count=3 [DEFAULT_PRINT_LAYOUT_FOR_WINDOWS_HeaderElements_0] Active=1 -PositionTop=2 +PositionTop=3 PositionTop_dpi96=2 -PositionLeft=2 +PositionLeft=3 PositionLeft_dpi96=2 -Width=405 +Width=506 Width_dpi96=405 -Height=37 +Height=46 Height_dpi96=37 AutoSize=0 BorderActive=0 @@ -818,13 +818,13 @@ VerticalAlignment=1 [DEFAULT_PRINT_LAYOUT_FOR_WINDOWS_HeaderElements_1] Active=1 -PositionTop=2 +PositionTop=3 PositionTop_dpi96=2 -PositionLeft=445 +PositionLeft=556 PositionLeft_dpi96=445 -Width=76 +Width=95 Width_dpi96=76 -Height=37 +Height=46 Height_dpi96=37 AutoSize=0 BorderActive=0 @@ -854,22 +854,22 @@ ArrowLineColor=0 ArrowLineStyle=1 ArrowHeadStart=0 ArrowHeadEnd=0 -StartPointX=444 +StartPointX=555 StartPointX_dpi96=444 StartPointY=0 StartPointY_dpi96=0 -EndPointX=444 +EndPointX=555 EndPointX_dpi96=444 -EndPointY=37 +EndPointY=46 EndPointY_dpi96=37 Active=1 PositionTop=0 PositionTop_dpi96=0 -PositionLeft=444 +PositionLeft=555 PositionLeft_dpi96=444 Width=0 Width_dpi96=0 -Height=37 +Height=46 Height_dpi96=37 AutoSize=0 BorderActive=0 @@ -1034,25 +1034,25 @@ WindowHeight_dpi96=489 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=96 -WindowLeft=537 -WindowLeft_dpi96=537 -WindowTop=285 -WindowTop_dpi96=285 -WindowWidth=678 -WindowWidth_dpi96=678 -WindowHeight=467 -WindowHeight_dpi96=467 +ScreenDPIinSection=120 +WindowLeft=876 +WindowLeft_dpi96=701 +WindowTop=1153 +WindowTop_dpi96=922 +WindowWidth=846 +WindowWidth_dpi96=677 +WindowHeight=580 +WindowHeight_dpi96=464 [DlgMdfComment] -ScreenDPIinSection=96 -WindowLeft=545 -WindowLeft_dpi96=545 -WindowTop=316 -WindowTop_dpi96=316 -WindowWidth=662 +ScreenDPIinSection=120 +WindowLeft=885 +WindowLeft_dpi96=708 +WindowTop=1191 +WindowTop_dpi96=953 +WindowWidth=828 WindowWidth_dpi96=662 -WindowHeight=393 +WindowHeight=491 WindowHeight_dpi96=393 [DlgSaveConfigs] @@ -1174,7 +1174,7 @@ TOOLTIP_VALUE_COUNT=4 TOOLTIP_VALUE_COMPARE=1 [FONT] -HEIGHT=-12 +HEIGHT=-15 [FUNCTION_DLL_ADDON] COUNT=0 @@ -1192,7 +1192,7 @@ COUNT=0 [MEASUREMENT_0] FileId=Measurement1 -MeasurementId=9353a573-c206-46b9-8455-7c2f1f90fc93 +MeasurementId=d4710ce2-d15a-4ab3-a14d-e6c22bf9b2bf MeasurementMapped=0 [MEASUREMENTS] @@ -1389,7 +1389,7 @@ COPY_ASCII_PADDBYTESWITHZERO=0 SHOW_PREPROCESSDIALOG=1 [PRINTING] -ScreenDPI=96 +ScreenDPI=120 [PROJECT_SETTINGS_FILES] COUNT=0 @@ -1398,7 +1398,7 @@ COUNT=0 COUNT=0 [QUALITY-DATA-OPTIONS] -ScreenDPIinSection=96 +ScreenDPIinSection=120 COMPLETED_AS_READ_ONLY=0 COPY_COMPLETED_AS_READ_ONLY=0 COPY_QUALITY_DATA=0 @@ -1439,9 +1439,9 @@ CREATE_COMMON_Y_AXIS=1 [SIGNSELWND] Version=100 -ScreenDPIinSection=96 +ScreenDPIinSection=120 ALL_LIST_TreeColumnCount=1 -ALL_LIST_TreeColumn_0=0, 230 +ALL_LIST_TreeColumn_0=0, 287 ALL_LIST_TreeColumn_0_dpi96=0, 230 DEVICE_LIST_TreeColumnCount=1 PSET_LIST_TreeColumnCount=0 @@ -1455,13 +1455,13 @@ WIN_TEMPL_LIST_TreeColumnCount=0 RECYCLE_BIN_LIST_TreeColumnCount=0 VIO_LIST_TreeColumnCount=0 ALL_LIST_ListColumnCount=4 -ALL_LIST_ListColumn_0=29, 44 +ALL_LIST_ListColumn_0=29, 55 ALL_LIST_ListColumn_0_dpi96=29, 44 -ALL_LIST_ListColumn_1=196608, 60 +ALL_LIST_ListColumn_1=196608, 75 ALL_LIST_ListColumn_1_dpi96=196608, 60 -ALL_LIST_ListColumn_2=31, 230 +ALL_LIST_ListColumn_2=31, 287 ALL_LIST_ListColumn_2_dpi96=31, 230 -ALL_LIST_ListColumn_3=3, 250 +ALL_LIST_ListColumn_3=3, 312 ALL_LIST_ListColumn_3_dpi96=3, 250 DEVICE_LIST_ListColumnCount=4 PSET_LIST_ListColumnCount=0 @@ -1475,35 +1475,35 @@ WIN_TEMPL_LIST_ListColumnCount=0 RECYCLE_BIN_LIST_ListColumnCount=0 VIO_LIST_ListColumnCount=0 KnownDynamicColumnCount=0 -MEA_LIST_TreeColumn_0=0, 230 +MEA_LIST_TreeColumn_0=0, 287 MEA_LIST_TreeColumn_0_dpi96=0, 230 -MEA_LIST_ListColumn_0=29, 44 +MEA_LIST_ListColumn_0=29, 55 MEA_LIST_ListColumn_0_dpi96=29, 44 -MEA_LIST_ListColumn_1=196608, 60 +MEA_LIST_ListColumn_1=196608, 75 MEA_LIST_ListColumn_1_dpi96=196608, 60 -MEA_LIST_ListColumn_2=31, 230 +MEA_LIST_ListColumn_2=31, 287 MEA_LIST_ListColumn_2_dpi96=31, 230 -MEA_LIST_ListColumn_3=3, 250 +MEA_LIST_ListColumn_3=3, 312 MEA_LIST_ListColumn_3_dpi96=3, 250 -DEVICE_LIST_TreeColumn_0=0, 230 +DEVICE_LIST_TreeColumn_0=0, 287 DEVICE_LIST_TreeColumn_0_dpi96=0, 230 -DEVICE_LIST_ListColumn_0=29, 44 +DEVICE_LIST_ListColumn_0=29, 55 DEVICE_LIST_ListColumn_0_dpi96=29, 44 -DEVICE_LIST_ListColumn_1=196608, 60 +DEVICE_LIST_ListColumn_1=196608, 75 DEVICE_LIST_ListColumn_1_dpi96=196608, 60 -DEVICE_LIST_ListColumn_2=31, 230 +DEVICE_LIST_ListColumn_2=31, 287 DEVICE_LIST_ListColumn_2_dpi96=31, 230 -DEVICE_LIST_ListColumn_3=3, 250 +DEVICE_LIST_ListColumn_3=3, 312 DEVICE_LIST_ListColumn_3_dpi96=3, 250 -MDF_LIST_TreeColumn_0=0, 230 +MDF_LIST_TreeColumn_0=0, 287 MDF_LIST_TreeColumn_0_dpi96=0, 230 -MDF_LIST_ListColumn_0=29, 44 +MDF_LIST_ListColumn_0=29, 55 MDF_LIST_ListColumn_0_dpi96=29, 44 -MDF_LIST_ListColumn_1=196608, 60 +MDF_LIST_ListColumn_1=196608, 75 MDF_LIST_ListColumn_1_dpi96=196608, 60 -MDF_LIST_ListColumn_2=31, 230 +MDF_LIST_ListColumn_2=31, 287 MDF_LIST_ListColumn_2_dpi96=31, 230 -MDF_LIST_ListColumn_3=3, 250 +MDF_LIST_ListColumn_3=3, 312 MDF_LIST_ListColumn_3_dpi96=3, 250 [SYSTEM_INFORMATION_DEVICE] @@ -1614,19 +1614,19 @@ MESSAGE_WARNING=0 MESSAGE_INFO=0 [DlgSaveConfigsMoreLess] -ScreenDPIinSection=96 -ColWidthName=350 -ColWidthDisplay=231 +ScreenDPIinSection=120 +ColWidthName=437 +ColWidthDisplay=288 ShowMore=0 -MoreHeight=294 +MoreHeight=368 MoreHeight_dpi96=294 -WindowLeft=564 -WindowLeft_dpi96=564 -WindowTop=351 -WindowTop_dpi96=351 -WindowWidth=624 +WindowLeft=909 +WindowLeft_dpi96=727 +WindowTop=1238 +WindowTop_dpi96=990 +WindowWidth=780 WindowWidth_dpi96=624 -WindowHeight=130 +WindowHeight=163 WindowHeight_dpi96=130 [ModuleExplorer_tokio_demo] @@ -1662,329 +1662,329 @@ LAST_FOCUSED_LISTINDEX=0 LAST_TOP_LISTINDEX=0 [DB_EXPLORER] -ScreenDPIinSection=96 -SELECT_X=100 +ScreenDPIinSection=120 +SELECT_X=125 SELECT_X_dpi96=100 -SELECT_Y=50 +SELECT_Y=63 SELECT_Y_dpi96=50 -SELECT_W=991 +SELECT_W=1239 SELECT_W_dpi96=991 -SELECT_H=636 +SELECT_H=795 SELECT_H_dpi96=636 EDITOR_COL_COUNT=7 -EDITOR_COL_1=29, 44 +EDITOR_COL_1=29, 55 EDITOR_COL_1_dpi96=29, 44 -EDITOR_COL_2=31, 230 +EDITOR_COL_2=31, 287 EDITOR_COL_2_dpi96=31, 230 -EDITOR_COL_3=1, 90 +EDITOR_COL_3=1, 112 EDITOR_COL_3_dpi96=1, 90 -EDITOR_COL_4=2, 85 +EDITOR_COL_4=2, 106 EDITOR_COL_4_dpi96=2, 85 -EDITOR_COL_5=3, 250 +EDITOR_COL_5=3, 312 EDITOR_COL_5_dpi96=3, 250 -EDITOR_COL_6=6, 120 +EDITOR_COL_6=6, 150 EDITOR_COL_6_dpi96=6, 120 -EDITOR_COL_7=7, 120 +EDITOR_COL_7=7, 150 EDITOR_COL_7_dpi96=7, 120 EDITOR_SORT_COL=31 EDITOR_SORT_UPW=1 SELECT_COL_COUNT=4 -SELECT_COL_1=29, 44 +SELECT_COL_1=29, 55 SELECT_COL_1_dpi96=29, 44 -SELECT_COL_2=31, 230 +SELECT_COL_2=31, 287 SELECT_COL_2_dpi96=31, 230 -SELECT_COL_3=16, 70 +SELECT_COL_3=16, 87 SELECT_COL_3_dpi96=16, 70 -SELECT_COL_4=3, 250 +SELECT_COL_4=3, 312 SELECT_COL_4_dpi96=3, 250 SELECT_SORT_COL=31 SELECT_SORT_UPW=1 SEARCH_COL_COUNT=7 -SEARCH_COL_1=29, 44 +SEARCH_COL_1=29, 55 SEARCH_COL_1_dpi96=29, 44 -SEARCH_COL_2=31, 230 +SEARCH_COL_2=31, 287 SEARCH_COL_2_dpi96=31, 230 -SEARCH_COL_3=91, 150 +SEARCH_COL_3=91, 187 SEARCH_COL_3_dpi96=91, 150 -SEARCH_COL_4=19, 120 +SEARCH_COL_4=19, 150 SEARCH_COL_4_dpi96=19, 120 -SEARCH_COL_5=1, 90 +SEARCH_COL_5=1, 112 SEARCH_COL_5_dpi96=1, 90 -SEARCH_COL_6=2, 85 +SEARCH_COL_6=2, 106 SEARCH_COL_6_dpi96=2, 85 -SEARCH_COL_7=3, 250 +SEARCH_COL_7=3, 312 SEARCH_COL_7_dpi96=3, 250 SEARCH_SORT_COL=31 SEARCH_SORT_UPW=1 CAN_SELECT_COL_COUNT=9 -CAN_SELECT_COL_1=29, 44 +CAN_SELECT_COL_1=29, 55 CAN_SELECT_COL_1_dpi96=29, 44 -CAN_SELECT_COL_2=31, 230 +CAN_SELECT_COL_2=31, 287 CAN_SELECT_COL_2_dpi96=31, 230 -CAN_SELECT_COL_3=28, 70 +CAN_SELECT_COL_3=28, 87 CAN_SELECT_COL_3_dpi96=28, 70 -CAN_SELECT_COL_4=16, 70 +CAN_SELECT_COL_4=16, 87 CAN_SELECT_COL_4_dpi96=16, 70 -CAN_SELECT_COL_5=64, 200 +CAN_SELECT_COL_5=64, 250 CAN_SELECT_COL_5_dpi96=64, 200 -CAN_SELECT_COL_6=4, 120 +CAN_SELECT_COL_6=4, 150 CAN_SELECT_COL_6_dpi96=4, 120 -CAN_SELECT_COL_7=17, 70 +CAN_SELECT_COL_7=17, 87 CAN_SELECT_COL_7_dpi96=17, 70 -CAN_SELECT_COL_8=18, 50 +CAN_SELECT_COL_8=18, 62 CAN_SELECT_COL_8_dpi96=18, 50 -CAN_SELECT_COL_9=3, 250 +CAN_SELECT_COL_9=3, 312 CAN_SELECT_COL_9_dpi96=3, 250 CAN_SELECT_SORT_COL=31 CAN_SELECT_SORT_UPW=1 CAN_SEARCH_COL_COUNT=9 -CAN_SEARCH_COL_1=29, 44 +CAN_SEARCH_COL_1=29, 55 CAN_SEARCH_COL_1_dpi96=29, 44 -CAN_SEARCH_COL_2=31, 230 +CAN_SEARCH_COL_2=31, 287 CAN_SEARCH_COL_2_dpi96=31, 230 -CAN_SEARCH_COL_3=28, 70 +CAN_SEARCH_COL_3=28, 87 CAN_SEARCH_COL_3_dpi96=28, 70 -CAN_SEARCH_COL_4=16, 70 +CAN_SEARCH_COL_4=16, 87 CAN_SEARCH_COL_4_dpi96=16, 70 -CAN_SEARCH_COL_5=64, 200 +CAN_SEARCH_COL_5=64, 250 CAN_SEARCH_COL_5_dpi96=64, 200 -CAN_SEARCH_COL_6=4, 120 +CAN_SEARCH_COL_6=4, 150 CAN_SEARCH_COL_6_dpi96=4, 120 -CAN_SEARCH_COL_7=17, 70 +CAN_SEARCH_COL_7=17, 87 CAN_SEARCH_COL_7_dpi96=17, 70 -CAN_SEARCH_COL_8=18, 50 +CAN_SEARCH_COL_8=18, 62 CAN_SEARCH_COL_8_dpi96=18, 50 -CAN_SEARCH_COL_9=3, 250 +CAN_SEARCH_COL_9=3, 312 CAN_SEARCH_COL_9_dpi96=3, 250 CAN_SEARCH_SORT_COL=31 CAN_SEARCH_SORT_UPW=1 LIN_SELECT_COL_COUNT=9 -LIN_SELECT_COL_1=29, 44 +LIN_SELECT_COL_1=29, 55 LIN_SELECT_COL_1_dpi96=29, 44 -LIN_SELECT_COL_2=31, 230 +LIN_SELECT_COL_2=31, 287 LIN_SELECT_COL_2_dpi96=31, 230 -LIN_SELECT_COL_3=28, 70 +LIN_SELECT_COL_3=28, 87 LIN_SELECT_COL_3_dpi96=28, 70 -LIN_SELECT_COL_4=16, 70 +LIN_SELECT_COL_4=16, 87 LIN_SELECT_COL_4_dpi96=16, 70 -LIN_SELECT_COL_5=64, 200 +LIN_SELECT_COL_5=64, 250 LIN_SELECT_COL_5_dpi96=64, 200 -LIN_SELECT_COL_6=4, 120 +LIN_SELECT_COL_6=4, 150 LIN_SELECT_COL_6_dpi96=4, 120 -LIN_SELECT_COL_7=17, 70 +LIN_SELECT_COL_7=17, 87 LIN_SELECT_COL_7_dpi96=17, 70 -LIN_SELECT_COL_8=18, 50 +LIN_SELECT_COL_8=18, 62 LIN_SELECT_COL_8_dpi96=18, 50 -LIN_SELECT_COL_9=3, 250 +LIN_SELECT_COL_9=3, 312 LIN_SELECT_COL_9_dpi96=3, 250 LIN_SELECT_SORT_COL=31 LIN_SELECT_SORT_UPW=1 LIN_SEARCH_COL_COUNT=9 -LIN_SEARCH_COL_1=29, 44 +LIN_SEARCH_COL_1=29, 55 LIN_SEARCH_COL_1_dpi96=29, 44 -LIN_SEARCH_COL_2=31, 230 +LIN_SEARCH_COL_2=31, 287 LIN_SEARCH_COL_2_dpi96=31, 230 -LIN_SEARCH_COL_3=28, 70 +LIN_SEARCH_COL_3=28, 87 LIN_SEARCH_COL_3_dpi96=28, 70 -LIN_SEARCH_COL_4=16, 70 +LIN_SEARCH_COL_4=16, 87 LIN_SEARCH_COL_4_dpi96=16, 70 -LIN_SEARCH_COL_5=64, 200 +LIN_SEARCH_COL_5=64, 250 LIN_SEARCH_COL_5_dpi96=64, 200 -LIN_SEARCH_COL_6=4, 120 +LIN_SEARCH_COL_6=4, 150 LIN_SEARCH_COL_6_dpi96=4, 120 -LIN_SEARCH_COL_7=17, 70 +LIN_SEARCH_COL_7=17, 87 LIN_SEARCH_COL_7_dpi96=17, 70 -LIN_SEARCH_COL_8=18, 50 +LIN_SEARCH_COL_8=18, 62 LIN_SEARCH_COL_8_dpi96=18, 50 -LIN_SEARCH_COL_9=3, 250 +LIN_SEARCH_COL_9=3, 312 LIN_SEARCH_COL_9_dpi96=3, 250 LIN_SEARCH_SORT_COL=31 LIN_SEARCH_SORT_UPW=1 MDF_SELECT_COL_COUNT=8 -MDF_SELECT_COL_1=29, 44 +MDF_SELECT_COL_1=29, 55 MDF_SELECT_COL_1_dpi96=29, 44 -MDF_SELECT_COL_2=31, 230 +MDF_SELECT_COL_2=31, 287 MDF_SELECT_COL_2_dpi96=31, 230 -MDF_SELECT_COL_3=28, 70 +MDF_SELECT_COL_3=28, 87 MDF_SELECT_COL_3_dpi96=28, 70 -MDF_SELECT_COL_4=16, 70 +MDF_SELECT_COL_4=16, 87 MDF_SELECT_COL_4_dpi96=16, 70 -MDF_SELECT_COL_5=64, 200 +MDF_SELECT_COL_5=64, 250 MDF_SELECT_COL_5_dpi96=64, 200 -MDF_SELECT_COL_6=4, 120 +MDF_SELECT_COL_6=4, 150 MDF_SELECT_COL_6_dpi96=4, 120 -MDF_SELECT_COL_7=20, 90 +MDF_SELECT_COL_7=20, 112 MDF_SELECT_COL_7_dpi96=20, 90 -MDF_SELECT_COL_8=3, 250 +MDF_SELECT_COL_8=3, 312 MDF_SELECT_COL_8_dpi96=3, 250 MDF_SELECT_SORT_COL=31 MDF_SELECT_SORT_UPW=1 MDF_SEARCH_COL_COUNT=8 -MDF_SEARCH_COL_1=29, 44 +MDF_SEARCH_COL_1=29, 55 MDF_SEARCH_COL_1_dpi96=29, 44 -MDF_SEARCH_COL_2=31, 230 +MDF_SEARCH_COL_2=31, 287 MDF_SEARCH_COL_2_dpi96=31, 230 -MDF_SEARCH_COL_3=28, 70 +MDF_SEARCH_COL_3=28, 87 MDF_SEARCH_COL_3_dpi96=28, 70 -MDF_SEARCH_COL_4=16, 70 +MDF_SEARCH_COL_4=16, 87 MDF_SEARCH_COL_4_dpi96=16, 70 -MDF_SEARCH_COL_5=64, 200 +MDF_SEARCH_COL_5=64, 250 MDF_SEARCH_COL_5_dpi96=64, 200 -MDF_SEARCH_COL_6=4, 120 +MDF_SEARCH_COL_6=4, 150 MDF_SEARCH_COL_6_dpi96=4, 120 -MDF_SEARCH_COL_7=20, 90 +MDF_SEARCH_COL_7=20, 112 MDF_SEARCH_COL_7_dpi96=20, 90 -MDF_SEARCH_COL_8=3, 250 +MDF_SEARCH_COL_8=3, 312 MDF_SEARCH_COL_8_dpi96=3, 250 MDF_SEARCH_SORT_COL=31 MDF_SEARCH_SORT_UPW=1 WRITE_COL_COUNT=2 -WRITE_COL_1=21, 38 +WRITE_COL_1=21, 47 WRITE_COL_1_dpi96=21, 38 -WRITE_COL_2=23, 600 +WRITE_COL_2=23, 750 WRITE_COL_2_dpi96=23, 600 WRITE_SORT_COL=31 WRITE_SORT_UPW=1 CONVERSION_COL_COUNT=7 -CONVERSION_COL_1=29, 44 +CONVERSION_COL_1=29, 55 CONVERSION_COL_1_dpi96=29, 44 -CONVERSION_COL_2=31, 230 +CONVERSION_COL_2=31, 287 CONVERSION_COL_2_dpi96=31, 230 -CONVERSION_COL_3=3, 250 +CONVERSION_COL_3=3, 312 CONVERSION_COL_3_dpi96=3, 250 -CONVERSION_COL_4=26, 120 +CONVERSION_COL_4=26, 150 CONVERSION_COL_4_dpi96=26, 120 -CONVERSION_COL_5=16, 70 +CONVERSION_COL_5=16, 87 CONVERSION_COL_5_dpi96=16, 70 -CONVERSION_COL_6=15, 90 +CONVERSION_COL_6=15, 112 CONVERSION_COL_6_dpi96=15, 90 -CONVERSION_COL_7=68, 90 +CONVERSION_COL_7=68, 112 CONVERSION_COL_7_dpi96=68, 90 CONVERSION_SORT_COL=31 CONVERSION_SORT_UPW=1 RECORD_LAYOUT_COL_COUNT=2 -RECORD_LAYOUT_COL_1=29, 44 +RECORD_LAYOUT_COL_1=29, 55 RECORD_LAYOUT_COL_1_dpi96=29, 44 -RECORD_LAYOUT_COL_2=31, 230 +RECORD_LAYOUT_COL_2=31, 287 RECORD_LAYOUT_COL_2_dpi96=31, 230 RECORD_LAYOUT_SORT_COL=31 RECORD_LAYOUT_SORT_UPW=1 VARIANT_CRITERION_COL_COUNT=4 -VARIANT_CRITERION_COL_1=29, 44 +VARIANT_CRITERION_COL_1=29, 55 VARIANT_CRITERION_COL_1_dpi96=29, 44 -VARIANT_CRITERION_COL_2=31, 230 +VARIANT_CRITERION_COL_2=31, 287 VARIANT_CRITERION_COL_2_dpi96=31, 230 -VARIANT_CRITERION_COL_3=25, 200 +VARIANT_CRITERION_COL_3=25, 250 VARIANT_CRITERION_COL_3_dpi96=25, 200 -VARIANT_CRITERION_COL_4=30, 200 +VARIANT_CRITERION_COL_4=30, 250 VARIANT_CRITERION_COL_4_dpi96=30, 200 VARIANT_CRITERION_SORT_COL=31 VARIANT_CRITERION_SORT_UPW=1 SYSTEM_CONSTANT_COL_COUNT=3 -SYSTEM_CONSTANT_COL_1=29, 44 +SYSTEM_CONSTANT_COL_1=29, 55 SYSTEM_CONSTANT_COL_1_dpi96=29, 44 -SYSTEM_CONSTANT_COL_2=31, 230 +SYSTEM_CONSTANT_COL_2=31, 287 SYSTEM_CONSTANT_COL_2_dpi96=31, 230 -SYSTEM_CONSTANT_COL_3=24, 120 +SYSTEM_CONSTANT_COL_3=24, 150 SYSTEM_CONSTANT_COL_3_dpi96=24, 120 SYSTEM_CONSTANT_SORT_COL=31 SYSTEM_CONSTANT_SORT_UPW=1 DEFAULT_COL_COUNT=3 -DEFAULT_COL_1=29, 44 +DEFAULT_COL_1=29, 55 DEFAULT_COL_1_dpi96=29, 44 -DEFAULT_COL_2=31, 230 +DEFAULT_COL_2=31, 287 DEFAULT_COL_2_dpi96=31, 230 -DEFAULT_COL_3=3, 250 +DEFAULT_COL_3=3, 312 DEFAULT_COL_3_dpi96=3, 250 DEFAULT_SORT_COL=31 DEFAULT_SORT_UPW=1 CAN_SIGNAL_COL_COUNT=9 -CAN_SIGNAL_COL_1=29, 44 +CAN_SIGNAL_COL_1=29, 55 CAN_SIGNAL_COL_1_dpi96=29, 44 -CAN_SIGNAL_COL_2=31, 230 +CAN_SIGNAL_COL_2=31, 287 CAN_SIGNAL_COL_2_dpi96=31, 230 -CAN_SIGNAL_COL_3=28, 70 +CAN_SIGNAL_COL_3=28, 87 CAN_SIGNAL_COL_3_dpi96=28, 70 -CAN_SIGNAL_COL_4=16, 70 +CAN_SIGNAL_COL_4=16, 87 CAN_SIGNAL_COL_4_dpi96=16, 70 -CAN_SIGNAL_COL_5=64, 200 +CAN_SIGNAL_COL_5=64, 250 CAN_SIGNAL_COL_5_dpi96=64, 200 -CAN_SIGNAL_COL_6=4, 120 +CAN_SIGNAL_COL_6=4, 150 CAN_SIGNAL_COL_6_dpi96=4, 120 -CAN_SIGNAL_COL_7=17, 70 +CAN_SIGNAL_COL_7=17, 87 CAN_SIGNAL_COL_7_dpi96=17, 70 -CAN_SIGNAL_COL_8=18, 50 +CAN_SIGNAL_COL_8=18, 62 CAN_SIGNAL_COL_8_dpi96=18, 50 -CAN_SIGNAL_COL_9=3, 250 +CAN_SIGNAL_COL_9=3, 312 CAN_SIGNAL_COL_9_dpi96=3, 250 CAN_SIGNAL_SORT_COL=31 CAN_SIGNAL_SORT_UPW=1 CA_MESSAGE_COL_COUNT=7 -CA_MESSAGE_COL_1=29, 44 +CA_MESSAGE_COL_1=29, 55 CA_MESSAGE_COL_1_dpi96=29, 44 -CA_MESSAGE_COL_2=31, 230 +CA_MESSAGE_COL_2=31, 287 CA_MESSAGE_COL_2_dpi96=31, 230 -CA_MESSAGE_COL_3=3, 250 +CA_MESSAGE_COL_3=3, 312 CA_MESSAGE_COL_3_dpi96=3, 250 -CA_MESSAGE_COL_4=64, 200 +CA_MESSAGE_COL_4=64, 250 CA_MESSAGE_COL_4_dpi96=64, 200 -CA_MESSAGE_COL_5=4, 120 +CA_MESSAGE_COL_5=4, 150 CA_MESSAGE_COL_5_dpi96=4, 120 -CA_MESSAGE_COL_6=17, 70 +CA_MESSAGE_COL_6=17, 87 CA_MESSAGE_COL_6_dpi96=17, 70 -CA_MESSAGE_COL_7=18, 50 +CA_MESSAGE_COL_7=18, 62 CA_MESSAGE_COL_7_dpi96=18, 50 CA_MESSAGE_SORT_COL=31 CA_MESSAGE_SORT_UPW=1 MEMORY_SEGMENT_COL_COUNT=4 -MEMORY_SEGMENT_COL_1=29, 44 +MEMORY_SEGMENT_COL_1=29, 55 MEMORY_SEGMENT_COL_1_dpi96=29, 44 -MEMORY_SEGMENT_COL_2=31, 230 +MEMORY_SEGMENT_COL_2=31, 287 MEMORY_SEGMENT_COL_2_dpi96=31, 230 -MEMORY_SEGMENT_COL_3=3, 250 +MEMORY_SEGMENT_COL_3=3, 312 MEMORY_SEGMENT_COL_3_dpi96=3, 250 -MEMORY_SEGMENT_COL_4=1, 90 +MEMORY_SEGMENT_COL_4=1, 112 MEMORY_SEGMENT_COL_4_dpi96=1, 90 MEMORY_SEGMENT_SORT_COL=31 MEMORY_SEGMENT_SORT_UPW=1 1 CAL_PARAM_GROUP_COL_COUNT=4 -CAL_PARAM_GROUP_COL_1=29, 44 +CAL_PARAM_GROUP_COL_1=29, 55 CAL_PARAM_GROUP_COL_1_dpi96=29, 44 -CAL_PARAM_GROUP_COL_2=31, 230 +CAL_PARAM_GROUP_COL_2=31, 287 CAL_PARAM_GROUP_COL_2_dpi96=31, 230 -CAL_PARAM_GROUP_COL_3=1376257, 100 +CAL_PARAM_GROUP_COL_3=1376257, 125 CAL_PARAM_GROUP_COL_3_dpi96=1376257, 100 -CAL_PARAM_GROUP_COL_4=1376260, 100 +CAL_PARAM_GROUP_COL_4=1376260, 125 CAL_PARAM_GROUP_COL_4_dpi96=1376260, 100 CAL_PARAM_GROUP_SORT_COL=31 CAL_PARAM_GROUP_SORT_UPW=1 TABLE_COL_COUNT=4 -TABLE_COL_1=29, 44 +TABLE_COL_1=29, 55 TABLE_COL_1_dpi96=29, 44 -TABLE_COL_2=31, 230 +TABLE_COL_2=31, 287 TABLE_COL_2_dpi96=31, 230 -TABLE_COL_3=3, 250 +TABLE_COL_3=3, 312 TABLE_COL_3_dpi96=3, 250 -TABLE_COL_4=26, 120 +TABLE_COL_4=26, 150 TABLE_COL_4_dpi96=26, 120 TABLE_SORT_COL=31 TABLE_SORT_UPW=1 FILTER_COL_COUNT=3 -FILTER_COL_1=29, 44 +FILTER_COL_1=29, 55 FILTER_COL_1_dpi96=29, 44 -FILTER_COL_2=31, 230 +FILTER_COL_2=31, 287 FILTER_COL_2_dpi96=31, 230 -FILTER_COL_3=3, 250 +FILTER_COL_3=3, 312 FILTER_COL_3_dpi96=3, 250 FILTER_SORT_COL=31 FILTER_SORT_UPW=1 SELECT_SHOW_TOOLTIPS=1 SELECT_SHOW_DISPLAY_NAMES=0 SELECT_EXPAND_TREEVIEW_ITEM=2000 -SELECT_TV_W=261 +SELECT_TV_W=326 SELECT_TV_W_dpi96=261 -SELECT_DLG_H=300 +SELECT_DLG_H=375 SELECT_DLG_H_dpi96=300 SELECT_PREVIEW_DLG_VISIBLE=0 SELECT_SORT_COLUMN_ID=31 @@ -2401,7 +2401,7 @@ FORCE_SW_SYNC_IF_NECESSARY=0 CONNECT_MODE=0x00 CONNECT_MODE_FOR_FLASH=0xFFFFFFFF XCP_MAXCTO=248 -XCP_MAXDTO=1464 +XCP_MAXDTO=7964 XCP_COMM_MODE_BASIC=0x80 XCP_MAX_DLC_REQUIRED=0 XCP_MAX_DLC=8 @@ -2539,7 +2539,7 @@ CHECK_OVERFLOW=0 LOAD_GRANULARITY=212 LOAD_CHECKSUM=1 READBACK_DISABLED=0 -IFDATA_QUERY=1 +IFDATA_QUERY=0 DEC_ADDR_EXT=0 POLLING_DISABLED=0 SHORT_UPLOAD_DISABLED=0 @@ -2671,7 +2671,7 @@ MEMORY_SEGMENTS_V8_COMPATIBILITY_MODE=0 FLASH_TOOL=Protocol FLASH_EXTERNAL_CONVERTER= FLASH_GRANULARITY=212 -CHECKSUM_TYPE=10 +CHECKSUM_TYPE=1 CHECKSUM_TYPE_INCA=0x0 CHECKSUM_ENABLED=1 CHECKSUM_DLL_NAME= @@ -2770,7 +2770,7 @@ 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_SIZE_2=0x00000038 MEMORY_SEGMENT_ADDR_2=0x80010000 MEMORY_SEGMENT_ADDR_EXT_2=0x00 MEMORY_SEGMENT_ATTRIBUTE_2=0x00000000 @@ -2778,7 +2778,7 @@ 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_SIZE_2=0x00000038 CALRAM_SECTOR_ADDR_2=0x80010000 CALRAM_SECTOR_ADDR_EXT_2=0x00 CALRAM_SECTOR_ATTRIBUTE_2=0x00000000 @@ -3161,6 +3161,64 @@ TL_PARAM_VALUE_5=A TL_PARAM_NAME_6=RETRY_SYNC TL_PARAM_VALUE_6=-1 +[DEVICE_EXPLORER_COLUMNLIST_CHANNELS] +ScreenDPIinSection=96 +ColumnCount=4 +Column_0=0, 153 +Column_0_dpi96=0, 153 +Column_1=1245185, 66 +Column_1_dpi96=1245185, 66 +Column_2=1245186, 33 +Column_2_dpi96=1245186, 33 +Column_3=1245187, 53 +Column_3_dpi96=1245187, 53 +ColumnIdSort=-1 +SortUpward=1 + +[DEVICE_EXPLORER_COLUMNLIST_DEVICES] +ScreenDPIinSection=96 +ColumnCount=10 +Column_0=34, 48 +Column_0_dpi96=34, 48 +Column_1=0, 230 +Column_1_dpi96=0, 230 +Column_2=131078, 80 +Column_2_dpi96=131078, 80 +Column_3=131103, 50 +Column_3_dpi96=131103, 50 +Column_4=131079, 50 +Column_4_dpi96=131079, 50 +Column_5=262145, 120 +Column_5_dpi96=262145, 120 +Column_6=131085, 100 +Column_6_dpi96=131085, 100 +Column_7=131080, 120 +Column_7_dpi96=131080, 120 +Column_8=131081, 80 +Column_8_dpi96=131081, 80 +Column_9=196609, 50 +Column_9_dpi96=196609, 50 +ColumnIdSort=-1 +SortUpward=1 + +[DEVICE_EXPLORER_COLUMNLIST_NETWORKS] +ScreenDPIinSection=96 +ColumnCount=6 +Column_0=34, 32 +Column_0_dpi96=34, 32 +Column_1=0, 152 +Column_1_dpi96=0, 152 +Column_2=983041, 96 +Column_2_dpi96=983041, 96 +Column_3=983042, 265 +Column_3_dpi96=983042, 265 +Column_4=983043, 126 +Column_4_dpi96=983043, 126 +Column_5=983044, 150 +Column_5_dpi96=983044, 150 +ColumnIdSort=-1 +SortUpward=1 + [COLOR_SCHEME_LIST] COLOR_SCHEME0=COLOR_SCHEMEUSER_DEFINED SCHEMES_COUNT=1 @@ -3296,67 +3354,9 @@ MODE=12 VALUE_COUNT=0 HISTORY_COUNT=0 -[DEVICE_EXPLORER_COLUMNLIST_CHANNELS] -ScreenDPIinSection=96 -ColumnCount=4 -Column_0=0, 153 -Column_0_dpi96=0, 153 -Column_1=1245185, 66 -Column_1_dpi96=1245185, 66 -Column_2=1245186, 33 -Column_2_dpi96=1245186, 33 -Column_3=1245187, 53 -Column_3_dpi96=1245187, 53 -ColumnIdSort=-1 -SortUpward=1 - -[DEVICE_EXPLORER_COLUMNLIST_DEVICES] -ScreenDPIinSection=96 -ColumnCount=10 -Column_0=34, 48 -Column_0_dpi96=34, 48 -Column_1=0, 230 -Column_1_dpi96=0, 230 -Column_2=131078, 80 -Column_2_dpi96=131078, 80 -Column_3=131103, 50 -Column_3_dpi96=131103, 50 -Column_4=131079, 50 -Column_4_dpi96=131079, 50 -Column_5=262145, 120 -Column_5_dpi96=262145, 120 -Column_6=131085, 100 -Column_6_dpi96=131085, 100 -Column_7=131080, 120 -Column_7_dpi96=131080, 120 -Column_8=131081, 80 -Column_8_dpi96=131081, 80 -Column_9=196609, 50 -Column_9_dpi96=196609, 50 -ColumnIdSort=-1 -SortUpward=1 - -[DEVICE_EXPLORER_COLUMNLIST_NETWORKS] -ScreenDPIinSection=96 -ColumnCount=6 -Column_0=34, 32 -Column_0_dpi96=34, 32 -Column_1=0, 152 -Column_1_dpi96=0, 152 -Column_2=983041, 96 -Column_2_dpi96=983041, 96 -Column_3=983042, 265 -Column_3_dpi96=983042, 265 -Column_4=983043, 126 -Column_4_dpi96=983043, 126 -Column_5=983044, 150 -Column_5_dpi96=983044, 150 -ColumnIdSort=-1 -SortUpward=1 - [SIGNSELWND_DYNAMIC_COLUMNS] Count=0 [~~~~~_CONSISTENCY_CHECK_END_SECTION_~~~~~] -GUID={1F7D881D-E381-4389-85AE-0C2DB0F18295} +GUID={6A212C4B-99A4-48D7-850F-D79C87B98F0A} diff --git a/examples/point_cloud_demo/CANape/CanapeCmd.ini b/examples/point_cloud_demo/CANape/CanapeCmd.ini index b5dd972..5bd5264 100644 --- a/examples/point_cloud_demo/CANape/CanapeCmd.ini +++ b/examples/point_cloud_demo/CANape/CanapeCmd.ini @@ -2,9 +2,9 @@ COMMAND_COUNT=0 COMMAND_HISTORY=0 COMMAND_DESCRIPTION=0 -MENU_ICON_WIDTH=16 +MENU_ICON_WIDTH=20 MENU_ICON_WIDTH_dpi96=16 -MENU_ICON_HEIGHT=16 +MENU_ICON_HEIGHT=20 MENU_ICON_HEIGHT_dpi96=16 COUNT=1271 diff --git a/examples/point_cloud_demo/CANape/point_cloud.cna b/examples/point_cloud_demo/CANape/point_cloud.cna index 1cad42b..05dd7bc 100644 --- a/examples/point_cloud_demo/CANape/point_cloud.cna +++ b/examples/point_cloud_demo/CANape/point_cloud.cna @@ -10,8 +10,8 @@ PrgDate=05.11.2024 Description= CreationTime=18:15 CreationDate=08/05/2024 ; Month/Day/Year -ModificationTime=22:24 -ModificationDate=11/08/2024 ; Month/Day/Year +ModificationTime=17:45 +ModificationDate=11/14/2024 ; Month/Day/Year Protected=0 CurrentWindowsACP=1252 @@ -33,7 +33,7 @@ DisplayCount=0 Count=0 [CALIBRATION_LIST] -Count=6 +Count=7 [CALIBRATION_OBJECT_1] EditOffset=1 @@ -113,6 +113,19 @@ Name=Params.phi_y StimMode=0 IsFallback=0 +[CALIBRATION_OBJECT_7] +EditOffset=1 +EditFactor=2 +EditFormat=2 +ShowWorkingPoint=0 +FollowWorkingPoint=0 +OverwriteWorkingPointInputX= +OverwriteWorkingPointInputY= +Module=xcp_lite +Name=Params.point_count +StimMode=0 +IsFallback=0 + [CANAPE_ENVIRONMENT] OBJECT_COUNT=0 @@ -135,7 +148,7 @@ OptionCSVListSeparator=0 OptionCSVExport=0 OptionMARMFExport=0 OptionMARMFExtended=0 -OptionSuppressCASLRuntimeErrors=1 +OptionSuppressCASLRuntimeErrors=0 FromTime=-1 FromActive=0 FromTimePartActive=0 @@ -226,7 +239,7 @@ Name=mainloop_counter1 Disabled=1 Mode=2147483648 Rate=0 -ModeIsDefault=1 +ModeIsDefault=0 Row=0 Column=0 MeaReferenced=1 @@ -266,8 +279,8 @@ ColorFunctionScope=1 LineTyp=2 YMinHome=-20 YMaxHome=20 -YMin=-10 -YMax=10 +YMin=-20 +YMax=20 XOffsetNS=0 XOffset=0 ValueFormat=3 @@ -368,8 +381,8 @@ ColorFunctionScope=1 LineTyp=2 YMinHome=-20 YMaxHome=20 -YMin=-10 -YMax=10 +YMin=-20 +YMax=20 XOffsetNS=0 XOffset=0 ValueFormat=3 @@ -470,8 +483,8 @@ ColorFunctionScope=1 LineTyp=2 YMinHome=0 YMaxHome=20 -YMin=-4 -YMax=16 +YMin=0 +YMax=20 XOffsetNS=0 XOffset=0 ValueFormat=3 @@ -635,10 +648,10 @@ IGNORE_FIX_EVENTS=0 WindowTextExtended=1 WindowTextExtendedNew=1 WindowSymbols=1 -GlobalCursor=1 -GlobalCursorTime=3 -GlobalCursorTimeNs=3793666 -MainWindowPos=1, 2, 2, 1748, 1032 ;cmd, x, y, w, h +GlobalCursor=0 +GlobalCursorTime=0 +GlobalCursorTimeNs=0 +MainWindowPos=1, 207, 798, 2185, 1290 ;cmd, x, y, w, h [PAR_COMMENT] 1="Name","" @@ -661,7 +674,7 @@ ScriptName= ScriptName= [PRINTING] -ScreenDPI=96 +ScreenDPI=120 [PROFILE_MDF_OBJECT_1] Unit= @@ -791,8 +804,9 @@ ActiveTab=0 FilterNodeID=Alle TreeExpand_0=@Alle TreeExpand_1=Alle\Messungen -TreeExpand_2=$Alle\Geräte -TreeExpand_3=# +TreeExpand_2=Alle\Geräte +TreeExpand_3=$Alle\Geräte +TreeExpand_4=#Alle\Geräte\Environment TextSearchCaseSensitive=0 TextSearchUseMode=1 TextSearchSearchFullText=1 @@ -810,21 +824,21 @@ ClearStart=1 AbsoluteTimeEnabled=0 ShowGridLines=0 ColumnCount=3 -Column_0=21, 40 +Column_0=21, 50 Column_0_dpi96=21, 40 -Column_1=22, 90 +Column_1=22, 112 Column_1_dpi96=22, 90 -Column_2=23, 770 +Column_2=23, 962 Column_2_dpi96=23, 770 Title=Write Type=128 Comment=Write-Fenster Number=1 GUID=WINDOW_a3d6c8a5-781b-4380-b8d1-96455c2183d1 -ScreenDPIinSection=96 -Position=0, 13, 9, 1062, 206 ;cmd, x, y, w, h +ScreenDPIinSection=120 +Position=0, 16, 11, 1327, 257 ;cmd, x, y, w, h Position_dpi96=0, 13, 9, 1062, 206 ;cmd, x, y, w, h -Position_Page01=0, 13, 9, 1062, 206 ;cmd, x, y, w, h +Position_Page01=0, 16, 11, 1327, 257 ;cmd, x, y, w, h Position_Page01_dpi96=0, 13, 9, 1062, 206 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 @@ -842,9 +856,11 @@ Expanded_Root_0_5=point_cloud.Points[3] Expanded_Root_0_6=point_cloud.Points[4] Expanded_Root_0_7=point_cloud.points Expanded_Root_0_8=point_cloud.points[0] -Expanded_Root_0_9=point_cloud.points[1] -Expanded_Root_0_10=point_cloud.points[2] -Expanded_Root_0_Count=11 +Expanded_Root_0_9=point_cloud.points[18] +Expanded_Root_0_10=point_cloud.points[19] +Expanded_Root_0_11=point_cloud.points[1] +Expanded_Root_0_12=point_cloud.points[2] +Expanded_Root_0_Count=13 Expanded_Root_Count=1 Omit_Root_0_GUID=DISPLAY_502a5939-387b-4df6-b412-0d1da31819f2 Omit_Root_0_Count=0 @@ -872,20 +888,20 @@ Table_Hidden_Columns_Count=0 Table_Hide_Root_0_GUID=DISPLAY_502a5939-387b-4df6-b412-0d1da31819f2 Table_Hide_Root_0_Count=0 Table_Hide_Root_Count=1 -ScreenDPIinSection=96 +ScreenDPIinSection=120 ColumnCount=2 -Column_0=0, 175 -Column_0_dpi96=0, 175 -Column_1=65560, 120 +Column_0=0, 217 +Column_0_dpi96=0, 174 +Column_1=65560, 150 Column_1_dpi96=65560, 120 RecommendedWidths_Count=4 -RecWidth_0=0, 175 -RecWidth_0_dpi96=0, 175 -RecWidth_1=3, 250 +RecWidth_0=0, 217 +RecWidth_0_dpi96=0, 174 +RecWidth_1=3, 312 RecWidth_1_dpi96=3, 250 -RecWidth_2=16, 70 +RecWidth_2=16, 87 RecWidth_2_dpi96=16, 70 -RecWidth_3=65560, 120 +RecWidth_3=65560, 150 RecWidth_3_dpi96=65560, 120 ScrollHorz=0 ScrollVert=0 @@ -905,9 +921,9 @@ Type=262144 Comment=Datenfenster Number=2 GUID=WINDOW_addb03ce-24d4-498b-8d08-07fbf4e6afb1 -Position=0, 1084, 9, 318, 406 ;cmd, x, y, w, h +Position=0, 1355, 11, 397, 507 ;cmd, x, y, w, h Position_dpi96=0, 1084, 9, 318, 406 ;cmd, x, y, w, h -Position_Page01=0, 1084, 9, 318, 406 ;cmd, x, y, w, h +Position_Page01=0, 1355, 11, 397, 507 ;cmd, x, y, w, h Position_Page01_dpi96=0, 1084, 9, 318, 406 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 @@ -920,11 +936,11 @@ Type=65536 Comment=Multi-View-Fenster Number=3 GUID=WINDOW_48d37c1e-340a-4f05-9c56-4576c03f9d40 -ScreenDPIinSection=96 -Position=0, 13, 223, 544, 257 ;cmd, x, y, w, h -Position_dpi96=0, 13, 223, 544, 257 ;cmd, x, y, w, h -Position_Page01=0, 13, 223, 544, 257 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 13, 223, 544, 257 ;cmd, x, y, w, h +ScreenDPIinSection=120 +Position=0, 16, 277, 680, 321 ;cmd, x, y, w, h +Position_dpi96=0, 13, 222, 544, 257 ;cmd, x, y, w, h +Position_Page01=0, 16, 277, 680, 321 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 13, 222, 544, 257 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 DisplayMask=1 ; pages 1 @@ -933,16 +949,16 @@ DisplayMask=1 ; pages 1 XLen=10999 XMin=0 XMinNs=0 -XMax=12603 -XMaxNs=12603605937 +XMax=29376 +XMaxNs=29376263346 Grid=1 Mark=1 YValue=1 ShowLegend=2 ShowLegendHeader=1 -LegendPixWidth=159 +LegendPixWidth=199 LegendPixWidth_dpi96=159 -LegendPixHeight=98 +LegendPixHeight=123 LegendPixHeight_dpi96=98 LegendPos=2 Optimize=1 @@ -952,7 +968,7 @@ XYModeIndexP1=-1 DisplayModeAuto=0 XStart=0 AbsoluteTimeMode=0 -YAxisWidth=56 +YAxisWidth=70 YAxisWidth_dpi96=56 RightYAxisWidth=0 RightYAxisWidth_dpi96=0 @@ -979,7 +995,7 @@ Type=1 Comment=Grafikfenster Number=4 GUID=WINDOW_8e3c9700-05e7-42c9-8abd-491ef1fcbffb -ScreenDPIinSection=96 +ScreenDPIinSection=120 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 @@ -995,11 +1011,11 @@ TimeAxisTemplate= DisplayMask=1 ; pages 1 [WINDOW_4_LEG_COLUMNS] -ScreenDPIinSection=96 +ScreenDPIinSection=120 COUNT=2 -COL_0=31, 52 +COL_0=31, 65 COL_0_dpi96=31, 52 -COL_1=1048578, 105 +COL_1=1048578, 131 COL_1_dpi96=1048578, 105 [WINDOW_5] @@ -1009,11 +1025,11 @@ Type=65536 Comment=Multi-View-Fenster Number=5 GUID=WINDOW_b7709c5c-103e-4355-ba71-9cee0a27a518 -ScreenDPIinSection=96 -Position=0, 13, 492, 544, 387 ;cmd, x, y, w, h -Position_dpi96=0, 13, 492, 544, 387 ;cmd, x, y, w, h -Position_Page01=0, 13, 492, 544, 387 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 13, 492, 544, 387 ;cmd, x, y, w, h +ScreenDPIinSection=120 +Position=0, 16, 615, 680, 482 ;cmd, x, y, w, h +Position_dpi96=0, 13, 492, 544, 386 ;cmd, x, y, w, h +Position_Page01=0, 16, 615, 680, 482 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 13, 492, 544, 386 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 DisplayMask=1 ; pages 1 @@ -1022,16 +1038,16 @@ DisplayMask=1 ; pages 1 XLen=60000 XMin=0 XMinNs=0 -XMax=12603 -XMaxNs=12603605937 +XMax=27977 +XMaxNs=27977393663 Grid=1 Mark=1 YValue=2 ShowLegend=2 ShowLegendHeader=1 -LegendPixWidth=154 +LegendPixWidth=193 LegendPixWidth_dpi96=154 -LegendPixHeight=98 +LegendPixHeight=123 LegendPixHeight_dpi96=98 LegendPos=2 Optimize=1 @@ -1041,7 +1057,7 @@ XYModeIndexP1=1 DisplayModeAuto=0 XStart=0 AbsoluteTimeMode=0 -YAxisWidth=59 +YAxisWidth=74 YAxisWidth_dpi96=59 RightYAxisWidth=0 RightYAxisWidth_dpi96=0 @@ -1068,7 +1084,7 @@ Type=1 Comment=Grafikfenster Number=6 GUID=WINDOW_13f42c97-fa7f-46f2-a2a2-fcc83ec52a8a -ScreenDPIinSection=96 +ScreenDPIinSection=120 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 @@ -1084,17 +1100,17 @@ TimeAxisTemplate= DisplayMask=1 ; pages 1 [WINDOW_6_LEG_COLUMNS] -ScreenDPIinSection=96 +ScreenDPIinSection=120 COUNT=2 -COL_0=31, 74 +COL_0=31, 92 COL_0_dpi96=31, 74 -COL_1=1048578, 75 -COL_1_dpi96=1048578, 75 +COL_1=1048578, 92 +COL_1_dpi96=1048578, 74 [WINDOW_7] ProgID= PROPERTIES_COUNT=1 -PROPERTY_1=7d875669-2751-4051-9b26-103be1b7d5a51.0.0.0TrueTrueFalse6015010101020500FalseTrueTrueFalse2556363632550002557573731.278789-18.8723313.09094false21.2868-0.38999980.24359875050505050truefalseLeftRightRightFalseFalseFalseTrueFalseTrueFalseFalseTrueTrue10010FalseTrue +PROPERTY_1=7d875669-2751-4051-9b26-103be1b7d5a51.0.0.0TrueTrueFalse6015010101020500FalseTrueTrueFalse2556363632550002557573736.054319-30.8426111.27848false18.73238-0.36654840.24359875050505050truefalseLeftRightRightFalseFalseFalseTrueFalseTrueFalseFalseTrueTrue10010FalseTrue OBJECTS_COUNT=0 ObjectCount=0 HiddenDisplayCount=0 @@ -1103,11 +1119,11 @@ Type=17179869184 Comment=Szenen-Fenster 1 Number=7 GUID=WINDOW_b8bb0114-43f9-42b4-9442-fa4e8752f3b9 -ScreenDPIinSection=96 -Position=0, 566, 419, 836, 460 ;cmd, x, y, w, h -Position_dpi96=0, 566, 419, 836, 460 ;cmd, x, y, w, h -Position_Page01=0, 566, 419, 836, 460 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 566, 419, 836, 460 ;cmd, x, y, w, h +ScreenDPIinSection=120 +Position=0, 707, 522, 1045, 575 ;cmd, x, y, w, h +Position_dpi96=0, 566, 418, 836, 460 ;cmd, x, y, w, h +Position_Page01=0, 707, 522, 1045, 575 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 566, 418, 836, 460 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 DisplayMask=1 ; pages 1 @@ -1115,26 +1131,27 @@ DisplayMask=1 ; pages 1 [WINDOW_8] ProgID= PROPERTIES_COUNT=1 -PROPERTY_1={"Version":"1.3.0.0","Configuration":{"ArrayWindowSubControlConfiguration":{"NumericGraphicCompositeWidth":292,"NumericGraphicCompositeHeight":161,"LegendCoordinatePoint":{"X":0,"Y":0},"LegendWidth":0,"LegendHeight":0,"LegendLayoutGroupSizeWidth":0,"LegendLayoutGroupSizeHeight":0,"NumericCoordinatePoint":{"X":1,"Y":24},"NumericWidth":290,"NumericHeight":136,"NumericLayoutGroupSizeWidth":290,"NumericLayoutGroupSizeHeight":136,"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.ampl_x\":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,"ValueAxisMinHome":0.001,"ValueAxisMaxHome":100,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0.001,"ValueAxisMaxHome":100,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0.001,"ValueAxisMaxHome":10,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0.001,"ValueAxisMaxHome":10,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0,"ValueAxisMaxHome":1,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0,"ValueAxisMaxHome":2,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"IsYAxisAreaWidthSynchronizedBetweenCharts":true,"SyncedXAxisHeight":NaN,"XWChartXAxisHeight":NaN,"YWChartXAxisHeight":NaN,"SyncedLeftAxisAreaWidth":NaN,"XWChartLeftAxisAreaWidth":NaN,"YWChartLeftAxisAreaWidth":NaN,"SyncedRightAxisAreaWidth":NaN,"XWChartRightAxisAreaWidth":NaN,"YWChartRightAxisAreaWidth":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,"DrawAxisBands":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 +PROPERTY_1={"Version":"1.3.0.0","Configuration":{"ArrayWindowSubControlConfiguration":{"NumericGraphicCompositeWidth":292.8,"NumericGraphicCompositeHeight":161.60000000000002,"LegendCoordinatePoint":{"X":0,"Y":0},"LegendWidth":0,"LegendHeight":0,"LegendLayoutGroupSizeWidth":0,"LegendLayoutGroupSizeHeight":0,"NumericCoordinatePoint":{"X":0.8,"Y":23.2},"NumericWidth":291.2,"NumericHeight":137.6,"NumericLayoutGroupSizeWidth":291.2,"NumericLayoutGroupSizeHeight":137.6,"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.point_count\":P","ValueObjectConfigurations":[{"Symbol":"DEVICE:\"xcp_lite\":\"Params.point_count\":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":1,"ValueAxisMax":16,"ValueAxisMinHome":1,"ValueAxisMaxHome":20,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"CustomAxisLabels":["","","","","",""]},{"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,"ValueAxisMinHome":0.001,"ValueAxisMaxHome":100,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0.001,"ValueAxisMaxHome":100,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0.001,"ValueAxisMaxHome":10,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0.001,"ValueAxisMaxHome":10,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0,"ValueAxisMaxHome":1,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"ValueAxisMinHome":0,"ValueAxisMaxHome":2,"ValueAxisPosition":0,"CommonValueAxisName":null,"CommonValueAxisLabel":null,"CommonValueAxisMin":0,"CommonValueAxisMax":0,"CommonValueAxisMinHome":0,"CommonValueAxisMaxHome":0,"SerializationCommonValueAxisColor":{"R":0,"G":0,"B":0,"A":0},"CommonValueAxisID":0,"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,"IsYAxisAreaWidthSynchronizedBetweenCharts":true,"SyncedXAxisHeight":NaN,"XWChartXAxisHeight":NaN,"YWChartXAxisHeight":NaN,"SyncedLeftAxisAreaWidth":NaN,"XWChartLeftAxisAreaWidth":NaN,"YWChartLeftAxisAreaWidth":NaN,"SyncedRightAxisAreaWidth":NaN,"XWChartRightAxisAreaWidth":NaN,"YWChartRightAxisAreaWidth":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,"DrawAxisBands":false,"CurrentColumnChartType":0,"SerializationCursorCrosshairColor":{"R":0,"G":0,"B":0,"A":255},"AlignBarToZero":true,"DefaultChartViewType":2,"AttributeColumnPositioning":1}} +OBJECTS_COUNT=7 +OBJECT_1=DEVICE:"xcp_lite":"Params.point_count":P +OBJECT_2=DEVICE:"xcp_lite":"Params.ampl_x":P +OBJECT_3=DEVICE:"xcp_lite":"Params.ampl_y":P +OBJECT_4=DEVICE:"xcp_lite":"Params.period_x":P +OBJECT_5=DEVICE:"xcp_lite":"Params.period_y":P +OBJECT_6=DEVICE:"xcp_lite":"Params.phi_x":P +OBJECT_7=DEVICE:"xcp_lite":"Params.phi_y":P +ObjectCount=7 HiddenDisplayCount=0 Title=Allgemeines Verstellen Type=137438953472 Comment=Allgemeines Verstellen Number=8 GUID=WINDOW_2573b853-28b8-4a7c-a0a7-e51c8ce10281 -ScreenDPIinSection=96 -Position=0, 566, 223, 298, 184 ;cmd, x, y, w, h -Position_dpi96=0, 566, 223, 298, 184 ;cmd, x, y, w, h -Position_Page01=0, 566, 223, 298, 184 ;cmd, x, y, w, h -Position_Page01_dpi96=0, 566, 223, 298, 184 ;cmd, x, y, w, h +ScreenDPIinSection=120 +Position=0, 707, 277, 372, 230 ;cmd, x, y, w, h +Position_dpi96=0, 566, 222, 298, 184 ;cmd, x, y, w, h +Position_Page01=0, 707, 277, 372, 230 ;cmd, x, y, w, h +Position_Page01_dpi96=0, 566, 222, 298, 184 ;cmd, x, y, w, h FloatingWindow=0 ShowSignalComments=1 DisplayMask=1 ; pages 1 @@ -1142,7 +1159,7 @@ DisplayMask=1 ; pages 1 [WINDOW_8_OBJECT_1] Type=2 Module=xcp_lite -Name=Params.ampl_x +Name=Params.point_count Window=8 Index=0 Color=0 @@ -1150,6 +1167,55 @@ ApplyColorToBackground=0 ColorFunction=0 ColorFunctionScope=1 LineTyp=2 +YMinHome=1 +YMaxHome=20 +YMin=1 +YMax=16 +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_511ea57b-48d4-4458-8148-34a235d757f7 + +[WINDOW_8_OBJECT_2] +Type=2 +Module=xcp_lite +Name=Params.ampl_x +Window=8 +Index=1 +Color=0 +ApplyColorToBackground=0 +ColorFunction=0 +ColorFunctionScope=1 +LineTyp=2 YMinHome=0.001 YMaxHome=100 YMin=0.001 @@ -1186,14 +1252,14 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_54885b59-40ff-44ce-b9df-487e6b9606c7 +GUID=DISPLAY_213ddb91-6598-4134-9e18-f6fa37a4d9b8 -[WINDOW_8_OBJECT_2] +[WINDOW_8_OBJECT_3] Type=2 Module=xcp_lite Name=Params.ampl_y Window=8 -Index=1 +Index=2 Color=0 ApplyColorToBackground=0 ColorFunction=0 @@ -1235,14 +1301,14 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_17c13857-3c49-451c-843b-106b119dcdd7 +GUID=DISPLAY_2234d5c8-11ce-4ac1-a83a-d2361a221345 -[WINDOW_8_OBJECT_3] +[WINDOW_8_OBJECT_4] Type=2 Module=xcp_lite Name=Params.period_x Window=8 -Index=2 +Index=3 Color=0 ApplyColorToBackground=0 ColorFunction=0 @@ -1284,14 +1350,14 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_a25e581a-26bc-4773-bfed-2a87b0d0d5ba +GUID=DISPLAY_51cf4966-38e0-40da-8acc-f5fd88c60780 -[WINDOW_8_OBJECT_4] +[WINDOW_8_OBJECT_5] Type=2 Module=xcp_lite Name=Params.period_y Window=8 -Index=3 +Index=4 Color=0 ApplyColorToBackground=0 ColorFunction=0 @@ -1333,14 +1399,14 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_8ae79d9b-197f-45b4-b99a-e46c097466ef +GUID=DISPLAY_e3f9d227-84bc-4af3-a10a-511d3e73ac4b -[WINDOW_8_OBJECT_5] +[WINDOW_8_OBJECT_6] Type=2 Module=xcp_lite Name=Params.phi_x Window=8 -Index=4 +Index=5 Color=0 ApplyColorToBackground=0 ColorFunction=0 @@ -1382,14 +1448,14 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_453374eb-1aa1-4e38-ad5f-cf64d29d0daa +GUID=DISPLAY_e090207b-45c5-4061-85b4-ca65ac858e10 -[WINDOW_8_OBJECT_6] +[WINDOW_8_OBJECT_7] Type=2 Module=xcp_lite Name=Params.phi_y Window=8 -Index=5 +Index=6 Color=0 ApplyColorToBackground=0 ColorFunction=0 @@ -1431,14 +1497,14 @@ Row=0 Col=0 YAxis_ID=0 AxisTemplate= -GUID=DISPLAY_42a3c89c-8296-4edd-9760-9c2fc6d87b1b +GUID=DISPLAY_ecf4aea8-7ee5-42be-8390-b17f32d7d783 [WINDOWS] Count=8 [Y_COMMON_AXIS_1] -YMin=-10 -YMax=10 +YMin=-20 +YMax=20 ValueFormat=3 AxisTemplate= LockScaling=0 diff --git a/examples/point_cloud_demo/CANape/point_cloud.gvc b/examples/point_cloud_demo/CANape/point_cloud.gvc index 75281ae..b8787cf 100644 --- a/examples/point_cloud_demo/CANape/point_cloud.gvc +++ b/examples/point_cloud_demo/CANape/point_cloud.gvc @@ -1,5 +1,5 @@  - + a6c8870e-287e-4185-bb13-db8d17e33d55 @@ -582,8 +582,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 @@ -594,11 +594,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 @@ -712,26 +829,6 @@ Z-Position eines Punktes mit kartesischen Koordinaten - - DisplayObjectName - System.Boolean, mscorlib - - DisplayObjectName - EmptyTemplate - false - false - - - Boolean - true - true - true - - - 1 - 0 - - @@ -751,69 +848,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 @@ -900,6 +934,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 + + @@ -908,7 +1005,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. diff --git a/examples/point_cloud_demo/point_cloud.a2l b/examples/point_cloud_demo/point_cloud.a2l index d7e459a..84ed2d5 100644 --- a/examples/point_cloud_demo/point_cloud.a2l +++ b/examples/point_cloud_demo/point_cloud.a2l @@ -69,7 +69,7 @@ /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 + Params "" DATA FLASH INTERN 0x80010000 56 -1 -1 -1 -1 -1 /begin IF_DATA XCP /begin SEGMENT 1 2 0 0 0 /begin CHECKSUM XCP_ADD_44 MAX_BLOCK_SIZE 0xFFFF EXTERNAL_FUNCTION "" /end CHECKSUM @@ -128,8 +128,10 @@ /end IF_DATA -/begin MEASUREMENT mainloop_counter1 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0xF8 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 +/begin MEASUREMENT counter "" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0x170 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 MEASUREMENT h "" FLOAT64_IEEE NO_COMPU_METHOD 0 0 -1E15 1E15 PHYS_UNIT "" ECU_ADDRESS 0x180 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 MEASUREMENT phi "" FLOAT64_IEEE NO_COMPU_METHOD 0 0 -1E15 1E15 PHYS_UNIT "" ECU_ADDRESS 0x188 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 248 ECU_ADDRESS_EXTENSION 2 /begin ANNOTATION ANNOTATION_LABEL "ObjectDescription" ANNOTATION_ORIGIN "application/dds" /begin ANNOTATION_TEXT @@ -150,10 +152,11 @@ /end ANNOTATION /begin ANNOTATION ANNOTATION_LABEL "IsVlsd" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "true" /end ANNOTATION_TEXT /end ANNOTATION -/begin ANNOTATION ANNOTATION_LABEL "MaxBufferNeeded" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "200" /end ANNOTATION_TEXT /end ANNOTATION +/begin ANNOTATION ANNOTATION_LABEL "MaxBufferNeeded" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "248" /end ANNOTATION_TEXT /end ANNOTATION /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC +/begin MEASUREMENT time "" SLONG NO_COMPU_METHOD 0 0 -2147483648 2147483647 PHYS_UNIT "" ECU_ADDRESS 0x16C 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 GROUP point_cloud "" ROOT /begin REF_MEASUREMENT mainloop_counter1 point_cloud /end REF_MEASUREMENT /end GROUP +/begin GROUP point_cloud "" ROOT /begin REF_MEASUREMENT counter h phi point_cloud time /end REF_MEASUREMENT /end GROUP /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 @@ -161,7 +164,8 @@ /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 "" ROOT /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 CHARACTERISTIC Params.point_count "" VALUE 0x80010030 U32 0 NO_COMPU_METHOD 1 20 /end CHARACTERISTIC +/begin GROUP Params "" ROOT /begin REF_CHARACTERISTIC Params.ampl_x Params.ampl_y Params.period_x Params.period_y Params.phi_x Params.phi_y Params.point_count /end REF_CHARACTERISTIC /end GROUP /end MODULE diff --git a/examples/point_cloud_demo/src/main.rs b/examples/point_cloud_demo/src/main.rs index fc3e461..ac1a3ed 100644 --- a/examples/point_cloud_demo/src/main.rs +++ b/examples/point_cloud_demo/src/main.rs @@ -10,17 +10,6 @@ use std::{ time::{Duration, Instant}, }; -//----------------------------------------------------------------------------- -// Defaults - -const BIND_ADDR: [u8; 4] = [127, 0, 0, 1]; -//const BIND_ADDR: [u8; 4] = [192, 168, 0, 83]; -//const BIND_ADDR: [u8; 4] = [172, 19, 11, 24]; ; - -const POINT_COUNT: usize = 16; -const AMPL: f64 = 10.0; -const PERIOD: f64 = 10.0; - //----------------------------------------------------------------------------- // XCP @@ -29,11 +18,16 @@ use xcp_idl_generator::prelude::*; use xcp_type_description::prelude::*; //----------------------------------------------------------------------------- -// Application start time +// Defaults -lazy_static::lazy_static! { - static ref START_TIME: Instant = Instant::now(); -} +const BIND_ADDR: [u8; 4] = [127, 0, 0, 1]; + +const POINT_COUNT: usize = 20; +const AMPL: f64 = 10.0; +const PERIOD: f64 = 10.0; + +const LOG_LEVEL: log::LevelFilter = log::LevelFilter::Info; +const XCP_LOG_LEVEL: XcpLogLevel = XcpLogLevel::Info; //----------------------------------------------------------------------------- // Parameters @@ -69,15 +63,20 @@ struct Params { #[type_description(min = "0.0")] #[type_description(max = "2.0")] phi_y: f64, + + #[type_description(min = "1")] + #[type_description(max = "20")] + point_count: u32, } const PARAMS: Params = Params { - period_x: PERIOD, + period_x: PERIOD / 2.0, ampl_x: AMPL, phi_x: 0.0, - period_y: PERIOD, + period_y: PERIOD / 4.0, ampl_y: AMPL, phi_y: 0.0, + point_count: POINT_COUNT as u32, }; //--------------------------------------------------------------------------------------- @@ -94,43 +93,72 @@ struct PointCloud { points: Vec, } -fn create_point_cloud() -> PointCloud { - let mut point_cloud = PointCloud { points: Vec::with_capacity(4) }; +fn create_point_cloud(params: &CalSeg) -> PointCloud { + let mut point_cloud = PointCloud { + points: Vec::with_capacity(POINT_COUNT), + }; - for _ in 0..POINT_COUNT { + for _ in 0..params.point_count { point_cloud.points.push(Point { x: 0.0, y: 0.0, z: 0.0 }); } - + calculate_point_cloud(¶ms, &mut point_cloud, 0.0, 0.0, 0.0); point_cloud } +fn calculate_point_cloud(params: &Params, point_cloud: &mut PointCloud, t: f64, phi: f64, h: f64) { + for (i, p) in point_cloud.points.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 = 2.0 * PI / POINT_COUNT as f64 * i as f64 + phi; + let phi_y = 2.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 f64 * 0.05)) as f32; + p.z = h as f32; + } +} + //--------------------------------------------------------------------------------------- fn main() -> Result<()> { println!("xcp-lite point cloud demo"); - env_logger::Builder::new().target(env_logger::Target::Stdout).filter_level(log::LevelFilter::Info).init(); + env_logger::Builder::new().target(env_logger::Target::Stdout).filter_level(LOG_LEVEL).init(); - let xcp = XcpBuilder::new("point_cloud").set_log_level(XcpLogLevel::Debug).start_server(XcpTransportLayer::Udp, BIND_ADDR, 5555)?; + let xcp = XcpBuilder::new("point_cloud").set_log_level(XCP_LOG_LEVEL).start_server(XcpTransportLayer::Udp, BIND_ADDR, 5555)?; - let params = xcp.create_calseg("Params", &PARAMS); + let params: CalSeg = xcp.create_calseg("Params", &PARAMS); params.register_fields(); - let mut point_cloud = create_point_cloud(); + let mut point_cloud = create_point_cloud(¶ms); + 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); + info!("Created point cloud: point count = {}, size = {} bytes", POINT_COUNT, POINT_COUNT * 12 + 8); + + let mut counter: u64 = 0; + daq_register!(counter, event_point_cloud); let mut phi = 0.0; + daq_register!(phi, event_point_cloud); + let mut h = 0.0; + daq_register!(h, event_point_cloud); + + let start_time = Instant::now(); + let mut time = 0; + daq_register!(time, event_point_cloud); + loop { thread::sleep(Duration::from_millis(10)); - let t = START_TIME.elapsed().as_micros() as f64 * 0.000001; // s + let time = start_time.elapsed().as_micros() as f64 * 0.000001; // s - mainloop_counter1 += 1; - if mainloop_counter1 > 256 { - mainloop_counter1 = 0; + counter += 1; + if counter > 256 { + counter = 0; } phi += 2.0 * PI / POINT_COUNT as f64 * 0.001; @@ -141,25 +169,25 @@ fn main() -> Result<()> { if h > 20.0 { h = 0.0; } - for (i, p) in point_cloud.points.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.8 * PI / POINT_COUNT as f64 * i as f64 + phi; - let phi_y = 1.8 * 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.05); - } + calculate_point_cloud(¶ms, &mut point_cloud, time, phi, h); // Serialize point_cloud into the event capture buffer daq_serialize!(point_cloud, event_point_cloud, "point cloud demo"); + + // Trigger the measurement event event_point_cloud.trigger(); - params.sync(); - xcp.write_a2l().unwrap(); // @@@@ Remove: force A2L write + // Simply recreate the point cloud, when the number of points has changed + let point_count = params.point_count; + if params.sync() { + if params.point_count != point_count { + point_cloud = create_point_cloud(¶ms); + } + } + + // Write A2L file (once) + // @@@@ Test, remove + xcp.write_a2l().unwrap(); } // Ok(()) } diff --git a/examples/point_cloud_demo/xcp_lite_autodetect.a2l b/examples/point_cloud_demo/xcp_lite_autodetect.a2l deleted file mode 100644 index d7e459a..0000000 --- a/examples/point_cloud_demo/xcp_lite_autodetect.a2l +++ /dev/null @@ -1,169 +0,0 @@ - - ASAP2_VERSION 1 71 /* written by xcp-lite registry */ - /begin PROJECT point_cloud "" - /begin HEADER "" VERSION "1.0" /end HEADER - - /begin MODULE point_cloud "" - - /include "XCP_104.aml" - - /begin MOD_COMMON "" - BYTE_ORDER MSB_LAST - ALIGNMENT_BYTE 1 - ALIGNMENT_WORD 1 - ALIGNMENT_LONG 1 - ALIGNMENT_FLOAT16_IEEE 1 - ALIGNMENT_FLOAT32_IEEE 1 - ALIGNMENT_FLOAT64_IEEE 1 - ALIGNMENT_INT64 1 - /end MOD_COMMON - - /begin RECORD_LAYOUT U8 FNC_VALUES 1 UBYTE ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT S8 FNC_VALUES 1 SBYTE ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT U16 FNC_VALUES 1 UWORD ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT S16 FNC_VALUES 1 SWORD ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT U32 FNC_VALUES 1 ULONG ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT S32 FNC_VALUES 1 SLONG ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT U64 FNC_VALUES 1 A_UINT64 ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT S64 FNC_VALUES 1 A_UINT64 ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT F32 FNC_VALUES 1 FLOAT32_IEEE ROW_DIR DIRECT /end RECORD_LAYOUT - /begin RECORD_LAYOUT F64 FNC_VALUES 1 FLOAT64_IEEE ROW_DIR DIRECT /end RECORD_LAYOUT - -/* - - /begin TYPEDEF_MEASUREMENT M_F64 "" FLOAT64_IEEE NO_COMPU_METHOD 0 0 -1e12 1e12 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_F64 "" VALUE F64 0 NO_COMPU_METHOD -1e12 1e12 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_F32 "" FLOAT32_IEEE NO_COMPU_METHOD 0 0 -1e12 1e12 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_F32 "" VALUE F32 0 NO_COMPU_METHOD -1e12 1e12 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_I64 "" A_UINT64 NO_COMPU_METHOD 0 0 -1e12 1e12 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_I64 "" VALUE S64 0 NO_COMPU_METHOD -1e12 1e12 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_I32 "" SLONG NO_COMPU_METHOD 0 0 -2147483648 2147483647 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_I32 "" VALUE S32 0 NO_COMPU_METHOD -2147483648 2147483647 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_I16 "" SWORD NO_COMPU_METHOD 0 0 -32768 32767 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_I16 "" VALUE S16 0 NO_COMPU_METHOD -32768 32767 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_I8 "" SBYTE NO_COMPU_METHOD 0 0 -128 127 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_I8 "" VALUE S8 0 NO_COMPU_METHOD -128 127 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_U8 "" UBYTE NO_COMPU_METHOD 0 0 0 255 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_U8 "" VALUE U8 0 NO_COMPU_METHOD 0 255 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_U16 "" UWORD NO_COMPU_METHOD 0 0 0 65535 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_U16 "" VALUE U16 0 NO_COMPU_METHOD 0 65535 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_U32 "" ULONG NO_COMPU_METHOD 0 0 0 4294967295 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_U32 "" VALUE U32 0 NO_COMPU_METHOD 0 4294967295 /end TYPEDEF_CHARACTERISTIC - - /begin TYPEDEF_MEASUREMENT M_U64 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1e12 /end TYPEDEF_MEASUREMENT - /begin TYPEDEF_CHARACTERISTIC C_U64 "" VALUE U64 0 NO_COMPU_METHOD 0 1e12 /end TYPEDEF_CHARACTERISTIC -*/ - - - /begin MOD_PAR "" - EPK "EPK" ADDR_EPK 0x80000000 - - /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 1 2 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 - /begin PROTOCOL_LAYER - 0x104 1000 2000 0 0 0 0 0 252 1468 BYTE_ORDER_MSB_LAST ADDRESS_GRANULARITY_BYTE - OPTIONAL_CMD GET_COMM_MODE_INFO - OPTIONAL_CMD GET_ID - OPTIONAL_CMD SET_MTA - OPTIONAL_CMD UPLOAD - OPTIONAL_CMD SHORT_UPLOAD - OPTIONAL_CMD DOWNLOAD - OPTIONAL_CMD SHORT_DOWNLOAD - OPTIONAL_CMD GET_CAL_PAGE - OPTIONAL_CMD SET_CAL_PAGE - OPTIONAL_CMD COPY_CAL_PAGE - OPTIONAL_CMD BUILD_CHECKSUM - OPTIONAL_CMD GET_DAQ_RESOLUTION_INFO - OPTIONAL_CMD GET_DAQ_PROCESSOR_INFO - OPTIONAL_CMD FREE_DAQ - OPTIONAL_CMD ALLOC_DAQ - OPTIONAL_CMD ALLOC_ODT - OPTIONAL_CMD ALLOC_ODT_ENTRY - OPTIONAL_CMD SET_DAQ_PTR - OPTIONAL_CMD WRITE_DAQ - OPTIONAL_CMD GET_DAQ_LIST_MODE - OPTIONAL_CMD SET_DAQ_LIST_MODE - OPTIONAL_CMD START_STOP_SYNCH - OPTIONAL_CMD START_STOP_DAQ_LIST - OPTIONAL_CMD GET_DAQ_CLOCK - OPTIONAL_CMD WRITE_DAQ_MULTIPLE - OPTIONAL_CMD TIME_CORRELATION_PROPERTIES - OPTIONAL_CMD USER_CMD - OPTIONAL_LEVEL1_CMD GET_VERSION - /end PROTOCOL_LAYER - - /begin DAQ - DYNAMIC 0 1 0 OPTIMISATION_TYPE_DEFAULT ADDRESS_EXTENSION_FREE IDENTIFICATION_FIELD_TYPE_RELATIVE_BYTE GRANULARITY_ODT_ENTRY_SIZE_DAQ_BYTE 0xF8 OVERLOAD_INDICATION_PID - /begin TIMESTAMP_SUPPORTED - 0x1 SIZE_DWORD UNIT_1US TIMESTAMP_FIXED - /end TIMESTAMP_SUPPORTED - -/begin EVENT "point_cloud" "point_cl" 0 DAQ 0xFF 0 0 0 CONSISTENCY DAQ /end EVENT - - /end DAQ - - /begin XCP_ON_UDP_IP 0x104 5555 ADDRESS "127.0.0.1" /end XCP_ON_UDP_IP - - /end IF_DATA - -/begin MEASUREMENT mainloop_counter1 "" A_UINT64 NO_COMPU_METHOD 0 0 0 1E15 PHYS_UNIT "" ECU_ADDRESS 0xF8 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 - - /begin ANNOTATION ANNOTATION_LABEL "ObjectDescription" ANNOTATION_ORIGIN "application/dds" - /begin ANNOTATION_TEXT - " " - "Vector::PointCloud" - "" - "module Vector {" -"struct Point {" - "float x;" -"float y;" -"float z;" - "};" - " struct PointCloud {" - "sequence points;" - " };" - "};" - /end ANNOTATION_TEXT - /end ANNOTATION - -/begin ANNOTATION ANNOTATION_LABEL "IsVlsd" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "true" /end ANNOTATION_TEXT /end ANNOTATION -/begin ANNOTATION ANNOTATION_LABEL "MaxBufferNeeded" ANNOTATION_ORIGIN "" /begin ANNOTATION_TEXT "200" /end ANNOTATION_TEXT /end ANNOTATION - /begin IF_DATA XCP /begin DAQ_EVENT FIXED_EVENT_LIST EVENT 0 /end DAQ_EVENT /end IF_DATA /end CHARACTERISTIC - -/begin GROUP point_cloud "" ROOT /begin REF_MEASUREMENT mainloop_counter1 point_cloud /end REF_MEASUREMENT /end GROUP - -/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 "" ROOT /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 - - - /end MODULE - /end PROJECT - \ No newline at end of file