diff --git a/doc/高光谱数据文件格式规范文档.md b/doc/高光谱数据文件格式规范文档.md index 85d6c85..b603f31 100644 --- a/doc/高光谱数据文件格式规范文档.md +++ b/doc/高光谱数据文件格式规范文档.md @@ -20,8 +20,6 @@ struct IRIS_Time_Struct }; ``` - - ## 2.根文件结构 数去分为4个区域分别是 高光谱数据（SpectralData）、高光谱元数据(SpectralInfo)、其他信息(Other)、图片信息(Image) @@ -70,6 +68,69 @@ struct IRIS_Time_Struct 3、 波长信息 如果提供的是波长系数 则用json保存 存储结构是 sensor_id--wevainfo--a[0],a[1],a[2],a[3] 如果是波长数组 则用0x03保存 json中可以用IS_Weave_ARR来标识波长信息在0x03中 4、元数据还应包含环境数据 Environment 信息 至少包含日期（Date）和Time 信息 +多json分散存储 +```json +{ + "info_type": "devinfo", + + "sensor_id": "is30002", + "bandnum": 2048, + "wave_coeff": { + "a1": 0.0, + "a2": 0.0, + "a3": 400, + "a4": 1.0 + } +} + + +``` + +一个json包含所有 +```json + { + "info_type": "infolist", // infolist 标识该json存储了多个info + "info_number":3, // 必须 + "info_list": [ + { + "info_type": "devinfo", // info类型为设备信息 // 必须 + "sensor_id": "is30002", // 必须 + "bandnum": 2048, // 必须 + "wave_coeff": { + "a1": 0.0, // 必须 + "a2": 0.0, // 必须 + "a3": 400, // 必须 + "a4": 1.0 // 必须 + } + }, + { + "info_type": "environment", // info类型为环境信息 必须 + "date": "2000-01-00 00:00:00", // 必须 + //下面可选 + "humidity":90.0, + "temperature":35.0 , + "gps":{ + "latitude":115.01, + "longitude": 39.01, + "altitude": 100.0 + }, + }, + { + "info_type": "devinfo", // 0 for device info + "sensor_id": "is20001", + "bandnum": 512, + "wave_coeff": { + "a1": 0, + "a2": 0.0, + "a3":390, + "a4": 4 + } + } + ] + +} +``` + ##2.2 高光谱数据 diff --git a/rust/iris_rust/src/examples.rs b/rust/iris_rust/src/examples.rs index cdb31e5..dc415de 100644 --- a/rust/iris_rust/src/examples.rs +++ b/rust/iris_rust/src/examples.rs @@ -1,4 +1,4 @@ -use crate::{read, structures::{ImageInfo, OneIRISData, OtherInfo, SpectralData, SpectralInfo, TimeStruct, DATA_TYPE_FLOAT64}, write}; +use crate::{read, structures::{ImageInfo, OneIRISData, SpectralData, TimeStruct, DATA_TYPE_FLOAT64}, write}; use std::{io::{Cursor, Write}, vec}; pub fn spectral_data_roundtrip() { @@ -30,45 +30,7 @@ pub fn spectral_data_roundtrip() { println!("Roundtrip test passed successfully!"); } -pub fn spectral_info_roundtrip() { - // Create sample spectral info - let mut info = SpectralInfo::new(); - info.sensor_id = "SENSOR-001".to_string(); - info.wave_coeff = [400.0, 0.5, 0.01, 0.001]; - // Write to buffer - let mut buffer = Vec::new(); - write::write_spectral_info(&info, &mut buffer).unwrap(); - - // Read back from buffer - let mut reader = Cursor::new(buffer); - let read_info = read::read_spectral_info(&mut reader).unwrap(); - - // Verify roundtrip - assert_eq!(info.sensor_id, read_info.sensor_id); - assert_eq!(info.wave_coeff, read_info.wave_coeff); - println!("Spectral info roundtrip test passed successfully!"); -} - -pub fn other_info_roundtrip() { - // Create sample other info - let mut info = OtherInfo::new(); - info.info_type = 1; - info.data = vec![1, 2, 3, 4, 5]; - - // Write to buffer - let mut buffer = Vec::new(); - write::write_other_info(&info, &mut buffer).unwrap(); - - // Read back from buffer - let mut reader = Cursor::new(buffer); - let read_info = read::read_other_info(&mut reader).unwrap(); - - // Verify roundtrip - assert_eq!(info.info_type, read_info.info_type); - assert_eq!(info.data, read_info.data); - println!("Other info roundtrip test passed successfully!"); -} pub fn image_info_roundtrip() { // Create sample image info @@ -104,8 +66,7 @@ pub fn read_iris_file_example() { // test_data.spectral_data_section.push(spectral); // Write to a temporary file - let path = "iris_data_example.iris"; - // let path = "output_iris_data.iris"; + // { // let file = std::fs::File::create(path).unwrap(); // let mut writer = std::io::BufWriter::new(file); @@ -124,6 +85,8 @@ pub fn read_iris_file_example() { // } // Now read it back + let path = "output_iris_data1.iris"; + // let path = "output_iris_data.iris"; let mut read=match read::read_iris_file(path) { Ok(data) => { println!("Successfully read IRIS file:"); @@ -146,6 +109,11 @@ pub fn read_iris_file_example() { OneIRISData::new() } }; + let spectralinfonum = read.spectral_info_section.len(); + for info in &read.spectral_info_section { + println!("{}",info) + + } let mut aaa=read.spectral_data_section[2].Get_Spectral_Data(); let mut bbb =vec![0f64; 256]; //随机生成一些数据 @@ -157,5 +125,5 @@ pub fn read_iris_file_example() { println!("Spectral Data Length: {}", ccc.len()); - write::wirte_iris_data(&read, "output_iris_data1.iris").unwrap(); + write::wirte_iris_data(&read, "output_iris_data2.iris").unwrap(); } \ No newline at end of file diff --git a/rust/iris_rust/src/lib.rs b/rust/iris_rust/src/lib.rs index 0328e99..fd17318 100644 --- a/rust/iris_rust/src/lib.rs +++ b/rust/iris_rust/src/lib.rs @@ -3,7 +3,7 @@ pub mod read; pub mod write; pub mod examples; -pub use structures::{TimeStruct, SpectralData, SpectralInfo, OtherInfo, ImageInfo, OneIRISData}; -pub use read::{read_time, read_spectral_data, read_spectral_info, read_other_info, read_image_info, read_iris_file}; +pub use structures::{TimeStruct, SpectralData, ImageInfo, OneIRISData}; +pub use read::{read_time, read_spectral_data, read_image_info, read_iris_file}; pub use write::*; -pub use examples::{spectral_data_roundtrip, spectral_info_roundtrip}; +pub use examples::{spectral_data_roundtrip}; diff --git a/rust/iris_rust/src/main.rs b/rust/iris_rust/src/main.rs index 6ade178..5d09e62 100644 --- a/rust/iris_rust/src/main.rs +++ b/rust/iris_rust/src/main.rs @@ -1,7 +1,5 @@ use iris_rust::examples::{ spectral_data_roundtrip, - spectral_info_roundtrip, - other_info_roundtrip, image_info_roundtrip, read_iris_file_example }; diff --git a/rust/iris_rust/src/read.rs b/rust/iris_rust/src/read.rs index c3e5a50..2d96edb 100644 --- a/rust/iris_rust/src/read.rs +++ b/rust/iris_rust/src/read.rs @@ -1,7 +1,8 @@ use std::io::{Read, Result, BufReader}; use std::fs::File; use std::convert::TryInto; -use super::structures::{TimeStruct, SpectralData, SpectralInfo, OtherInfo, ImageInfo, OneIRISData}; +use super::structures::{TimeStruct, SpectralData, ImageInfo, OneIRISData}; + use serde_json::Value; pub fn read_time(reader: &mut R) -> Result { let mut buffer = [0u8; 10]; // Corrected buffer size to 10 bytes @@ -19,24 +20,7 @@ pub fn read_time(reader: &mut R) -> Result { }) } -pub fn read_spectral_info(reader: &mut R) -> Result { - let mut info = SpectralInfo::new(); - - // Read sensor ID - let mut sensor_buf = [0u8; 50]; - reader.read_exact(&mut sensor_buf)?; - info.sensor_id = String::from_utf8_lossy(&sensor_buf).trim_end_matches('\0').to_string(); - info.sensor_id = remove_after_null_split_once( info.sensor_id); - // Read wave coefficients - for i in 0..4 { - let mut float_buf = [0u8; 8]; - reader.read_exact(&mut float_buf)?; - info.wave_coeff[i] = f64::from_le_bytes(float_buf); - } - - Ok(info) -} pub fn read_image_info(reader: &mut R) -> Result { let mut info = ImageInfo::new(); @@ -127,14 +111,79 @@ pub fn read_iris_file(path: &str) -> Result { continue; // Skip this entry if parsing fails } }; // Handle parsing error gracefully + + //判断json["info_type"]是否存在 + if !json.get("info_type").is_some() { + eprintln!("JSON does not contain 'info_type': {}", json_string); + continue; // Skip this entry if "info_type" is missing + } + /* { + "info_type": "infolist", // 0 for device info + "info_number":3, + "info_list": [ + { + "info_type": "devinfo", // 0 for device info + "sensor_id": "is30002", + "bandnum": 2048, + "wave_coeff": { + "a1": 0.0, + "a2": 0.0, + "a3": 400, + "a4": 1.0 + } + }, + { + "info_type": "environment", // 1 for gain info + "date": "2000-01-00 00:00:00", + //下面可选 + "humidity":90.0, + "temperature":35.0 , + "gps":{ + "latitude":115.01, + "longitude": 39.01, + "altitude": 100.0 + }, + }, + { + "info_type": "devinfo", // 0 for device info + "sensor_id": "is20001", + "bandnum": 512, + "wave_coeff": { + "a1": 0, + "a2": 0.0, + "a3":390, + "a4": 4 + } + } + ] + + } */ + //如果info_type是infolist 则需要逐个解析 + if json.get("info_type").and_then(Value::as_str) == Some("infolist") { + let info_number = json.get("info_number").and_then(Value::as_u64).unwrap_or(0) as usize; + for i in 0 ..info_number{ + //将对应的info加入到data中 + if let Some(info) = json.get("info_list").and_then(|list| list.get(i)) { + data.push(info.clone()); + } + + + } + + continue; // Skip the rest of the loop for this entry + } + + + + data.push(json); //println!("Parsed JSON: {:?}", json); - let mut data_entry = SpectralInfo::new(); - data_entry.sensor_id = json.get("SensorId").and_then(Value::as_str).unwrap_or_default().to_string(); - data_entry.wave_coeff[0]=json["WaveCoeff"]["a1"].as_f64().unwrap_or(0.0); - data_entry.wave_coeff[1]=json["WaveCoeff"]["a2"].as_f64().unwrap_or(0.0); - data_entry.wave_coeff[2]=json["WaveCoeff"]["a3"].as_f64().unwrap_or(0.0); - data_entry.wave_coeff[3]=json["WaveCoeff"]["a4"].as_f64().unwrap_or(0.0); - data.push(data_entry); + // let mut data_entry = SpectralInfo::new(); + // data_entry.sensor_id = json.get("SensorId").and_then(Value::as_str).unwrap_or_default().to_string(); + // data_entry.wave_coeff[0]=json["WaveCoeff"]["a1"].as_f64().unwrap_or(0.0); + // data_entry.wave_coeff[1]=json["WaveCoeff"]["a2"].as_f64().unwrap_or(0.0); + // data_entry.wave_coeff[2]=json["WaveCoeff"]["a3"].as_f64().unwrap_or(0.0); + // data_entry.wave_coeff[3]=json["WaveCoeff"]["a4"].as_f64().unwrap_or(0.0); + // data.push(data_entry); // Parse JSON string @@ -151,7 +200,25 @@ pub fn read_iris_file(path: &str) -> Result { let count = read_section_count(&mut reader)?; let mut data = Vec::with_capacity(count); for _ in 0..count { - data.push(read_other_info(&mut reader)?); + let mut tempbuffer = [0u8; 3]; // Adjust size as needed + reader.read_exact(&mut tempbuffer)?; + let lenth = u16::from_le_bytes([tempbuffer[0], tempbuffer[1]]) as usize; + let info_type = u8::from_le_bytes([tempbuffer[2]]); + let mut tempvector = vec![0u8; lenth]; + reader.read_exact(&mut tempvector)?; + // Convert to String + let json_string = String::from_utf8(tempvector).unwrap_or_default(); + let json_string = json_string.trim_end_matches('\0').to_string(); + //print!("JSON String: {}", json_string); + let json: Value = match serde_json::from_str(&json_string) { + Ok(json) => json, + Err(e) => { + eprintln!("Error parsing JSON: {}", e); + continue; // Skip this entry if parsing fails + } + }; // Handle parsing error gracefully + data.push(json); + } iris_data.other_info_section = data; }, @@ -185,25 +252,25 @@ fn read_section_count(reader: &mut R) -> Result { Ok(u16::from_le_bytes(count_buf) as usize) } -pub fn read_other_info(reader: &mut R) -> Result { - let mut info = OtherInfo::new(); +// pub fn read_other_info(reader: &mut R) -> Result { +// let mut info = OtherInfo::new(); - // Read info type - let mut type_buf = [0u8; 1]; - reader.read_exact(&mut type_buf)?; - info.info_type = type_buf[0]; +// // Read info type +// let mut type_buf = [0u8; 1]; +// reader.read_exact(&mut type_buf)?; +// info.info_type = type_buf[0]; - // Read data length - let mut len_buf = [0u8; 8]; - reader.read_exact(&mut len_buf)?; - let data_len = u64::from_le_bytes(len_buf) as usize; +// // Read data length +// let mut len_buf = [0u8; 8]; +// reader.read_exact(&mut len_buf)?; +// let data_len = u64::from_le_bytes(len_buf) as usize; - // Read data - info.data.resize(data_len, 0); - reader.read_exact(&mut info.data)?; +// // Read data +// info.data.resize(data_len, 0); +// reader.read_exact(&mut info.data)?; - Ok(info) -} +// Ok(info) +// } fn remove_after_null_split_once(s: String) -> String { if let Some((before_null, _after_null)) = s.split_once('\0') { // 返回 \0 之前的部分 diff --git a/rust/iris_rust/src/structures.rs b/rust/iris_rust/src/structures.rs index 531e611..880069f 100644 --- a/rust/iris_rust/src/structures.rs +++ b/rust/iris_rust/src/structures.rs @@ -13,12 +13,15 @@ pub const Target_Spectral_Type_DN:u8 = 0x00; pub const Target_Spectral_Type_Rad:u8 = 0x01; pub const Target_Spectral_Type_Ref:u8 = 0x02; pub const Target_Spectral_Type_IRad:u8 = 0x03; -pub const Target_Spectral_Type_CaliFile:u8 = 0x04; +pub const Target_Spectral_Type_CaliFile_Gain:u8 = 0x04; pub const Target_Spectral_Type_FlatRef:u8 = 0x05; pub const Target_Spectral_Type_DarkDN:u8 = 0x06; pub const Target_Spectral_Type_FlatDN:u8 = 0x07; +pub const Target_LAMP_VALUE_SCALED:u8 = 0x08; +use serde_json::json; + #[derive(Debug, Clone, PartialEq)] @@ -293,26 +296,26 @@ impl SpectralData { } } -#[derive(Debug, Clone, PartialEq)] -pub struct OtherInfo { - pub info_type: u8, - pub data: Vec, // Assuming the data is variable length -} +// #[derive(Debug, Clone, PartialEq)] +// pub struct OtherInfo { +// pub info_type: u8, +// pub data: Vec, // Assuming the data is variable length +// } -impl OtherInfo { - pub fn new() -> Self { - OtherInfo { - info_type: 0, - data: Vec::new(), - } - } -} +// impl OtherInfo { +// pub fn new() -> Self { +// OtherInfo { +// info_type: 0, +// data: Vec::new(), +// } +// } +// } #[derive(Debug, Clone, PartialEq)] pub struct OneIRISData { pub spectral_data_section: Vec, - pub spectral_info_section: Vec, - pub other_info_section: Vec, + pub spectral_info_section: Vec, // Using serde_json::Value for flexibility + pub other_info_section: Vec, pub image_info_section: Vec, } @@ -327,20 +330,21 @@ impl OneIRISData { } } -#[derive(Debug, Clone, PartialEq)] -pub struct SpectralInfo { - pub sensor_id: String, - pub wave_coeff: [f64; 4], -} +// #[derive(Debug, Clone, PartialEq)] +// pub struct SpectralInfo { +// pub sensor_id: String, +// pub wave_coeff: [f64; 4], + +// } -impl SpectralInfo { - pub fn new() -> Self { - SpectralInfo { - sensor_id: String::new(), - wave_coeff: [0.0; 4], - } - } -} +// impl SpectralInfo { +// pub fn new() -> Self { +// SpectralInfo { +// sensor_id: String::new(), +// wave_coeff: [0.0; 4], +// } +// } +// } #[derive(Debug, Clone, PartialEq)] pub struct ImageInfo { @@ -384,19 +388,19 @@ mod tests { assert!(data.spectral_data.is_empty()); } - #[test] - fn test_spectral_info() { - let info = SpectralInfo::new(); - assert_eq!(info.sensor_id, ""); - assert_eq!(info.wave_coeff, [0.0; 4]); - } + // #[test] + // fn test_spectral_info() { + // let info = SpectralInfo::new(); + // assert_eq!(info.sensor_id, ""); + // assert_eq!(info.wave_coeff, [0.0; 4]); + // } - #[test] - fn test_other_info() { - let info = OtherInfo::new(); - assert_eq!(info.info_type, 0); - assert!(info.data.is_empty()); - } + // #[test] + // fn test_other_info() { + // let info = OtherInfo::new(); + // assert_eq!(info.info_type, 0); + // assert!(info.data.is_empty()); + // } #[test] fn test_image_info() { diff --git a/rust/iris_rust/src/write.rs b/rust/iris_rust/src/write.rs index 57880f8..20d0eb7 100644 --- a/rust/iris_rust/src/write.rs +++ b/rust/iris_rust/src/write.rs @@ -3,9 +3,9 @@ use std::io::{self, Write, Result}; use std::vec; use serde_json::json; -use crate::write; +// use crate::write; -use super::structures::{TimeStruct, SpectralData, SpectralInfo, OtherInfo, ImageInfo,OneIRISData}; +use super::structures::{TimeStruct, SpectralData, ImageInfo,OneIRISData}; // Internal writer functions remain the same fn write_time(time: &TimeStruct, writer: &mut W) -> Result<()> { @@ -20,19 +20,6 @@ fn write_time(time: &TimeStruct, writer: &mut W) -> Result<()> { Ok(()) } -pub fn write_spectral_info(info: &SpectralInfo, writer: &mut W) -> Result<()> { - // Write sensor ID - let mut sensor_buf = [0u8; 50]; - sensor_buf[..info.sensor_id.len().min(49)].copy_from_slice(info.sensor_id.as_bytes()); - writer.write_all(&sensor_buf)?; - - // Write wave coefficients - for coeff in &info.wave_coeff { - writer.write_all(&coeff.to_le_bytes())?; - } - - Ok(()) -} pub fn write_image_info(info: &ImageInfo, writer: &mut W) -> Result<()> { // Write data length @@ -57,17 +44,6 @@ pub fn write_image_info(info: &ImageInfo, writer: &mut W) -> Result<() } -pub fn write_other_info(info: &OtherInfo, writer: &mut W) -> Result<()> { - // Write info type - writer.write_all(&[info.info_type])?; - - // Write data length - writer.write_all(&(info.data.len() as u64).to_le_bytes())?; - // Write data - writer.write_all(&info.data)?; - - Ok(()) -} pub fn write_spectral_data(data: &SpectralData, writer: &mut W) -> Result<()> { // Write fixed-size fields @@ -82,7 +58,7 @@ pub fn write_spectral_data(data: &SpectralData, writer: &mut W) -> Res sensor_buf[..data.sensor_id.len().min(49)].copy_from_slice(sensor_id_bytes[0..sensor_id_bytes.len().min(49)].as_ref()); writer.write_all(&sensor_buf)?; writer.write_all(&[data.fiber_id])?; - + write_time(&data.collection_time, writer)?; writer.write_all(&data.exposure.to_le_bytes())?; writer.write_all(&data.gain.to_le_bytes())?; @@ -140,7 +116,7 @@ pub fn caculate_image_info_length(data: &Vec) -> u64 { } -pub fn cacluate_other_info_length(data: &Vec) -> (Vec, u64) { +pub fn cacluate_other_info_length(data: &Vec) -> (Vec, u64) { let mut lenth: u64 = 0; let mut vecback= Vec::new(); if data.is_empty() { @@ -157,7 +133,7 @@ pub fn cacluate_other_info_length(data: &Vec) -> (Vec, u64) { (vecback, lenth) } -pub fn caculate_spectral_info_length(data: &Vec) -> (Vec, u64) { +pub fn caculate_spectral_info_length(data: &Vec) -> (Vec, u64) { let mut lenth: u64 = 0; let mut vecback= Vec::new(); if data.is_empty() { @@ -175,15 +151,7 @@ pub fn caculate_spectral_info_length(data: &Vec) -> (Vec, u64) lenth+=2; lenth+=1; let mut lenthofthisinfo:u16=0; - let json=json!({ - "SensorId": info.sensor_id, - "WaveCoeff": { - "a1": info.wave_coeff[0], - "a2": info.wave_coeff[1], - "a3": info.wave_coeff[2], - "a4": info.wave_coeff[3] - } - }); + let json=info; let json_string = serde_json::to_string(&json).unwrap(); let json_bytes = json_string.as_bytes(); lenthofthisinfo= json_bytes.len() as u16+1; diff --git a/source/iris_format/forwin.cpp b/source/iris_format/forwin.cpp index 907a1e0..1e398c3 100644 --- a/source/iris_format/forwin.cpp +++ b/source/iris_format/forwin.cpp @@ -21,13 +21,13 @@ uint64_t get_Sepctral_Info_to_Byte(Sepctral_Info_Section_Data_Struct *sepctralin } for (size_t i = 0; i < number_of_spectral_info; i++) { - json j; - std::string SensorId=sepctralinfo->SepctralInfoAddressList[i].SensorId; - j["SensorId"] =SensorId; - j["WaveCoeff"]["a1"] = sepctralinfo->SepctralInfoAddressList[i].WaveCoeff[0]; - j["WaveCoeff"]["a2"] =sepctralinfo->SepctralInfoAddressList[i].WaveCoeff[1]; - j["WaveCoeff"]["a3"] = sepctralinfo->SepctralInfoAddressList[i].WaveCoeff[2]; - j["WaveCoeff"]["a4"] = sepctralinfo->SepctralInfoAddressList[i].WaveCoeff[3]; + json j=sepctralinfo->SepctralInfoAddressList[i].Info; + // std::string SensorId=sepctralinfo->SepctralInfoAddressList[i].SensorId; + // j["SensorId"] =SensorId; + // j["WaveCoeff"]["a1"] = sepctralinfo->SepctralInfoAddressList[i].WaveCoeff[0]; + // j["WaveCoeff"]["a2"] =sepctralinfo->SepctralInfoAddressList[i].WaveCoeff[1]; + // j["WaveCoeff"]["a3"] = sepctralinfo->SepctralInfoAddressList[i].WaveCoeff[2]; + // j["WaveCoeff"]["a4"] = sepctralinfo->SepctralInfoAddressList[i].WaveCoeff[3]; std::string json_str = j.dump(); uint16_t json_length = strlen(json_str.c_str())+1; @@ -83,9 +83,9 @@ uint64_t get_Other_Info_to_Byte(Other_Info_Section_Data_Struct *otherdata,uint8_ } for (size_t i = 0; i < number_of_spectral_info; i++) { - json j; - uint8_t Type=otherdata->OtherInfoAddressList[i].Type; - j["Type"] =Type; + json j=otherdata->OtherInfoAddressList[i].Info; + // uint8_t Type=otherdata->OtherInfoAddressList[i].Type; + // j["Type"] =Type; // j["WaveCoeff"]["a1"] = otherdata->SepctralInfoAddressList[i].WaveCoeff[0]; // j["WaveCoeff"]["a2"] =otherdata->SepctralInfoAddressList[i].WaveCoeff[1]; // j["WaveCoeff"]["a3"] = otherdata->SepctralInfoAddressList[i].WaveCoeff[2]; @@ -126,16 +126,83 @@ uint64_t get_Other_Info_to_Byte(Other_Info_Section_Data_Struct *otherdata,uint8_ } -One_Spectral_Info_Struct Get_spectral_info_from_byte(uint8_t *buffer, size_t length) { - One_Spectral_Info_Struct retstruct; +One_Spectral_Info_Struct *Get_spectral_info_from_byte(uint8_t *buffer, size_t length,int &spectral_info_number) { + One_Spectral_Info_Struct *retstruct=nullptr; std::string json_str(reinterpret_cast(buffer), length-1); json j = json::parse(json_str, nullptr, false); - std::string sensor_id = j["SensorId"].get(); - strcpy(retstruct.SensorId,sensor_id.c_str() ); - retstruct.WaveCoeff[0] = j["WaveCoeff"]["a1"].get(); - retstruct.WaveCoeff[1] = j["WaveCoeff"]["a2"].get(); - retstruct.WaveCoeff[2] = j["WaveCoeff"]["a3"].get(); - retstruct.WaveCoeff[3] = j["WaveCoeff"]["a4"].get(); + //打印json + // std::cout<<"Read JSON string: " << json_str << std::endl; + //std::cout << j.dump(4) << std::endl; // 打印JSON对象 + /* { + "info_type": "infolist", // 0 for device info + "info_number":3, + "info_list": [ + { + "info_type": "devinfo", // 0 for device info + "sensor_id": "is30002", + "bandnum": 2048, + "wave_coeff": { + "a1": 0.0, + "a2": 0.0, + "a3": 400, + "a4": 1.0 + } + }, + { + "info_type": "environment", // 1 for gain info + "date": "2000-01-00 00:00:00", + //下面可选 + "humidity":90.0, + "temperature":35.0 , + "gps":{ + "latitude":115.01, + "longitude": 39.01, + "altitude": 100.0 + }, + }, + { + "info_type": "devinfo", // 0 for device info + "sensor_id": "is20001", + "bandnum": 512, + "wave_coeff": { + "a1": 0, + "a2": 0.0, + "a3":390, + "a4": 4 + } + } + ] + + } */ + //如果 info_type 为 infolist 则表示为光谱信息列表 需要一个一个处理 + if (!j.is_object() || !j.contains("info_type")) { + spectral_info_number=0; + return nullptr; // 返回空指针表示解析失败 + } + if (j["info_type"]=="infolist") { + int info_number = j["info_number"].get(); + spectral_info_number= info_number; + retstruct = new One_Spectral_Info_Struct[info_number]; + + for (int iii=0;iiiInfo=j; + spectral_info_number=1; + // std::string sensor_id = j["SensorId"].get(); + // strcpy(retstruct.SensorId,sensor_id.c_str() ); + // retstruct.WaveCoeff[0] = j["WaveCoeff"]["a1"].get(); + // retstruct.WaveCoeff[1] = j["WaveCoeff"]["a2"].get(); + // retstruct.WaveCoeff[2] = j["WaveCoeff"]["a3"].get(); + // retstruct.WaveCoeff[3] = j["WaveCoeff"]["a4"].get(); return retstruct; } \ No newline at end of file diff --git a/source/iris_format/iris_deffine.cpp b/source/iris_format/iris_deffine.cpp index e016c5d..6e6d908 100644 --- a/source/iris_format/iris_deffine.cpp +++ b/source/iris_format/iris_deffine.cpp @@ -94,29 +94,69 @@ void IRIS_DATA_example() { strcpy(tempspectradata3.Name, "IS2_IRIS_Spectral_Data"); // 光谱数据名称 ///光谱信息区域构造 - mydata.SepctralInfoSection.SectionContent.SepctralInfoNumber = 3; - mydata.SepctralInfoSection.SectionContent.SepctralInfoAddressList = new One_Spectral_Info_Struct[3]; + mydata.SepctralInfoSection.SectionContent.SepctralInfoNumber = 1; + mydata.SepctralInfoSection.SectionContent.SepctralInfoAddressList = new One_Spectral_Info_Struct[1]; //第一个光谱仪的信息 One_Spectral_Info_Struct &tempspectralinfo=mydata.SepctralInfoSection.SectionContent.SepctralInfoAddressList[0]; - strcpy(tempspectralinfo.SensorId, "HH3_IRIS"); - tempspectralinfo.WaveCoeff[0] = 0.1; - tempspectralinfo.WaveCoeff[1] = 0.2; - tempspectralinfo.WaveCoeff[2] = 0.3; - tempspectralinfo.WaveCoeff[3] = 0.4; - //第二个光谱仪的信息 - One_Spectral_Info_Struct &tempspectralinfo1=mydata.SepctralInfoSection.SectionContent.SepctralInfoAddressList[1]; - strcpy(tempspectralinfo1.SensorId, "IS3_IRIS"); - tempspectralinfo1.WaveCoeff[0] = 0.5; - tempspectralinfo1.WaveCoeff[1] = 0.6; - tempspectralinfo1.WaveCoeff[2] = 0.7; - tempspectralinfo1.WaveCoeff[3] = 0.8; - //第三个光谱仪的信息 - One_Spectral_Info_Struct &tempspectralinfo2=mydata.SepctralInfoSection.SectionContent.SepctralInfoAddressList[2]; - strcpy(tempspectralinfo2.SensorId, "IS2_IRIS"); - tempspectralinfo2.WaveCoeff[0] = 0.9; - tempspectralinfo2.WaveCoeff[1] = 1.0; - tempspectralinfo2.WaveCoeff[2] = 1.1; - tempspectralinfo2.WaveCoeff[3] = 1.2; + tempspectralinfo.Info = json::object(); // 初始化为一个空的JSON对象 + tempspectralinfo.Info["info_type"] = "infolist"; // 设置info_type为infolist + tempspectralinfo.Info["info_number"] = 3; // 设置光谱信息数量 + tempspectralinfo.Info["info_list"] = json::array(); // 初始化为一个空的JSON数组 + // 添加光谱信息到info_list + tempspectralinfo.Info["info_list"].push_back({ + {"info_type","devinfo"}, + {"sensor_id", "HH3_IRIS"}, + {"bandnum", 2000}, + {"wave_coeff", { + {"a1", 0.1}, + {"a2", 1230.2}, + {"a3", 0.3}, + {"a4", 0.4} + }} + }); + tempspectralinfo.Info["info_list"].push_back({ + {"info_type","devinfo"}, + {"sensor_id", "IS3_IRIS"}, + {"bandnum", 500}, + {"wave_coeff", { + {"a1", 0.5}, + {"a2", 0.6}, + {"a3", 1230.7}, + {"a4", 0.8} + }} + }); + tempspectralinfo.Info["info_list"].push_back({ + {"info_type","devinfo"}, + {"sensor_id", "IS2_IRIS"}, + {"bandnum", 500}, + {"wave_coeff", { + {"a1", 0.9}, + {"a2", 1.0}, + {"a3", 1.1}, + {"a4", 1.2} + }} + }); + // //输出info + std::cout << tempspectralinfo.Info.dump(4) << std::endl; // 打印JSON对象 + // strcpy(tempspectralinfo.SensorId, "HH3_IRIS"); + // tempspectralinfo.WaveCoeff[0] = 0.1; + // tempspectralinfo.WaveCoeff[1] = 0.2; + // tempspectralinfo.WaveCoeff[2] = 0.3; + // tempspectralinfo.WaveCoeff[3] = 0.4; + // //第二个光谱仪的信息 + // One_Spectral_Info_Struct &tempspectralinfo1=mydata.SepctralInfoSection.SectionContent.SepctralInfoAddressList[1]; + // strcpy(tempspectralinfo1.SensorId, "IS3_IRIS"); + // tempspectralinfo1.WaveCoeff[0] = 0.5; + // tempspectralinfo1.WaveCoeff[1] = 0.6; + // tempspectralinfo1.WaveCoeff[2] = 0.7; + // tempspectralinfo1.WaveCoeff[3] = 0.8; + // //第三个光谱仪的信息 + // One_Spectral_Info_Struct &tempspectralinfo2=mydata.SepctralInfoSection.SectionContent.SepctralInfoAddressList[2]; + // strcpy(tempspectralinfo2.SensorId, "IS2_IRIS"); + // tempspectralinfo2.WaveCoeff[0] = 0.9; + // tempspectralinfo2.WaveCoeff[1] = 1.0; + // tempspectralinfo2.WaveCoeff[2] = 1.1; + // tempspectralinfo2.WaveCoeff[3] = 1.2; ///其他信息区域构造 @@ -138,6 +178,11 @@ void IRIS_DATA_example() { // 调用写入函数 write_IRIS_DATA_Struct_EMB(&mydata, "iris_data_example.iris", *File_control_ptr); One_IRIS_DATA_Struct mydata2= Get_One_IRIS_DATA_From_File("iris_data_example.iris", *File_control_ptr); + int numberofspectralinfo = mydata2.SepctralInfoSection.SectionContent.SepctralInfoNumber; + // for (int iii=0;iii1) { + One_Spectral_Info_Struct *temp_spectral_info=nullptr; + if (indexofnowinfo>0) { + temp_spectral_info=new One_Spectral_Info_Struct[indexofnowinfo]; + for (int iii=0;iii // For uint8_t, uint16_t, uint32_t, uint64_t, int8_t #include // For size_t #include // For std::string + + + //结构体内存1字节对齐 #pragma pack(1) @@ -127,8 +138,7 @@ typedef struct Sepctral_Data_Section_Struct // 下面结构体应通过转换成json在进行存储 读取时亦然 typedef struct One_Spectral_Info_Struct{ - char SensorId[50]; // 传感器ID - double WaveCoeff[4]; // 波长系数 + json Info; // 光谱信息内容 } One_Spectral_Info_Struct; typedef struct Sepctral_Info_Section_Data_Struct @@ -146,7 +156,7 @@ typedef struct Sepctral_Info_Section_Struct ///////////////////////////////// 其他信息结构相关定义 ///////////////////////////////// typedef struct One_Other_Info_Struct{ - uint8_t Type; // 信息类型; // 数据地址 (pointer to data) + json Info; // 信息类型; // 数据地址 (pointer to data) } One_Other_Info_Struct; typedef struct Other_Info_Section_Data_Struct @@ -215,6 +225,6 @@ uint64_t get_Sepctral_Info_to_Byte(Sepctral_Info_Section_Data_Struct *sepctralin uint64_t get_Other_Info_to_Byte(Other_Info_Section_Data_Struct *otherdata,uint8_t **retbuffer); One_IRIS_DATA_Struct Get_One_IRIS_DATA_From_File(std::string Filepath, MyfileControl_Struct File_control); VSDLL_EXPORTS void IRIS_DATA_example(); -One_Spectral_Info_Struct Get_spectral_info_from_byte(uint8_t *buffer, size_t length); +One_Spectral_Info_Struct *Get_spectral_info_from_byte(uint8_t *buffer, size_t length,int &spectral_info_number); void Destroy_IRIS_DATA_Struct(One_IRIS_DATA_Struct &iris_data); #endif // IRIS_DEFFINE_H