mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
RC3 adjustments
* Update icons for summary and ensemble templates * Icons for regression and decline * #10374 LineEditor: Hide the placeholder widget when not used * #10376 Assign a case ID to delta summary case * Do not show decline range text in plot
This commit is contained in:
Magne Sjaastad
GitHub
parent
d3c33ce169
commit
91762aaeb1
@ -145,8 +145,6 @@
|
||||
<file>SummaryPlotLight16x16.png</file>
|
||||
<file>SummaryPlots16x16.png</file>
|
||||
<file>SummaryPlotsLight16x16.png</file>
|
||||
<file>SummaryTemplate16x16.png</file>
|
||||
<file>SummaryEnsembleTemplate16x16.png</file>
|
||||
<file>SummaryXPlotLight16x16.png</file>
|
||||
<file>SummaryXPlotsLight16x16.png</file>
|
||||
<file>Swap.png</file>
|
||||
@ -276,6 +274,10 @@
|
||||
<file>open-text-editor.svg</file>
|
||||
<file>Seismic16x16.png</file>
|
||||
<file>Fullscreen.png</file>
|
||||
<file>plot-template-standard.svg</file>
|
||||
<file>plot-template-ensemble.svg</file>
|
||||
<file>decline-curve.svg</file>
|
||||
<file>regression-curve.svg</file>
|
||||
</qresource>
|
||||
<qresource prefix="/Shader">
|
||||
<file>fs_CellFace.glsl</file>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 743 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB |
83
ApplicationExeCode/Resources/decline-curve.svg
Normal file
83
ApplicationExeCode/Resources/decline-curve.svg
Normal file
@ -0,0 +1,83 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
version="1.1"
|
||||
id="Layer_1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
viewBox="0 0 24 24"
|
||||
style="enable-background:new 0 0 24 24;"
|
||||
xml:space="preserve"
|
||||
sodipodi:docname="decline-curve.svg"
|
||||
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||
id="defs36"><rect
|
||||
x="3.3651412"
|
||||
y="2.1265823"
|
||||
width="18.835443"
|
||||
height="19.793574"
|
||||
id="rect250" /></defs><sodipodi:namedview
|
||||
id="namedview34"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
showgrid="false"
|
||||
inkscape:zoom="42.791667"
|
||||
inkscape:cx="7.8169425"
|
||||
inkscape:cy="11.731256"
|
||||
inkscape:window-width="2560"
|
||||
inkscape:window-height="1369"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="Layer_1" />
|
||||
<style
|
||||
type="text/css"
|
||||
id="style20">
|
||||
.st0{fill:url(#SVGID_1_);stroke:#8F9090;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
|
||||
.st1{fill:none;stroke:#8DC584;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
|
||||
</style>
|
||||
<linearGradient
|
||||
id="SVGID_1_"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="1.1804"
|
||||
y1="12.4846"
|
||||
x2="22.8196"
|
||||
y2="12.4846">
|
||||
<stop
|
||||
offset="1.118836e-07"
|
||||
style="stop-color:#9D9D9C"
|
||||
id="stop22" />
|
||||
<stop
|
||||
offset="0.5652"
|
||||
style="stop-color:#CECECE"
|
||||
id="stop24" />
|
||||
<stop
|
||||
offset="1"
|
||||
style="stop-color:#5C5C5B"
|
||||
id="stop26" />
|
||||
</linearGradient>
|
||||
|
||||
<path
|
||||
class="st1"
|
||||
d="M -0.00605706,15.819399"
|
||||
id="path31"
|
||||
style="stroke:#bd0733;stroke-opacity:1;stroke-width:1.98604205;stroke-dasharray:none" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bd0733;stroke-width:1.565;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
|
||||
d="m 2.4077345,0.80063714 3.81634,8.62890286 5.4896595,4.489577 9.570206,3.94828"
|
||||
id="path4987" /><path
|
||||
style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bd0733;stroke-width:1.465;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
|
||||
d="M 4.700913,5.9856087 C 4.637569,6.0857332 4.5585215,6.1779002 4.5108819,6.2859813 c -0.051071,0.1158674 0.025688,0.1399555 0.053646,0.2353594 0.017368,0.059267 0.01643,0.1222573 0.026823,0.1830572 0.02173,0.1271177 -0.01461,0.2640694 0,0.3922657 0.014935,0.1310479 0.04141,0.2610464 0.053646,0.3922658 0.048669,0.521948 0.048905,1.0459338 0.080469,1.5690624 0.03245,0.5378441 0.1713768,1.0952752 0.2682293,1.6213642 0.1219286,0.662301 0.1819265,1.447159 0.4559901,2.065933 0.08573,0.193562 0.2197557,0.363325 0.3218754,0.549173 0.032154,0.05851 0.050016,0.123679 0.080469,0.183057 0.023315,0.04547 0.065488,0.08207 0.080469,0.130755 0.012846,0.04175 -0.00494,0.08743 0,0.130755 0.01951,0.171195 0.028787,0.04125 0.080469,0.209209 0.015627,0.05078 0.00963,0.1066 0.026823,0.156906 0.036756,0.107507 0.093932,0.207478 0.1341147,0.313812 0.022503,0.05954 0.02671,0.125285 0.053646,0.183058 0.018499,0.03968 0.062313,0.06477 0.080469,0.104608 0.018516,0.04062 0.010812,0.08913 0.026823,0.130755 0.011317,0.02943 0.03923,0.05035 0.053646,0.07846 0.021533,0.04199 0.03004,0.08984 0.053646,0.130755 0.123227,0.213582 0.2781483,0.415727 0.4023441,0.627625 0.028056,0.04786 0.019717,0.112801 0.053646,0.156906 0.011996,0.0156 0.042556,0.01 0.053646,0.02615 0.053416,0.07812 0.067443,0.176041 0.1072916,0.261511 0.073304,0.157229 0.1639831,0.319751 0.2414065,0.470718 0.021533,0.04199 0.028874,0.09051 0.053646,0.130755 0.029455,0.04786 0.077837,0.0829 0.1072916,0.130756 0.024772,0.04025 0.029758,0.08999 0.053646,0.130755 0.035633,0.0608 0.1177174,0.100726 0.1609377,0.156906 0.188053,0.244457 0.3947491,0.511867 0.6437506,0.706079 0.1090581,0.08506 0.2111754,0.17849 0.3218753,0.26151 0.070868,0.05315 0.2034612,0.09376 0.2682295,0.156907 0.014136,0.01379 0.012685,0.03852 0.026823,0.0523 0.066825,0.06515 0.1647891,0.107104 0.2414065,0.156906 0.1495494,0.0972 0.2685552,0.235518 0.429166,0.313812 0.1569328,0.0765 0.3218278,0.120276 0.4828142,0.183058 0.2988,0.116525 0.577056,0.265986 0.885156,0.366114 0.104921,0.0341 0.218324,0.04059 0.321876,0.07846 0.123202,0.04504 0.209522,0.123309 0.321875,0.183057 0.118556,0.06305 0.255475,0.09839 0.375522,0.156907 0.02262,0.01108 0.03102,0.04127 0.05365,0.0523 0.02529,0.01233 0.05365,0.01744 0.08047,0.02615 0.03577,0.02615 0.06731,0.05896 0.107296,0.07846 0.197301,0.09618 0.411981,0.134277 0.616928,0.209208 0.06984,0.02554 0.08222,0.05926 0.160938,0.07846 0.07997,0.01949 0.164871,0.02246 0.241406,0.0523 0.05987,0.02334 0.101419,0.08043 0.160938,0.104609 0.05021,0.0204 0.108846,0.01097 0.160938,0.02615 0.07668,-0.04755 0.09227,0.05806 0.134114,0.07846 0.09314,0.04541 0.361754,0.177092 0.375521,0.183057 0.15118,0.06551 0.329875,0.07484 0.482813,0.130755 0.03019,0.01108 0.05365,0.03487 0.08047,0.0523 0.08941,0.02615 0.17767,0.05638 0.26823,0.07846 0.169084,0.04121 0.342197,0.08995 0.509635,0.130755 0.08109,0.01976 0.115289,-0.0029 0.214584,0.02615 0.159612,0.04669 0.317757,0.09858 0.482812,0.130756 0.0526,0.01029 0.107836,-0.0074 0.160938,0 0.459431,0.06399 -0.427927,-0.01818 0.295053,0.0523 0.02669,0.0026 0.05468,-0.0072 0.08047,0 0.105575,0.02941 0.216432,0.09649 0.321875,0.130755 0.05684,0.01848 0.161249,0.0263 0.214584,0.05231 0.01136,0.0055 0.01471,0.0226 0.02682,0.02615 0.372467,0.108939 0.750049,0.161396 1.126563,0.26151 0.154563,0.0411 0.299894,0.116323 0.455991,0.156907 0.06109,0.01588 0.126157,0.01229 0.18776,0.02615 0.129799,0.02921 0.175355,0.0523 0.295052,0.0523"
|
||||
id="path11967" /><path
|
||||
style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bd0733;stroke-width:1.365;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
|
||||
d="m 4.1142342,4.6591036 c 0.7162731,0.3603528 0.3547182,0.096268 0.6917,0.4500807 0.060227,0.063236 0.1314934,0.1164444 0.1877606,0.1830573 0.3092215,0.3660775 0.5492063,0.7846792 0.8583342,1.1506459 0.056267,0.066613 0.127533,0.1198216 0.1877606,0.1830573 0.2314472,0.2430074 0.08879,0.1322094 0.3486983,0.3661146 0.1287487,0.1158681 0.2786617,0.2193789 0.4023441,0.339964 0.045591,0.044449 0.066017,0.1086147 0.1072916,0.156906 0.1235958,0.1445999 0.35606,0.326915 0.5096358,0.4184161 0.065183,0.038842 0.148257,0.041505 0.2145835,0.078456 0.06063,0.033784 0.1044623,0.09071 0.1609377,0.1307562 0.3349201,0.2374762 0.7593845,0.4678622 1.1533866,0.601473 0.3228228,0.1094764 0.6730628,0.1396649 0.9924492,0.2615112 0.3681446,0.1404482 0.7257936,0.3177567 1.0997406,0.444567 0.192644,0.06533 0.423003,0.09936 0.616927,0.1569072 0.390938,0.1160003 0.213279,0.095712 0.616928,0.235359 0.167892,0.058079 0.341867,0.098487 0.509637,0.156906 0.08293,0.028872 0.157867,0.077461 0.241406,0.1046089 0.291747,0.09482 0.03668,-0.04749 0.295052,0.07846 0.217191,0.105873 0.423964,0.238462 0.64375,0.339964 0.174056,0.08038 0.35696,0.141152 0.53646,0.209208 0.26904,0.102002 0.578063,0.171066 0.858334,0.235361 0.05294,0.01214 0.10896,0.01052 0.160937,0.02615 0.06508,0.01953 0.123163,0.05746 0.187761,0.07846 0.06995,0.02273 0.143055,0.03487 0.214584,0.0523 0.116233,0.03487 0.234276,0.06445 0.348697,0.10461 0.109363,0.03838 0.210293,0.09902 0.321876,0.130755 0.183491,0.05218 0.377852,0.05941 0.563282,0.104608 0.457244,0.111446 0.920729,0.220769 1.36797,0.366116 0.266491,0.0866 -0.0031,0.01159 0.295053,0.156906 0.178495,0.08702 0.497598,0.229223 0.697396,0.287661 0.04366,0.01277 0.09142,0.01052 0.134115,0.02615 0.07031,-0.02292 0.06578,0.06226 0.107296,0.07846 0.115291,0.04496 0.235516,0.07558 0.348699,0.130756 0.01136,0.0055 0.01788,0.01744 0.02682,0.02615 0.03577,0.01743 0.07089,0.03617 0.107296,0.0523 0.135046,0.05985 0.302484,0.10895 0.429167,0.183057 0.02168,0.01269 0.03102,0.04127 0.05365,0.0523 0.016,0.0078 0.03668,-0.0055 0.05365,0 0.04646,0.0151 0.09108,0.08363 0.134115,0.104608 0.03298,0.01607 0.07277,0.01353 0.107297,0.02615 0.114998,0.04204 0.229542,0.101711 0.348697,0.130755 0.17801,0.04339 0.381906,0.0302 0.563282,0.05231 0.08635,0.01052 0.02598,0.02574 0.08047,0.0523 0.100512,0.04899 0.198343,0.04174 0.295051,0.104608"
|
||||
id="path11973" /></svg>
|
||||
|
After Width: | Height: | Size: 8.4 KiB |
84
ApplicationExeCode/Resources/plot-template-ensemble.svg
Normal file
84
ApplicationExeCode/Resources/plot-template-ensemble.svg
Normal file
@ -0,0 +1,84 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
version="1.1"
|
||||
id="Layer_1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
viewBox="0 0 24 24"
|
||||
style="enable-background:new 0 0 24 24;"
|
||||
xml:space="preserve"
|
||||
sodipodi:docname="plot-template-ensemble.svg"
|
||||
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||
id="defs36"><rect
|
||||
x="3.3651412"
|
||||
y="2.1265823"
|
||||
width="18.835443"
|
||||
height="19.793574"
|
||||
id="rect250" /></defs><sodipodi:namedview
|
||||
id="namedview34"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
showgrid="false"
|
||||
inkscape:zoom="42.791667"
|
||||
inkscape:cx="8.5881207"
|
||||
inkscape:cy="11.684518"
|
||||
inkscape:window-width="2560"
|
||||
inkscape:window-height="1369"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="Layer_1" />
|
||||
<style
|
||||
type="text/css"
|
||||
id="style20">
|
||||
.st0{fill:url(#SVGID_1_);stroke:#8F9090;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
|
||||
.st1{fill:none;stroke:#8DC584;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
|
||||
</style>
|
||||
<linearGradient
|
||||
id="SVGID_1_"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="1.1804"
|
||||
y1="12.4846"
|
||||
x2="22.8196"
|
||||
y2="12.4846">
|
||||
<stop
|
||||
offset="1.118836e-07"
|
||||
style="stop-color:#9D9D9C"
|
||||
id="stop22" />
|
||||
<stop
|
||||
offset="0.5652"
|
||||
style="stop-color:#CECECE"
|
||||
id="stop24" />
|
||||
<stop
|
||||
offset="1"
|
||||
style="stop-color:#5C5C5B"
|
||||
id="stop26" />
|
||||
</linearGradient>
|
||||
|
||||
<path
|
||||
class="st1"
|
||||
d="M1.72,17.75"
|
||||
id="path31" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-size:24.1697px;fill:#5F6368;stroke-width:13.7989"
|
||||
x="3.2187378"
|
||||
y="21.453714"
|
||||
id="text320"
|
||||
transform="scale(1.0556178,0.94731255)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan318"
|
||||
x="3.2187378"
|
||||
y="21.453714"
|
||||
style="stroke-width:13.7989">E</tspan></text></svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
84
ApplicationExeCode/Resources/plot-template-standard.svg
Normal file
84
ApplicationExeCode/Resources/plot-template-standard.svg
Normal file
@ -0,0 +1,84 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
version="1.1"
|
||||
id="Layer_1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
viewBox="0 0 24 24"
|
||||
style="enable-background:new 0 0 24 24;"
|
||||
xml:space="preserve"
|
||||
sodipodi:docname="plot-template-standard.svg"
|
||||
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||
id="defs36"><rect
|
||||
x="3.3651412"
|
||||
y="2.1265823"
|
||||
width="18.835443"
|
||||
height="19.793574"
|
||||
id="rect250" /></defs><sodipodi:namedview
|
||||
id="namedview34"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
showgrid="false"
|
||||
inkscape:zoom="42.791667"
|
||||
inkscape:cx="5.1996105"
|
||||
inkscape:cy="12.36222"
|
||||
inkscape:window-width="2560"
|
||||
inkscape:window-height="1369"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="Layer_1" />
|
||||
<style
|
||||
type="text/css"
|
||||
id="style20">
|
||||
.st0{fill:url(#SVGID_1_);stroke:#8F9090;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
|
||||
.st1{fill:none;stroke:#8DC584;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
|
||||
</style>
|
||||
<linearGradient
|
||||
id="SVGID_1_"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="1.1804"
|
||||
y1="12.4846"
|
||||
x2="22.8196"
|
||||
y2="12.4846">
|
||||
<stop
|
||||
offset="1.118836e-07"
|
||||
style="stop-color:#9D9D9C"
|
||||
id="stop22" />
|
||||
<stop
|
||||
offset="0.5652"
|
||||
style="stop-color:#CECECE"
|
||||
id="stop24" />
|
||||
<stop
|
||||
offset="1"
|
||||
style="stop-color:#5C5C5B"
|
||||
id="stop26" />
|
||||
</linearGradient>
|
||||
|
||||
<path
|
||||
class="st1"
|
||||
d="M1.72,17.75"
|
||||
id="path31" />
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-size:22.7244px;fill:#5F6368;stroke-width:12.9737"
|
||||
x="4.0029178"
|
||||
y="21.346537"
|
||||
id="text348"
|
||||
transform="scale(1.09047,0.91703578)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan346"
|
||||
x="4.0029178"
|
||||
y="21.346537"
|
||||
style="stroke-width:12.9737">T</tspan></text></svg>
|
||||
|
After Width: | Height: | Size: 2.3 KiB |
117
ApplicationExeCode/Resources/regression-curve.svg
Normal file
117
ApplicationExeCode/Resources/regression-curve.svg
Normal file
@ -0,0 +1,117 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
|
||||
<svg
|
||||
version="1.1"
|
||||
id="Layer_1"
|
||||
x="0px"
|
||||
y="0px"
|
||||
viewBox="0 0 24 24"
|
||||
style="enable-background:new 0 0 24 24;"
|
||||
xml:space="preserve"
|
||||
sodipodi:docname="regression-curve.svg"
|
||||
inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"><defs
|
||||
id="defs36"><linearGradient
|
||||
id="linearGradient1188"
|
||||
inkscape:swatch="gradient"><stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop1184" /><stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop1186" /></linearGradient><rect
|
||||
x="3.3651412"
|
||||
y="2.1265823"
|
||||
width="18.835443"
|
||||
height="19.793574"
|
||||
id="rect250" /></defs><sodipodi:namedview
|
||||
id="namedview34"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
showgrid="false"
|
||||
inkscape:zoom="7.5645695"
|
||||
inkscape:cx="-53.076385"
|
||||
inkscape:cy="34.63515"
|
||||
inkscape:window-width="2560"
|
||||
inkscape:window-height="1369"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="Layer_1" />
|
||||
<style
|
||||
type="text/css"
|
||||
id="style20">
|
||||
.st0{fill:url(#SVGID_1_);stroke:#8F9090;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
|
||||
.st1{fill:none;stroke:#8DC584;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
|
||||
</style>
|
||||
<linearGradient
|
||||
id="SVGID_1_"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="1.1804"
|
||||
y1="12.4846"
|
||||
x2="22.8196"
|
||||
y2="12.4846">
|
||||
<stop
|
||||
offset="1.118836e-07"
|
||||
style="stop-color:#9D9D9C"
|
||||
id="stop22" />
|
||||
<stop
|
||||
offset="0.5652"
|
||||
style="stop-color:#CECECE"
|
||||
id="stop24" />
|
||||
<stop
|
||||
offset="1"
|
||||
style="stop-color:#5C5C5B"
|
||||
id="stop26" />
|
||||
</linearGradient>
|
||||
|
||||
|
||||
<ellipse
|
||||
style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.428;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1331"
|
||||
cx="15.38851"
|
||||
cy="2.4771178"
|
||||
rx="1.8812073"
|
||||
ry="1.6592015" /><ellipse
|
||||
style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.428;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1331-3"
|
||||
cx="9.4047928"
|
||||
cy="7.4029331"
|
||||
rx="1.8812073"
|
||||
ry="1.6592015" /><ellipse
|
||||
style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.428;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1331-4"
|
||||
cx="22.297638"
|
||||
cy="7.4029331"
|
||||
rx="1.8812073"
|
||||
ry="1.6592015" /><ellipse
|
||||
style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.428;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1331-2"
|
||||
cx="5.7637262"
|
||||
cy="20.495371"
|
||||
rx="1.8812073"
|
||||
ry="1.6592015" /><ellipse
|
||||
style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.428;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1331-1"
|
||||
cx="20.027578"
|
||||
cy="13.672131"
|
||||
rx="1.8812073"
|
||||
ry="1.6592015" /><ellipse
|
||||
style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.428;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path1331-8"
|
||||
cx="12"
|
||||
cy="19.498796"
|
||||
rx="1.8812073"
|
||||
ry="1.6592015" /><path
|
||||
style="fill:#000000;fill-opacity:1;stroke:#940e44;stroke-width:2.128;stroke-miterlimit:3.4;stroke-dasharray:none;stroke-opacity:1"
|
||||
d="M 2.5576649,21.966894 21.767013,0.63096397"
|
||||
id="path1387" /></svg>
|
||||
|
After Width: | Height: | Size: 3.8 KiB |
@ -53,5 +53,5 @@ void RicCreateMultiPlotFromSelectionFeature::onActionTriggered( bool isChecked )
|
||||
void RicCreateMultiPlotFromSelectionFeature::setupActionLook( QAction* actionToSetup )
|
||||
{
|
||||
actionToSetup->setText( "Create Summary Plot from Template" );
|
||||
actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
|
||||
actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ void RicCreatePlotFromTemplateByShortcutFeature::onActionTriggered( bool isCheck
|
||||
void RicCreatePlotFromTemplateByShortcutFeature::setupActionLook( QAction* actionToSetup )
|
||||
{
|
||||
actionToSetup->setText( "Create Plot from Last Used Template" );
|
||||
actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
|
||||
actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
|
||||
|
||||
QKeySequence keySeq( Qt::CTRL, Qt::Key_T );
|
||||
|
||||
|
||||
@ -289,7 +289,7 @@ void RicSaveMultiPlotTemplateFeature::replaceStrings( const std::set<QString>& s
|
||||
void RicSaveMultiPlotTemplateFeature::setupActionLook( QAction* actionToSetup )
|
||||
{
|
||||
actionToSetup->setText( "Save As Plot Template" );
|
||||
actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
|
||||
actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -63,7 +63,7 @@ void RicSetAsDefaultTemplateFeature::onActionTriggered( bool isChecked )
|
||||
void RicSetAsDefaultTemplateFeature::setupActionLook( QAction* actionToSetup )
|
||||
{
|
||||
actionToSetup->setText( "Default Template" );
|
||||
// actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
|
||||
// actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
|
||||
|
||||
RimPlotTemplateFileItem* file = selectedTemplate();
|
||||
if ( file != nullptr )
|
||||
|
||||
@ -71,7 +71,7 @@ void RicCreateDeclineCurvesFeature::onActionTriggered( bool isChecked )
|
||||
void RicCreateDeclineCurvesFeature::setupActionLook( QAction* actionToSetup )
|
||||
{
|
||||
actionToSetup->setText( "Create Decline Curves" );
|
||||
actionToSetup->setIcon( QIcon( ":/SummaryCurve16x16.png" ) );
|
||||
actionToSetup->setIcon( QIcon( ":/decline-curve.svg" ) );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -64,7 +64,7 @@ void RicCreateRegressionAnalysisCurveFeature::onActionTriggered( bool isChecked
|
||||
void RicCreateRegressionAnalysisCurveFeature::setupActionLook( QAction* actionToSetup )
|
||||
{
|
||||
actionToSetup->setText( "Create Regression Analysis Curve" );
|
||||
actionToSetup->setIcon( QIcon( ":/SummaryCurve16x16.png" ) );
|
||||
actionToSetup->setIcon( QIcon( ":/regression-curve.svg" ) );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -79,6 +79,8 @@ void RicNewDerivedSummaryFeature::onActionTriggered( bool isChecked )
|
||||
derivedCase->createSummaryReaderInterface();
|
||||
}
|
||||
|
||||
RimProject::current()->assignCaseIdToSummaryCase( derivedCase );
|
||||
|
||||
mainColl->addCase( derivedCase );
|
||||
derivedCase->updateDisplayNameFromCases();
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RimPlotTemplateFileItem, "PlotTemplateFileItem" );
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimPlotTemplateFileItem::RimPlotTemplateFileItem()
|
||||
{
|
||||
CAF_PDM_InitObject( "PlotTemplateFileItem", ":/SummaryTemplate16x16.png", "Plot Template", "" );
|
||||
CAF_PDM_InitObject( "PlotTemplateFileItem", ":/plot-template-standard.svg", "Plot Template", "" );
|
||||
|
||||
CAF_PDM_InitField( &m_absoluteFileName, "AbsolutePath", QString(), "Location" );
|
||||
m_absoluteFileName.uiCapability()->setUiReadOnly( true );
|
||||
@ -57,7 +57,7 @@ void RimPlotTemplateFileItem::setFilePath( const QString& filePath )
|
||||
|
||||
m_absoluteFileName = filePath;
|
||||
|
||||
if ( isEnsembleTemplate() ) this->uiCapability()->setUiIcon( caf::IconProvider( ":/SummaryEnsembleTemplate16x16.png" ) );
|
||||
if ( isEnsembleTemplate() ) this->uiCapability()->setUiIcon( caf::IconProvider( ":/plot-template-ensemble.svg" ) );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -243,8 +243,8 @@ void RimPlotTemplateFolderItem::appendOptionItemsForPlotTemplatesRecursively( QL
|
||||
}
|
||||
}
|
||||
|
||||
caf::IconProvider templateIcon( ":/SummaryTemplate16x16.png" );
|
||||
caf::IconProvider ensTemplateIcon( ":/SummaryEnsembleTemplate16x16.png" );
|
||||
caf::IconProvider templateIcon( ":/plot-template-standard.svg" );
|
||||
caf::IconProvider ensTemplateIcon( ":/plot-template-ensemble.svg" );
|
||||
|
||||
auto files = templateFolderItem->fileItems();
|
||||
for ( auto file : files )
|
||||
|
||||
@ -54,7 +54,7 @@ void caf::AppEnum<RimSummaryDeclineCurve::DeclineCurveType>::setUp()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryDeclineCurve::RimSummaryDeclineCurve()
|
||||
{
|
||||
CAF_PDM_InitObject( "Decline Curve", ":/SummaryCurve16x16.png" );
|
||||
CAF_PDM_InitObject( "Decline Curve", ":/decline-curve.svg" );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &m_declineCurveType, "DeclineCurveType", "Type" );
|
||||
CAF_PDM_InitField( &m_predictionYears, "PredictionYears", 5, "Years" );
|
||||
@ -424,6 +424,7 @@ void RimSummaryDeclineCurve::updateTimeAnnotations()
|
||||
{
|
||||
m_timeRangeAnnotation = plot->addTimeRangeAnnotation( m_minTimeStep, m_maxTimeStep );
|
||||
m_timeRangeAnnotation->setColor( color() );
|
||||
m_timeRangeAnnotation->setName( "" );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -72,7 +72,7 @@ void caf::AppEnum<RimSummaryRegressionAnalysisCurve::ForecastUnit>::setUp()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryRegressionAnalysisCurve::RimSummaryRegressionAnalysisCurve()
|
||||
{
|
||||
CAF_PDM_InitObject( "Regression Analysis Curve", ":/SummaryCurve16x16.png" );
|
||||
CAF_PDM_InitObject( "Regression Analysis Curve", ":/regression-curve.svg" );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &m_regressionType, "RegressionType", "Type" );
|
||||
CAF_PDM_InitField( &m_forecastForward, "ForecastForward", 0, "Forward" );
|
||||
@ -192,6 +192,8 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
|
||||
else if ( m_regressionType == RegressionType::POWER_FIT )
|
||||
{
|
||||
auto [filteredTimeSteps, filteredValues] = getPositiveValues( timeStepsD, valuesInRange );
|
||||
if ( filteredTimeSteps.empty() || filteredValues.empty() ) return {};
|
||||
|
||||
regression::PowerFitRegression powerFitRegression;
|
||||
powerFitRegression.fit( filteredTimeSteps, filteredValues );
|
||||
std::vector<double> predictedValues = powerFitRegression.predict( outputTimeStepsD );
|
||||
@ -200,6 +202,8 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
|
||||
else if ( m_regressionType == RegressionType::EXPONENTIAL )
|
||||
{
|
||||
auto [filteredTimeSteps, filteredValues] = getPositiveValues( timeStepsD, valuesInRange );
|
||||
if ( filteredTimeSteps.empty() || filteredValues.empty() ) return {};
|
||||
|
||||
regression::ExponentialRegression exponentialRegression;
|
||||
exponentialRegression.fit( filteredTimeSteps, filteredValues );
|
||||
std::vector<double> predictedValues = exponentialRegression.predict( outputTimeStepsD );
|
||||
@ -208,6 +212,8 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
|
||||
else if ( m_regressionType == RegressionType::LOGARITHMIC )
|
||||
{
|
||||
auto [filteredTimeSteps, filteredValues] = getPositiveValues( timeStepsD, valuesInRange );
|
||||
if ( filteredTimeSteps.empty() || filteredValues.empty() ) return {};
|
||||
|
||||
regression::LogarithmicRegression logarithmicRegression;
|
||||
logarithmicRegression.fit( filteredTimeSteps, filteredValues );
|
||||
std::vector<double> predictedValues = logarithmicRegression.predict( outputTimeStepsD );
|
||||
|
||||
@ -320,7 +320,7 @@ QIcon RiuDockWidgetTools::dockIcon( const QString dockWidgetName )
|
||||
else if ( dockWidgetName == plotMainWindowDataSourceTreeName() )
|
||||
return QIcon( ":/data-sources.svg" );
|
||||
else if ( dockWidgetName == plotMainWindowTemplateTreeName() )
|
||||
return QIcon( ":/SummaryTemplate16x16.png" );
|
||||
return QIcon( ":/plot-template-standard.svg" );
|
||||
else if ( dockWidgetName == plotMainWindowScriptsTreeName() )
|
||||
return QIcon( ":/scripts.svg" );
|
||||
else if ( dockWidgetName == plotMainWindowPropertyEditorName() )
|
||||
|
||||
@ -107,9 +107,12 @@ QWidget* PdmUiLineEditor::createEditorWidget( QWidget* parent )
|
||||
if ( uiField()->isAutoValueSupported() )
|
||||
{
|
||||
// If we return the placeholder widget to be used in a table editor, Qt will crash when the editor is closed
|
||||
m_placeholder->show();
|
||||
return m_placeholder;
|
||||
}
|
||||
|
||||
m_placeholder->hide();
|
||||
|
||||
// Return line edit if no auto value is supported
|
||||
return m_lineEdit;
|
||||
}
|
||||
|
||||
@ -5,7 +5,7 @@ set(RESINSIGHT_PATCH_VERSION 0)
|
||||
|
||||
# Opional text with no restrictions
|
||||
#set(RESINSIGHT_VERSION_TEXT "-dev")
|
||||
set(RESINSIGHT_VERSION_TEXT "-RC_01")
|
||||
set(RESINSIGHT_VERSION_TEXT "-RC_03")
|
||||
|
||||
# Optional text
|
||||
# Must be unique and increasing within one combination of major/minor/patch version
|
||||
|
||||
Loading…
Reference in New Issue
Block a user