Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inizio gestione separazione con linee vuote

Browse Source
This commit is contained in:
zaccaria.majid
2023-04-20 17:46:51 +02:00
parent e7d7783d29
commit 0ef69bb675
4 changed files with 33 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebDoorCreator.Data/DDF/Converter.cs
+1
View File
@@ -56,6 +56,7 @@ namespace WebDoorCreator.Data.DDF
{
var currList = new List<Dictionary<string, string>>();
currList.Add(deserialized.Where(x => x.Key != "Folder").ToDictionary(x => x.Key, x => x.Value));
deserialized.Add("Separator", " ");
dictDoorOP.Add(item.ObjectId, currList);
}
}
WebDoorCreator.UI/Components/Buttons/ButtonsDoorDef.razor.cs
-43
View File
@@ -63,17 +63,6 @@ namespace WebDoorCreator.UI.Components.Buttons
{
await Task.Delay(1);
string fileName = Path.Combine("temp", $"Conf.yaml");
#if false
string vers = config.GetValue<string>("ConfDDF:VersNumber");
bool remDoorOp = config.GetValue<bool>("ConfDDF:RemoveDoorOps");
var headRows = config.GetSection("ConfDDF:Header").Get<List<string>>();
var footRows = config.GetSection("ConfDDF:Footer").Get<List<string>>();
string doorOpSer = CurrentDoorOp.GetSerialized(remDoorOp);
CurrentConf.version = vers;
string fullData = CurrentConf.GetSerialized(headRows, footRows, doorOpSer);
#endif
if (File.Exists(fileName))
{
@@ -107,38 +96,6 @@ namespace WebDoorCreator.UI.Components.Buttons
{
// chiamo metodo x avewre DDF serializzato
string currDdf = currDdfConv.GetSerialized(listOp);
#if false
dictDoorOP = new Dictionary<string, List<Dictionary<string, string>>>();
listDoorOp = listOp;
foreach (var item in listDoorOp)
{
var deserialized = JsonConvert.DeserializeObject<Dictionary<string, string>>(item.JsoncActVal!);
if (deserialized != null)
{
//if (dictDoorOP[item.ObjectId].Count() == 1)
//{
// dictDoorOP[item.ObjectId];
//}
//else
//{
if (dictDoorOP.ContainsKey(item.ObjectId))
{
var actList = dictDoorOP[item.ObjectId];
actList.Add(deserialized.Where(x => x.Key != "Folder").ToDictionary(x => x.Key, x => x.Value));
dictDoorOP[item.ObjectId] = actList;
}
else
{
var currList = new List<Dictionary<string, string>>();
currList.Add(deserialized.Where(x => x.Key != "Folder").ToDictionary(x => x.Key, x => x.Value));
dictDoorOP.Add(item.ObjectId, currList);
}
//}
}
}
CurrentDoorOp.doorOpsDict = dictDoorOP;
#endif
// FIXME TODO: si potrebbe eliminare in futuro che va su REDIS
await SaveYaml(currDdf);
// versione corrente del DDF generato
WebDoorCreator.UI/Components/Hardware/HardwareList.razor.cs
+1 -1
View File
@@ -158,10 +158,10 @@ namespace WebDoorCreator.UI.Components.Hardware
actDict.Add(item.Value.Trim(), item.DefaultVal.Trim());
}
}
//defaultParamsList.Add(listDefVal);
defaultDict.Add(item.Value.Trim(), listDefVal);
}
//actDict.Add(HwToShow.TableName, actParamsList);
var jsonDef = JsonConvert.SerializeObject(defaultDict);
WebDoorCreator.UI/temp/Conf.yaml
+31 -12
View File
@@ -3,7 +3,7 @@
#Door1
code: 0015943
date: 2023-04-19T14:59:00.2592242+02:00
date: 2023-04-20T17:46:12.0177337+02:00
material: wood
measures: millimiters
order:
@@ -11,8 +11,7 @@ order:
elevation:
project:
pO:
line:
date: 2023-04-19T12:47:14.6842406+02:00
line:
piece: DO_1
produce: false
profiles:
@@ -39,9 +38,27 @@ size:
thickness: 1.75
swing: RH
version: 2
edge_pulls:
- template: Generic\EdgePull230B
position: 45
ept:
- template: Generic\StdEPT
ToptoCL: 15
FacetoCL: 0.875
face_decoration:
- template: General\Decor_A
type: lines
depth: 0.0625
topdistance: 5.0
bottomdistance: 7.0
lockstiledistance: 4.0
hingestiledistance: 4.0
face: secure
- template: General\Decor_A
type: lines
depth: 0.0625
topdistance: 5.0
bottomdistance: 7.0
lockstiledistance: 4.0
hingestiledistance: 4.0
face: secure
flush_bolts:
- template: Corner\8501
type: corner
@@ -53,11 +70,13 @@ flush_bolts:
side: top
position: 5
offset_WS: 0.0
locks:
- template: Generic\DocMyTest5Bore
position: 45.875
back_set: 2.0
offset_WS: 0.0
side: lock_top
Separator: ' '
groove:
- template: Generic\Groove
type: side
width: 0.6
depth: 0.8
offset_WS: 0
side: bottom
---