Merge pull request #74 from Polyplastic/#65_#71

#65 #71 доработки
Polyplastic · Dec 30, 2021 · d2d3576 · d2d3576
2 parents fdcaf3a + ca9bb9e
commit d2d3576
Show file tree

Hide file tree

Showing 17 changed files with 10,310 additions and 5,698 deletions.
diff --git a/parsing-tech-log-plugins/DT-INF/PROJECT.PMF b/parsing-tech-log-plugins/DT-INF/PROJECT.PMF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Runtime-Version: 8.3.16
+Runtime-Version: 8.3.17
 Base-Project: parsing-tech-log
diff --git a/parsing-tech-log-plugins/bin/МониторRAS_1C.epf b/parsing-tech-log-plugins/bin/МониторRAS_1C.epf
diff --git a/...DataProcessors/МониторRAS_1C/Forms/ФормаМонитора/Attributes/Диаграмма/ExtInfo/Chart.chart b/...DataProcessors/МониторRAS_1C/Forms/ФормаМонитора/Attributes/Диаграмма/ExtInfo/Chart.chart
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<chart:Chart xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:chart="http://g5.1c.ru/v8/dt/chart/model" xmlns:core="http://g5.1c.ru/v8/dt/mcore" xmlns:platform="http://g5.1c.ru/v8/dt/platform/model">
+<chart:Chart xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:chart="http://g5.1c.ru/v8/dt/chart/model" xmlns:core="http://g5.1c.ru/v8/dt/mcore">
   <seriesCurId>1</seriesCurId>
   <isSeriesDesign>true</isSeriesDesign>
   <realExSeriesData>
@@ -22,13 +22,12 @@
   <curSeries>-1</curSeries>
   <chartType>Column3D</chartType>
   <labelsDelimiter>, </labelsDelimiter>
-  <labelsColor xsi:type="platform:PlatformColor">
-    <name>Style.FormTextColor</name>
+  <labelsColor xsi:type="core:ColorDef">
     <red>51</red>
     <green>51</green>
     <blue>51</blue>
-    <compositeId>-3:00000000-0000-0000-0000-000000000000</compositeId>
   </labelsColor>
+  <labelsFont xsi:type="core:AutoFont"/>
   <transparentLabelsBkg>true</transparentLabelsBkg>
   <labelsBorder xsi:type="core:BorderDef">
     <style>Single</style>
@@ -37,78 +36,61 @@
   <isShowTitle>true</isShowTitle>
   <isShowLegend>true</isShowLegend>
   <ttlBorder xsi:type="core:BorderDef"/>
-  <ttlBorderColor xsi:type="platform:PlatformColor">
-    <name>Style.BorderColor</name>
+  <ttlBorderColor xsi:type="core:ColorDef">
     <red>160</red>
     <green>160</green>
     <blue>160</blue>
-    <compositeId>-22:00000000-0000-0000-0000-000000000000</compositeId>
   </ttlBorderColor>
   <lgBorder xsi:type="core:BorderDef"/>
-  <lgBorderColor xsi:type="platform:PlatformColor">
-    <name>Style.BorderColor</name>
+  <lgBorderColor xsi:type="core:ColorDef">
     <red>160</red>
     <green>160</green>
     <blue>160</blue>
-    <compositeId>-22:00000000-0000-0000-0000-000000000000</compositeId>
   </lgBorderColor>
   <chBorder xsi:type="core:BorderDef"/>
-  <chBorderColor xsi:type="platform:PlatformColor">
-    <name>Style.BorderColor</name>
+  <chBorderColor xsi:type="core:ColorDef">
     <red>160</red>
     <green>160</green>
     <blue>160</blue>
-    <compositeId>-22:00000000-0000-0000-0000-000000000000</compositeId>
   </chBorderColor>
-  <bkgColor xsi:type="platform:PlatformColor">
-    <name>Style.FieldBackColor</name>
+  <bkgColor xsi:type="core:ColorDef">
     <red>255</red>
     <green>255</green>
     <blue>255</blue>
-    <compositeId>-10:00000000-0000-0000-0000-000000000000</compositeId>
   </bkgColor>
-  <ttlColor xsi:type="platform:PlatformColor">
-    <name>Style.FieldBackColor</name>
+  <ttlColor xsi:type="core:ColorDef">
     <red>255</red>
     <green>255</green>
     <blue>255</blue>
-    <compositeId>-10:00000000-0000-0000-0000-000000000000</compositeId>
   </ttlColor>
-  <legColor xsi:type="platform:PlatformColor">
-    <name>Style.FieldBackColor</name>
+  <legColor xsi:type="core:ColorDef">
     <red>255</red>
     <green>255</green>
     <blue>255</blue>
-    <compositeId>-10:00000000-0000-0000-0000-000000000000</compositeId>
   </legColor>
-  <chColor xsi:type="platform:PlatformColor">
-    <name>Style.FieldBackColor</name>
+  <chColor xsi:type="core:ColorDef">
     <red>255</red>
     <green>255</green>
     <blue>255</blue>
