MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

Commit e2d8f394 authored by BRUNEAU Julien's avatar BRUNEAU Julien
Browse files

fix merge

parent 37bede40
......@@ -432,12 +432,7 @@ public class LoadEnv : MonoBehaviour
cam_Rec.timeToStart = ConfigReader.recordingStart;
cam_Rec.timeToStop = ConfigReader.recordingEnd;
cam_Rec.framerate = ConfigReader.recordingFramerate;
cam_fc.saveImage = ConfigReader.recordOriginalImg;
cam_fc.saveIdSegmentation = ConfigReader.recordSegmentationImg;
cam_fc.saveLayerSegmentation = ConfigReader.recordLayeredSegImg;
cam_fc.saveDepth = ConfigReader.recordDepthImg;
cam_fc.saveNormals = ConfigReader.recordNormalsImg;
cam_fc.saveOpticalFlow = ConfigReader.recordOpticalFlowImg;
cam_fc.init();
if (ConfigReader.recordingSaveDir[0] == '.')
cam_Rec.saveDir = Directory.GetCurrentDirectory().Replace("\\", "/") + "/" + ConfigReader.recordingSaveDir;
......
......@@ -81,14 +81,14 @@ public class ConfigManager : MonoBehaviour
PanelRecording.transform.Find("savedirVal").GetComponent<Text>().text = ConfigReader.recordingSaveDir;
// Save Datas
PanelRecording.transform.Find("imgOri").GetComponent<Toggle>().isOn = ConfigReader.recordOriginalImg;
PanelRecording.transform.Find("imgSeg").GetComponent<Toggle>().isOn = ConfigReader.recordSegmentationImg;
PanelRecording.transform.Find("imgCat").GetComponent<Toggle>().isOn = ConfigReader.recordLayeredSegImg;
PanelRecording.transform.Find("imgDepth").GetComponent<Toggle>().isOn = ConfigReader.recordDepthImg;
PanelRecording.transform.Find("imgNor").GetComponent<Toggle>().isOn = ConfigReader.recordNormalsImg;
PanelRecording.transform.Find("imgOF").GetComponent<Toggle>().isOn = ConfigReader.recordOpticalFlowImg;
PanelRecording.transform.Find("imgBBox").GetComponent<Toggle>().isOn = ConfigReader.recordBodyBoudingBoxes;
PanelRecording.transform.Find("imgHBox").GetComponent<Toggle>().isOn = ConfigReader.recordHeadBoundingBoxes;
PanelRecording.transform.Find("imgOri").GetComponent<Toggle>().isOn = ConfigReader.imgOriginal.record;
PanelRecording.transform.Find("imgSeg").GetComponent<Toggle>().isOn = ConfigReader.imgSegmentation.record;
PanelRecording.transform.Find("imgCat").GetComponent<Toggle>().isOn = ConfigReader.imgCategories.record;
PanelRecording.transform.Find("imgDepth").GetComponent<Toggle>().isOn = ConfigReader.imgDepth.record;
PanelRecording.transform.Find("imgNor").GetComponent<Toggle>().isOn = ConfigReader.imgNormals.record;
PanelRecording.transform.Find("imgOF").GetComponent<Toggle>().isOn = ConfigReader.imgOpticalFlow.record;
PanelRecording.transform.Find("imgBBox").GetComponent<Toggle>().isOn = ConfigReader.bboxeBody.record;
PanelRecording.transform.Find("imgHBox").GetComponent<Toggle>().isOn = ConfigReader.bboxeHead.record;
/// Get Environnement parameters
PanelStageEnv = GameObject.Find("/ConfigMenu/Panel/PanelStageEnv/Button/Panel");
......@@ -147,14 +147,14 @@ public class ConfigManager : MonoBehaviour
}
// Save Datas
ConfigReader.recordOriginalImg = PanelRecording.transform.Find("imgOri").GetComponent<Toggle>().isOn;
ConfigReader.recordSegmentationImg = PanelRecording.transform.Find("imgSeg").GetComponent<Toggle>().isOn;
ConfigReader.recordLayeredSegImg = PanelRecording.transform.Find("imgCat").GetComponent<Toggle>().isOn;
ConfigReader.recordDepthImg = PanelRecording.transform.Find("imgDepth").GetComponent<Toggle>().isOn;
ConfigReader.recordNormalsImg = PanelRecording.transform.Find("imgNor").GetComponent<Toggle>().isOn;
ConfigReader.recordOpticalFlowImg = PanelRecording.transform.Find("imgOF").GetComponent<Toggle>().isOn;
ConfigReader.recordBodyBoudingBoxes = PanelRecording.transform.Find("imgBBox").GetComponent<Toggle>().isOn;
ConfigReader.recordHeadBoundingBoxes = PanelRecording.transform.Find("imgHBox").GetComponent<Toggle>().isOn;
ConfigReader.imgOriginal.record = PanelRecording.transform.Find("imgOri").GetComponent<Toggle>().isOn;
ConfigReader.imgSegmentation.record = PanelRecording.transform.Find("imgSeg").GetComponent<Toggle>().isOn;
ConfigReader.imgCategories.record = PanelRecording.transform.Find("imgCat").GetComponent<Toggle>().isOn;
ConfigReader.imgDepth.record = PanelRecording.transform.Find("imgDepth").GetComponent<Toggle>().isOn;
ConfigReader.imgNormals.record = PanelRecording.transform.Find("imgNor").GetComponent<Toggle>().isOn;
ConfigReader.imgOpticalFlow.record = PanelRecording.transform.Find("imgOF").GetComponent<Toggle>().isOn;
ConfigReader.bboxeBody.record = PanelRecording.transform.Find("imgBBox").GetComponent<Toggle>().isOn;
ConfigReader.bboxeHead.record = PanelRecording.transform.Find("imgHBox").GetComponent<Toggle>().isOn;
ConfigReader.SaveConfig(configPath);
......
......@@ -232,7 +232,7 @@ public static class ConfigReader
static public DataImgOriginal imgOriginal
{
get { return data.recording.saveImgOriginal; }
set { data.recording.savedData.ImgOriginal = value;}
set { data.recording.saveImgOriginal= value;}
}
/// <summary>
/// Indicate if body bounding boxes should be recorded
......@@ -240,7 +240,7 @@ public static class ConfigReader
static public DataImgSegmentation imgSegmentation
{
get { return data.recording.saveImgSegmentation; }
set { data.recording.savedData.ImgSegmentation = value;}
set { data.recording.saveImgSegmentation = value;}
}
/// <summary>
/// Indicate if body bounding boxes should be recorded
......@@ -248,7 +248,7 @@ public static class ConfigReader
static public DataImgCategories imgCategories
{
get { return data.recording.saveImgCategories; }
set { data.recording.savedData.ImgCategories = value;}
set { data.recording.saveImgCategories = value;}
}
/// <summary>
/// Indicate if body bounding boxes should be recorded
......@@ -256,7 +256,7 @@ public static class ConfigReader
static public DataImgDepth imgDepth
{
get { return data.recording.saveImgDepth; }
set { data.recording.savedData.ImgDepth = value;}
set { data.recording.saveImgDepth = value;}
}
/// <summary>
/// Indicate if body bounding boxes should be recorded
......@@ -264,7 +264,7 @@ public static class ConfigReader
static public DataImgNormals imgNormals
{
get { return data.recording.saveImgNormals; }
set { data.recording.savedData.ImgNormals = value;}
set { data.recording.saveImgNormals = value;}
}
/// <summary>
/// Indicate if body bounding boxes should be recorded
......@@ -272,7 +272,7 @@ public static class ConfigReader
static public DataImgOpticalFlow imgOpticalFlow
{
get { return data.recording.saveImgOpticalFlow; }
set { data.recording.savedData.ImgOpticalFlow = value;}
set { data.recording.saveImgOpticalFlow = value;}
}
/// <summary>
......@@ -281,7 +281,7 @@ public static class ConfigReader
static public DataBodyBoundingBoxes bboxeBody
{
get { return data.recording.saveBodyBoundingBoxes; }
set { data.recording.savedData.BodyBoundingBoxes = value;}
set { data.recording.saveBodyBoundingBoxes = value;}
}
/// <summary>
......@@ -290,7 +290,7 @@ public static class ConfigReader
static public DataHeadBoundingBoxes bboxeHead
{
get { return data.recording.saveHeadBoundingBoxes; }
set { data.recording.savedData.HeadBoundingBoxes = value;}
set { data.recording.saveHeadBoundingBoxes = value;}
}
/// <summary>
......
......@@ -14,8 +14,15 @@
<followAgent agentID="-1" followOnX="false" followOnY="false" />
</cam>
<recording start="1" end="10" framerate="15">
<saveDir>./Output/</saveDir>
<savedData ImgOriginal="true" ImgSegmentation="false" ImgCategories="false" ImgDepth="false" ImgNormals="false" ImgOpticalFlow="false" BodyBoundingBoxes="false" HeadBoundingBoxes="false" />
<saveDir>./Output/LookAt/</saveDir>
<saveImgOriginal record="true" quality="8" width="1" height="-1" />
<saveImgSegmentation record="true" quality="8" width="1920" height="1080" />
<saveImgCategories record="true" quality="8" width="1280" height="720" />
<saveImgDepth record="true" quality="8" width="1000" height="1000" minDepth="0" maxDepth="50" exponent="1" />
<saveImgNormals record="true" quality="8" width="720" height="1280" />
<saveImgOpticalFlow record="true" quality="8" width="1080" height="1920" motionVector="false" />
<saveBodyBoundingBoxes record="true" />
<saveHeadBoundingBoxes record="true" />
</recording>
<AgentColorList />
</ConfigData>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment