Skip to content

Commit

Permalink
Interface definition updated for console application.
Browse files Browse the repository at this point in the history 
#17
  • Loading branch information
@dvmorozov
dvmorozov committed Sep 12, 2020
1 parent d34e83a commit 3e76592
Show file tree
Hide file tree
Showing 5 changed files with 165 additions and 104 deletions.
79 changes: 60 additions & 19 deletions examples/BoundingBoxConsole/BoundingBoxConsole.lps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<Unit1>
<Filename Value="..\Common\bounding_box_server.pas"/>
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<EditorIndex Value="3"/>
<TopLine Value="206"/>
<CursorPos X="20" Y="227"/>
<UsageCount Value="21"/>
Expand All @@ -25,11 +24,11 @@
<Unit2>
<Filename Value="..\Common\int_user_interaction.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<WindowIndex Value="-1"/>
<TopLine Value="-1"/>
<CursorPos X="-1" Y="-1"/>
<EditorIndex Value="2"/>
<TopLine Value="14"/>
<CursorPos X="9" Y="33"/>
<UsageCount Value="21"/>
<Loaded Value="True"/>
</Unit2>
<Unit3>
<Filename Value="..\Common\Math3d.pas"/>
Expand All @@ -50,36 +49,38 @@
<UsageCount Value="21"/>
</Unit4>
<Unit5>
<Filename Value="bounding_box_console.pas"/>
<IsPartOfProject Value="True"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/>
<TopLine Value="134"/>
<CursorPos X="29" Y="147"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>
</Unit5>
<Unit6>
<Filename Value="..\int_user_interaction.pas"/>
<EditorIndex Value="-1"/>
<CursorPos X="43" Y="8"/>
<UsageCount Value="21"/>
</Unit5>
<Unit6>
</Unit6>
<Unit7>
<Filename Value="..\optimizing_app.pas"/>
<EditorIndex Value="-1"/>
<WindowIndex Value="-1"/>
<TopLine Value="-1"/>
<CursorPos X="-1" Y="-1"/>
<UsageCount Value="20"/>
</Unit6>
<Unit7>
</Unit7>
<Unit8>
<Filename Value="..\bounding_box_server.pas"/>
<EditorIndex Value="-1"/>
<TopLine Value="126"/>
<CursorPos X="6" Y="149"/>
<UsageCount Value="20"/>
</Unit7>
<Unit8>
<Filename Value="bounding_box_console.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="1"/>
<CursorPos X="34" Y="9"/>
<UsageCount Value="20"/>
<Loaded Value="True"/>
</Unit8>
</Units>
<JumpHistory Count="5" HistoryIndex="4">
<JumpHistory Count="15" HistoryIndex="14">
<Position1>
<Filename Value="BoundingBoxConsole.lpr"/>
<Caret Line="139" Column="5" TopLine="82"/>
Expand All @@ -100,6 +101,46 @@
<Filename Value="..\Common\bounding_box_server.pas"/>
<Caret Line="227" Column="20" TopLine="206"/>
</Position5>
<Position6>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="42" Column="66" TopLine="29"/>
</Position6>
<Position7>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="31" Column="58" TopLine="18"/>
</Position7>
<Position8>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="32" Column="23" TopLine="21"/>
</Position8>
<Position9>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="7" Column="23"/>
</Position9>
<Position10>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="29" Column="58" TopLine="21"/>
</Position10>
<Position11>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="7" Column="41"/>
</Position11>
<Position12>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="13" Column="57" TopLine="7"/>
</Position12>
<Position13>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="43" Column="40" TopLine="27"/>
</Position13>
<Position14>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="25" Column="29" TopLine="12"/>
</Position14>
<Position15>
<Filename Value="bounding_box_console.pas"/>
<Caret Line="105" Column="5" TopLine="92"/>
</Position15>
</JumpHistory>
<RunParams>
<FormatVersion Value="2"/>
Expand Down
47 changes: 34 additions & 13 deletions examples/BoundingBoxConsole/bounding_box_console.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ interface

uses {$IFDEF UNIX} {$IFDEF UseCThreads}
cthreads, {$ENDIF} {$ENDIF}
Classes,
SysUtils,
CustApp, int_user_interaction;
Classes, SysUtils, CustApp, SimpMath, int_user_interaction;