-    <compositeId>-10:00000000-0000-0000-0000-000000000000</compositeId>
   </chColor>
-  <ttlTxtColor xsi:type="platform:PlatformColor">
-    <name>Style.FormTextColor</name>
+  <ttlTxtColor xsi:type="core:ColorDef">
     <red>51</red>
     <green>51</green>
     <blue>51</blue>
-    <compositeId>-3:00000000-0000-0000-0000-000000000000</compositeId>
   </ttlTxtColor>
-  <legTxtColor xsi:type="platform:PlatformColor">
-    <name>Style.FormTextColor</name>
+  <legTxtColor xsi:type="core:ColorDef">
     <red>51</red>
     <green>51</green>
     <blue>51</blue>
-    <compositeId>-3:00000000-0000-0000-0000-000000000000</compositeId>
   </legTxtColor>
-  <chTxtColor xsi:type="platform:PlatformColor">
-    <name>Style.FormTextColor</name>
+  <chTxtColor xsi:type="core:ColorDef">
     <red>51</red>
     <green>51</green>
     <blue>51</blue>
-    <compositeId>-3:00000000-0000-0000-0000-000000000000</compositeId>
   </chTxtColor>
+  <ttlFont xsi:type="core:AutoFont"/>
+  <legFont xsi:type="core:AutoFont"/>
+  <chFont xsi:type="core:AutoFont"/>
   <isShowScale>true</isShowScale>
   <isShowScaleVL>true</isShowScaleVL>
   <isShowSeriesScale>true</isShowSeriesScale>
@@ -165,24 +147,17 @@
     <left>0.8328</left>
     <bottom>0.953</bottom>
   </elementsTitle>
-  <borderColor xsi:type="platform:PlatformColor">
-    <name>Style.BorderColor</name>
+  <borderColor xsi:type="core:ColorDef">
     <red>160</red>
     <green>160</green>
     <blue>160</blue>
-    <compositeId>-22:00000000-0000-0000-0000-000000000000</compositeId>
   </borderColor>
   <border xsi:type="core:BorderDef">
     <style>Single</style>
     <width>1</width>
   </border>
-  <dataSourceDescription></dataSourceDescription>
   <splineStrain>95</splineStrain>
   <translucenceMode>Auto</translucenceMode>
-  <translucencePercent>255</translucencePercent>
-  <funnelNeckHeightPercent>0.1</funnelNeckHeightPercent>
-  <funnelNeckWidthPercent>0.1</funnelNeckWidthPercent>
-  <funnelGapSumPercent>0.03</funnelGapSumPercent>
   <multiStageLinkLine>
     <width>1</width>
     <style>Solid</style>
@@ -242,14 +217,31 @@
     <titlePlacement>SpecialArea</titlePlacement>
     <labelOrientation>Auto</labelOrientation>
   </seriesScale>
-  <colorPaletteDescription>
-    <colorPalette>Auto</colorPalette>
-  </colorPaletteDescription>
+  <colorPaletteDescription/>
   <referenceBandsColorPaletteDescription>
     <colorPalette>Auto</colorPalette>
   </referenceBandsColorPaletteDescription>
   <valuesReferenceLines/>
   <pointsReferenceLines/>
   <valuesReferenceBands/>
   <pointsReferenceBands/>
+  <additionalValuesScale>
+    <titleArea>
+      <location>Auto</location>
+      <transparent>true</transparent>
+      <border xsi:type="core:BorderDef">
+        <width>1</width>
+      </border>
+      <marker>Auto</marker>
+      <orientation>Auto</orientation>
+    </titleArea>
+    <titlePlacement>SpecialArea</titlePlacement>
+    <labelOrientation>Auto</labelOrientation>
+  </additionalValuesScale>
+  <additionalValuesAxis>
+    <interval>
+      <leftIsNum>true</leftIsNum>
+      <rightIsNum>true</rightIsNum>
+    </interval>
+  </additionalValuesAxis>
 </chart:Chart>
diff --git a/...src/ExternalDataProcessors/МониторRAS_1C/Forms/ФормаМонитора/ConditionalAppearance.dcssca b/...src/ExternalDataProcessors/МониторRAS_1C/Forms/ФормаМонитора/ConditionalAppearance.dcssca
@@ -18,7 +18,7 @@
 		</filter>
 		<appearance>
 			<dcscor:item xsi:type="SettingsParameterValue">
-				<dcscor:parameter>BackColor</dcscor:parameter>
+				<dcscor:parameter>ЦветФона</dcscor:parameter>
 				<dcscor:value xsi:type="v8ui:Color">#F7FFC8</dcscor:value>
 			</dcscor:item>
 		</appearance>
@@ -41,7 +41,7 @@
 		</filter>
 		<appearance>
 			<dcscor:item xsi:type="SettingsParameterValue">
-				<dcscor:parameter>BackColor</dcscor:parameter>
+				<dcscor:parameter>ЦветФона</dcscor:parameter>
 				<dcscor:value xsi:type="v8ui:Color">#FFC8D3</dcscor:value>
 			</dcscor:item>
 		</appearance>