Skip to content

JvTFDays: Map column under certain conditions not found #127

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

Open
MHumm wants to merge 3 commits into
base: master
Choose a base branch
from
Open

JvTFDays: Map column under certain conditions not found #127

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9da6529
Handle exceptions so it doesn't crash.
May 20, 2019
ac84c12
Removed try/except which mostly only suppressed the exception but did…
May 23, 2019
137b206
Applied fix from the comment to that Matnis issue
May 24, 2019
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
229 changes: 122 additions & 107 deletions jvcl/run/JvTFDays.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8803,129 +8803,144 @@ function TJvTFDays.PtToCell(X, Y: Integer): TJvTFDaysCoord;
Done: Boolean;
ApptRect: TRect;
begin
with Result do
begin
Col := gcUndef;
Row := gcUndef;
CellX := -100;
CellY := -100;
AbsX := X;
AbsY := Y;
Schedule := nil;
Appt := nil;
end;

if X < CalcBlockHdrWidth then
begin
// POSSIBLE BUG!!
//Result.Row := gcGroupHdr; // WRONG CODE
Result.Col := gcGroupHdr; // UNTESTED - CORRECT CODE
Result.CellX := X;
end
//block if X < RowHdrWidth then
else
if X < CalcBlockRowHdrsWidth then
begin
Result.Col := gcHdr;
Result.CellX := X - CalcBlockHdrWidth;
end
else
if LeftCol > -1 then
begin
// Find the col that PtX falls in
ColNum := LeftCol;
//block AdjX := X - RowHdrWidth;
AdjX := X - CalcBlockRowHdrsWidth;
Done := False;
Temp := 0;
try
with Result do
begin
Col := gcUndef;
Row := gcUndef;
CellX := -100;
CellY := -100;
AbsX := X;
AbsY := Y;
Schedule := nil;
Appt := nil;
end;

while (ColNum < Cols.Count) and not Done do
if X < CalcBlockHdrWidth then
begin
Inc(Temp, Cols[ColNum].Width);
if AdjX < Temp then
begin
Done := True;
Result.Col := ColNum;
Result.CellX := AdjX - (Temp - Cols[ColNum].Width);
end
else
Inc(ColNum);
end;
if not Done then
// POSSIBLE BUG!!
//Result.Row := gcGroupHdr; // WRONG CODE
Result.Col := gcGroupHdr; // UNTESTED - CORRECT CODE
Result.CellX := X;
end
//block if X < RowHdrWidth then
else
if X < CalcBlockRowHdrsWidth then
begin
Result.Col := Cols.Count-1;
Result.CellX := AdjX - (Temp - Cols[Cols.Count-1].Width);
end;
end;
Result.Col := gcHdr;
Result.CellX := X - CalcBlockHdrWidth;
end
else
if LeftCol > -1 then
begin
// Find the col that PtX falls in
ColNum := LeftCol;
//block AdjX := X - RowHdrWidth;
AdjX := X - CalcBlockRowHdrsWidth;
Done := False;
Temp := 0;

if Y < CalcGroupHdrHeight then
begin
Result.Row := gcGroupHdr;
Result.CellY := Y;
end
//else if Y < ColHdrHeight then
else
if Y < CalcGroupColHdrsHeight then
begin
Result.Row := gcHdr;
Result.CellY := Y - CalcGroupHdrHeight;
end
else
if TopRow > -1 then
begin
RowNum := TopRow;
//group AdjY := Y - ColHdrHeight;
AdjY := Y - CalcGroupColHdrsHeight;
Done := False;
Temp := 0;
while (ColNum < Cols.Count) and not Done do
begin
Inc(Temp, Cols[ColNum].Width);
if AdjX < Temp then
begin
Done := True;
Result.Col := ColNum;
Result.CellX := AdjX - (Temp - Cols[ColNum].Width);
end
else
Inc(ColNum);
end;
if not Done then
begin
Result.Col := Cols.Count-1;
Result.CellX := AdjX - (Temp - Cols[Cols.Count-1].Width);
end;
end;

while (RowNum < RowCount) and not Done do
if Y < CalcGroupHdrHeight then
begin
Inc(Temp, RowHeight);
if AdjY < Temp then
Result.Row := gcGroupHdr;
Result.CellY := Y;
end
//else if Y < ColHdrHeight then
else
if Y < CalcGroupColHdrsHeight then
begin
Result.Row := gcHdr;
Result.CellY := Y - CalcGroupHdrHeight;
end
else
if TopRow > -1 then
begin
RowNum := TopRow;
//group AdjY := Y - ColHdrHeight;
AdjY := Y - CalcGroupColHdrsHeight;
Done := False;
Temp := 0;

while (RowNum < RowCount) and not Done do
begin
Inc(Temp, RowHeight);
if AdjY < Temp then
begin
Done := True;
Result.Row := RowNum;
Result.CellY := AdjY - (Temp - RowHeight);
end
else
Inc(RowNum);
end;
if not Done then
begin
Done := True;
Result.Row := RowNum;
Result.Row := RowCount-1;
Result.CellY := AdjY - (Temp - RowHeight);
end
else
Inc(RowNum);
end;
if not Done then
begin
Result.Row := RowCount-1;
Result.CellY := AdjY - (Temp - RowHeight);
end;
end;
end;

if Result.Col > gcHdr then
begin
Result.Schedule := Cols[Result.Col].Schedule;

// move grab handles
if PtInTopHandle(Point(X, Y), Result.Col, SelAppt) then
Result.Appt := SelAppt
else
if PtInBottomHandle(Point(X, Y), Result.Col, SelAppt) then
Result.Appt := SelAppt
else
if (Result.Row > gcHdr) and Assigned(Result.Schedule) then
if Result.Col > gcHdr then
begin
TotalWidth := Cols[Result.Col].Width;
SegCount := Cols[Result.Col].MapColCount(Result.Row);
if SegCount > 0 then
Result.Schedule := Cols[Result.Col].Schedule;

// move grab handles
if PtInTopHandle(Point(X, Y), Result.Col, SelAppt) then
Result.Appt := SelAppt
else
if PtInBottomHandle(Point(X, Y), Result.Col, SelAppt) then
Result.Appt := SelAppt
else
if (Result.Row > gcHdr) and Assigned(Result.Schedule) then
begin
MapCol := LocateDivCol(Result.CellX, TotalWidth, SegCount);
Result.Appt := Cols[Result.Col].MapLocation(MapCol, Result.Row);
TotalWidth := Cols[Result.Col].Width;
SegCount := Cols[Result.Col].MapColCount(Result.Row);
if SegCount > 0 then
begin
MapCol := LocateDivCol(Result.CellX, TotalWidth, SegCount);
Result.Appt := Cols[Result.Col].MapLocation(MapCol, Result.Row);

ApptRect := GetApptRect(Result.Col, Result.Appt);
if not Windows.PtInRect(ApptRect, Point(X, Y)) then
Result.Appt := nil;
ApptRect := GetApptRect(Result.Col, Result.Appt);
if not Windows.PtInRect(ApptRect, Point(X, Y)) then
Result.Appt := nil;
end;
end;
end;
end;

Result.DragAccept := (Result.Row > gcHdr) and (Result.Col > gcHdr);
Result.DragAccept := (Result.Row > gcHdr) and (Result.Col > gcHdr);
except
with Result do
begin
Col := gcUndef;
Row := gcUndef;
CellX := -100;
CellY := -100;
AbsX := X;
AbsY := Y;
Schedule := nil;
Appt := nil;
DragAccept := False;
end;
end;
end;
{$ENDIF Jv_TIMEBLOCKS}

Expand Down