Skip to content

Ol energydemand tab rename+companyui savings parameters added #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AteZenmo merged 2 commits into from
Jan 22, 2026
Merged

Ol energydemand tab rename+companyui savings parameters added #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb0f086
OL_energydemandTab-rename+companyui_savings_parameters_added
AteZenmo Jan 21, 2026
622dce8
Merge branch 'main' into OL_energydemandTab-rename+companyui_savings_…
AteZenmo Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zero_Interface-Loader.alpx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</OptionList>
<OptionList>
<Id>1709718356700</Id>
<Name><![CDATA[EnergyDemandTab]]></Name>
<Name><![CDATA[OL_CustomScenarioTabs]]></Name>
<Option>
<Id>1709718356702</Id>
<Name><![CDATA[MOBILITY]]></Name>
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/UI_Tabs/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*ALCODEEND*/}

double f_setTab(EnergyDemandTab tab)
double f_setTab(OL_CustomScenarioTabs tab)
{/*ALCODESTART::1722259092945*/
v_selectedTabType = tab;
f_showCorrectTab();
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/UI_Tabs/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<ShowLabel>true</ShowLabel>
<Parameter>
<Name><![CDATA[tab]]></Name>
<Type><![CDATA[EnergyDemandTab]]></Type>
<Type><![CDATA[OL_CustomScenarioTabs]]></Type>
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
Expand Down
12 changes: 4 additions & 8 deletions _alp/Agents/UI_Tabs/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
<ShowLabel>false</ShowLabel>
<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
<VisibleCode>!pop_tabElectricity.isEmpty()</VisibleCode>
<OnClickCode>v_selectedTabType = EnergyDemandTab.ELECTRICITY;
f_showCorrectTab();</OnClickCode>
<OnClickCode>f_setTab(OL_CustomScenarioTabs.ELECTRICITY);</OnClickCode>
<EmbeddedIcon>false</EmbeddedIcon>
<Z>0</Z>
<Rotation>0.0</Rotation>
Expand Down Expand Up @@ -105,8 +104,7 @@ f_showCorrectTab();</OnClickCode>
<ShowLabel>false</ShowLabel>
<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
<VisibleCode>!pop_tabHeating.isEmpty()</VisibleCode>
<OnClickCode>v_selectedTabType = EnergyDemandTab.HEAT;
f_showCorrectTab();</OnClickCode>
<OnClickCode>f_setTab(OL_CustomScenarioTabs.HEAT);</OnClickCode>
<EmbeddedIcon>false</EmbeddedIcon>
<Z>0</Z>
<Rotation>0.0</Rotation>
Expand Down Expand Up @@ -179,8 +177,7 @@ f_showCorrectTab();</OnClickCode>
<ShowLabel>false</ShowLabel>
<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
<VisibleCode>!pop_tabMobility.isEmpty()</VisibleCode>
<OnClickCode>v_selectedTabType = EnergyDemandTab.MOBILITY;
f_showCorrectTab();</OnClickCode>
<OnClickCode>f_setTab(OL_CustomScenarioTabs.MOBILITY);</OnClickCode>
<EmbeddedIcon>false</EmbeddedIcon>
<Z>0</Z>
<Rotation>0.0</Rotation>
Expand Down Expand Up @@ -253,8 +250,7 @@ f_showCorrectTab();</OnClickCode>
<ShowLabel>false</ShowLabel>
<DrawMode>SHAPE_DRAW_2D3D</DrawMode>
<VisibleCode>!pop_tabEHub.isEmpty()</VisibleCode>
<OnClickCode>v_selectedTabType = EnergyDemandTab.HUB;
f_showCorrectTab();</OnClickCode>
<OnClickCode>f_setTab(OL_CustomScenarioTabs.HUB);</OnClickCode>
<EmbeddedIcon>false</EmbeddedIcon>
<Z>0</Z>
<Rotation>0.0</Rotation>
Expand Down
4 changes: 2 additions & 2 deletions _alp/Agents/UI_Tabs/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
Constant="false"
AccessType="public"
StaticVariable="false">
<Type><![CDATA[EnergyDemandTab]]></Type>
<Type><![CDATA[OL_CustomScenarioTabs]]></Type>
<InitialValue Class="CodeValue">
<Code><![CDATA[ELECTRICITY]]></Code>
<Code><![CDATA[OL_CustomScenarioTabs.ELECTRICITY]]></Code>
</InitialValue>
</Properties>
</Variable>
Expand Down
4 changes: 2 additions & 2 deletions _alp/Agents/UI_company/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,8 +1950,8 @@ else if(v_NFATO_kW_feedin < 0){

double f_setDemandReductionSliderPresets()
{/*ALCODESTART::1756898097088*/
v_minSavingsSliders = -50;
v_maxSavingsSliders = 50;
v_minSavingsSliders = p_minSavingsSliders_default;
v_maxSavingsSliders = p_maxSavingsSliders_default;
sl_heatDemandCompanyReduction.setRange(v_minSavingsSliders, v_maxSavingsSliders);
sl_electricityDemandCompanyReduction.setRange(v_minSavingsSliders, v_maxSavingsSliders);
sl_mobilityDemandCompanyReduction.setRange(v_minSavingsSliders, v_maxSavingsSliders);
Expand Down
56 changes: 56 additions & 0 deletions _alp/Agents/UI_company/Variables.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,4 +1324,60 @@
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1768927550529</Id>
<Name><![CDATA[p_maxSavingsSliders_default]]></Name>
<X>-1440</X>
<Y>1290</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" ModificatorType="STATIC">
<Type><![CDATA[double]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<DefaultValue Class="CodeValue">
<Code><![CDATA[50]]></Code>
</DefaultValue>
<ParameterEditor>
<Id>1768927550527</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
<Variable Class="Parameter">
<Id>1768927552379</Id>
<Name><![CDATA[p_minSavingsSliders_default]]></Name>
<X>-1440</X>
<Y>1270</Y>
<Label>
<X>10</X>
<Y>0</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>true</ShowLabel>
<Properties SaveInSnapshot="true" ModificatorType="STATIC">
<Type><![CDATA[double]]></Type>
<UnitType>NONE</UnitType>
<SdArray>false</SdArray>
<DefaultValue Class="CodeValue">
<Code><![CDATA[-50]]></Code>
</DefaultValue>
<ParameterEditor>
<Id>1768927552377</Id>
<EditorContolType>TEXT_BOX</EditorContolType>
<MinSliderValue>0</MinSliderValue>
<MaxSliderValue>100</MaxSliderValue>
<DelimeterType>NO_DELIMETER</DelimeterType>
</ParameterEditor>
</Properties>
</Variable>
</Variables>
2 changes: 1 addition & 1 deletion _alp/Agents/Zero_Interface/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2245,7 +2245,7 @@
<ShowLabel>true</ShowLabel>
<Body xmlns:al="http://anylogic.com"/>
</Function>
<Function AccessType="default" StaticFunction="false">
<Function AccessType="protected" StaticFunction="false">
<ReturnModificator>VOID</ReturnModificator>
<ReturnType>double</ReturnType>
<Id>1760978860758</Id>
Expand Down
6 changes: 6 additions & 0 deletions _alp/Agents/Zero_Interface/EmbeddedObjects.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
<Parameter>
<Name><![CDATA[p_gridConnection]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_maxSavingsSliders_default]]></Name>
</Parameter>
<Parameter>
<Name><![CDATA[p_minSavingsSliders_default]]></Name>
</Parameter>
</Parameters>
<ReplicationFlag>true</ReplicationFlag>
<Replication Class="CodeValue">
Expand Down
4 changes: 2 additions & 2 deletions _alp/Agents/tabEHub/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ else if ( maxFeedinCapacity_kW > gc2.v_liveConnectionMetaData.contractedFeedinCa
b_NFATOListener = false;
/*ALCODEEND*/}

double f_setTab(EnergyDemandTab selectedTabType)
double f_setTab(OL_CustomScenarioTabs selectedTabType)
{/*ALCODESTART::1722256998182*/
if (selectedTabType == EnergyDemandTab.NFATO) {
if (selectedTabType == OL_CustomScenarioTabs.NFATO) {
gr_nfatoSettings.setVisible(true);
gr_hubSliders.setVisible(false);
}
Expand Down
2 changes: 1 addition & 1 deletion _alp/Agents/tabEHub/Code/Functions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<ShowLabel>true</ShowLabel>
<Parameter>
<Name><![CDATA[selectedTabType]]></Name>
<Type><![CDATA[EnergyDemandTab]]></Type>
<Type><![CDATA[OL_CustomScenarioTabs]]></Type>
</Parameter>
<Body xmlns:al="http://anylogic.com"/>
</Function>
Expand Down