type

Expand All @@ -21,26 +19,29 @@ TBoundingBoxConsole = class(TCustomApplication, IUserInteraction)
procedure WriteHelp; virtual;

{ IUserInteraction }

function GetEditExitDerivate: double;
function GetInitialAngleStep: Double;
function GetModelFileName: string;
function GetFinalTolerance: Double;
function GetEditExitDerivate: Double;
{ Prints final results among a few runs. }
procedure DisplayPointCloud(PointCloud: TList);
{ Displays computation results and removes container.
Should be member of form because works with form controls.
Removes handler from FHandlers list. }
procedure DisplayGlobalMinVolume(Handler: TBoundingBoxServer;
procedure DisplayGlobalMinVolume(Handler: TObject;
BoxSizes: TDoubleVector3);
{ Displays computation results of single run.
Should be member of form because works with form controls.
Removes handler from FHandlers list. }
procedure DisplayCurrentMinVolume(Handler: TBoundingBoxServer);
procedure DisplayCurrentMinVolume(Handler: TObject);
{ Displays computation results of single run of brute force search. }
procedure DisplayBruteForceResult(Handler: TBoundingBoxServer;
procedure DisplayBruteForceResult(Handler: TObject;
DeltaVolume: single; BoxSizes: TDoubleVector3);
procedure DisplayInitialAngles(Alpha, Beta, Gamma: single; ShowDetails: boolean);
procedure DisplayListOfModels(ListOfFiles: TStringList);
procedure DisplayComputationTime(ComputationTime: TComputationTime);
procedure DisplayComputationTime(ComputationTime: TObject);
procedure DisplayInitialBoxVolume(InitialBoxVolume: double);
procedure DisplayDetails(Line: string);
end;

implementation
Expand Down Expand Up @@ -89,6 +90,21 @@ procedure TBoundingBoxConsole.WriteHelp;
writeln('Usage: ', ExeName, ' -h');
end;

function TBoundingBoxConsole.GetInitialAngleStep: Double;
begin

end;

function TBoundingBoxConsole.GetModelFileName: string;
begin

end;

function TBoundingBoxConsole.GetFinalTolerance: Double;
begin

end;

function TBoundingBoxConsole.GetEditExitDerivate: double;
begin

Expand All @@ -99,18 +115,18 @@ procedure TBoundingBoxConsole.DisplayPointCloud(PointCloud: TList);

end;

procedure TBoundingBoxConsole.DisplayGlobalMinVolume(Handler: TBoundingBoxServer;
procedure TBoundingBoxConsole.DisplayGlobalMinVolume(Handler: TObject;
BoxSizes: TDoubleVector3);
begin

end;

procedure TBoundingBoxConsole.DisplayCurrentMinVolume(Handler: TBoundingBoxServer);
procedure TBoundingBoxConsole.DisplayCurrentMinVolume(Handler: TObject);
begin

end;

procedure TBoundingBoxConsole.DisplayBruteForceResult(Handler: TBoundingBoxServer;
procedure TBoundingBoxConsole.DisplayBruteForceResult(Handler: TObject;
DeltaVolume: single; BoxSizes: TDoubleVector3);
begin

Expand All @@ -128,7 +144,7 @@ procedure TBoundingBoxConsole.DisplayListOfModels(ListOfFiles: TStringList);
end;

procedure TBoundingBoxConsole.DisplayComputationTime(
ComputationTime: TComputationTime);
ComputationTime: TObject);
begin

end;
Expand All @@ -138,5 +154,10 @@ procedure TBoundingBoxConsole.DisplayInitialBoxVolume(InitialBoxVolume: double);

end;

procedure TBoundingBoxConsole.DisplayDetails(Line: string);
begin

end;

end.

2 changes: 1 addition & 1 deletion examples/BoundingBoxServerForm/bounding_box_server_demo.lpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<AutoIncrementBuild Value="True"/>
<MinorVersionNr Value="1"/>
<RevisionNr Value="11"/>
<BuildNr Value="34"/>
<BuildNr Value="35"/>
<Attributes pvaDebug="True"/>
</VersionInfo>
<BuildModes Count="1">
Expand Down
Loading

0 comments on commit 3e76592

Please sign in to comment.