Skip to content

Commit

Permalink
* Fixed lambda Calc
Browse files Browse the repository at this point in the history
* Fixed Calc All
  • Loading branch information
Oleksiy Penkov committed Oct 7, 2023
1 parent f28746a commit b8c9d7d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
6 changes: 3 additions & 3 deletions XRayCalc3.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@
<DCC_ImportedDataReferences>false</DCC_ImportedDataReferences>
<Icon_MainIcon>Resources\XRayCalc3_Icon.ico</Icon_MainIcon>
<VerInfo_MajorVer>3</VerInfo_MajorVer>
<VerInfo_Build>415</VerInfo_Build>
<VerInfo_Keys>CompanyName=Zhejiang University;FileDescription=$(MSBuildProjectName);FileVersion=3.0.7.415;InternalName=;LegalCopyright=Oleksiy Penkov;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=3.0.4;Comments=</VerInfo_Keys>
<VerInfo_Release>7</VerInfo_Release>
<VerInfo_Build>420</VerInfo_Build>
<VerInfo_Keys>CompanyName=Zhejiang University;FileDescription=$(MSBuildProjectName);FileVersion=3.0.8.420;InternalName=;LegalCopyright=Oleksiy Penkov;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=3.0.4;Comments=</VerInfo_Keys>
<VerInfo_Release>8</VerInfo_Release>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
Expand Down
22 changes: 16 additions & 6 deletions forms/frm_Main.pas
Original file line number Diff line number Diff line change
Expand Up @@ -1810,15 +1810,16 @@ procedure TfrmMain.CalcAllExecute(Sender: TObject);
else
Exit;

while Node <> FDataRoot do
while Node <> nil do
begin
Data := Project.GetNodeData(Node);
if Data.RowType = prItem then
if Data.IsModel then
begin
Project.FocusedNode := Node;
Project.ActiveModel := Data;
Structure.FromString(Data.Data);
CalcRunExecute(Sender);
end;
Node := Project.GetNext(Node);
Node := Project.GetNextSibling(Node);
end;
end;

Expand Down Expand Up @@ -2245,9 +2246,18 @@ procedure TfrmMain.RecoverDataCurves(const LinkedID: integer);

procedure TfrmMain.RescaleChart;
begin
Chart.BottomAxis.Minimum := StrToFloat(edStartTeta.Text);
Chart.BottomAxis.Maximum := StrToFloat(edEndTeta.Text);
Chart.BottomAxis.Minimum := 0;

case rgCalcMode.ItemIndex of
0:begin
Chart.BottomAxis.Maximum := StrToFloat(edEndTeta.Text);
Chart.BottomAxis.Minimum := StrToFloat(edStartTeta.Text);
end;
1:begin
Chart.BottomAxis.Maximum := StrToFloat(edEndL.Text);
Chart.BottomAxis.Minimum := StrToFloat(edStartL.Text);
end;
end;
Chart.LeftAxis.Minimum := StrToFloat(cbMinLimit.Text);
end;

Expand Down

0 comments on commit b8c9d7d

Please sign in to comment.