Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/palaeoware/SPIERSedit
Browse files Browse the repository at this point in the history
  • Loading branch information
@alanspencer
alanspencer committed Oct 17, 2018
2 parents b8edd8e + adefdc0 commit ffa7f4f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 20 deletions.
5 changes: 4 additions & 1 deletion src/curves.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1001,8 +1001,11 @@ double GetStretch(int Index, QList <double> *stretches, int Smax)
double GetZpos(int Index, QList <double> *stretches)
{
Index++;
if (Index >= (stretches->size() - 1)) if (Index == (stretches->size() - 1)) return (*stretches)[Index];
if (Index >= (stretches->size() - 1))
{
if (Index == (stretches->size() - 1)) return (*stretches)[Index];
else return 0;
}

return (((*stretches)[Index] + (*stretches)[Index + 1])) / 2;
}
Expand Down
31 changes: 16 additions & 15 deletions src/mainwindowimpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@ void MainWindowImpl::on_actionLock_Selected_Masks_triggered()
{
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
MasksSettings[i]->Lock = true;
Expand All @@ -1559,7 +1559,7 @@ void MainWindowImpl::on_actionUnlock_Selected_Masks_triggered()
{
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
MasksSettings[i]->Lock = false;
Expand All @@ -1572,7 +1572,7 @@ void MainWindowImpl::on_actionShow_Selected_Masks_triggered()
{
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
MasksSettings[i]->Show = true;
Expand All @@ -1586,7 +1586,7 @@ void MainWindowImpl::on_actionUnShow_Selected_Masks_triggered()
{
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
MasksSettings[i]->Show = false;
Expand All @@ -1600,7 +1600,7 @@ void MainWindowImpl::on_actionWrite_Selected_Masks_triggered()
{
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
MasksSettings[i]->Write = true;
Expand All @@ -1613,7 +1613,7 @@ void MainWindowImpl::on_actionUnWrite_Selected_Masks_triggered()
{
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
MasksSettings[i]->Write = false;
Expand All @@ -1632,7 +1632,7 @@ void MainWindowImpl::on_MaskMoveUp_pressed()
{
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
//found selected
Expand Down Expand Up @@ -1686,7 +1686,7 @@ void MainWindowImpl::on_MaskMoveDown_pressed()
{
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
//found selected
Expand Down Expand Up @@ -1765,7 +1765,7 @@ void MainWindowImpl::on_MaskDelete_pressed()
QList <int> list;
for (int i = 0; i <= MaxUsedMask; i++)
{
if ((MasksSettings[i]->widgetitem) > 0)
if ((MasksSettings[i]->widgetitem) != nullptr)
if ((MasksSettings[i]->widgetitem)->isSelected())
{
list.append(i);
Expand Down Expand Up @@ -1801,7 +1801,8 @@ void MainWindowImpl::on_actionLock_selected_segments_triggered()
{
for (int i = 0; i < SegmentCount; i++)
{
if ((Segments[i]->widgetitem) > 0) if ((Segments[i]->widgetitem)->isSelected())
if ((Segments[i]->widgetitem) != nullptr)
if ((Segments[i]->widgetitem)->isSelected())
{
Segments[i]->Locked = true;
RefreshOneSegmentItem(Segments[i]->widgetitem, i);
Expand All @@ -1813,7 +1814,7 @@ void MainWindowImpl::on_actionUnlock_selected_segments_triggered()
{
for (int i = 0; i < SegmentCount; i++)
{
if ((Segments[i]->widgetitem) > 0) if ((Segments[i]->widgetitem)->isSelected())
if ((Segments[i]->widgetitem) != nullptr) if ((Segments[i]->widgetitem)->isSelected())
{
Segments[i]->Locked = false;
RefreshOneSegmentItem(Segments[i]->widgetitem, i);
Expand All @@ -1825,7 +1826,7 @@ void MainWindowImpl::on_actionActivate_selected_segments_triggered()
{
for (int i = 0; i < SegmentCount; i++)
{
if ((Segments[i]->widgetitem) > 0) if ((Segments[i]->widgetitem)->isSelected())
if ((Segments[i]->widgetitem) != nullptr) if ((Segments[i]->widgetitem)->isSelected())
{
Segments[i]->Activated = true;
RefreshOneSegmentItem(Segments[i]->widgetitem, i);
Expand All @@ -1839,7 +1840,7 @@ void MainWindowImpl::on_actionDeactivate_selected_segments_triggered()
{
for (int i = 0; i < SegmentCount; i++)
{
if ((Segments[i]->widgetitem) > 0) if ((Segments[i]->widgetitem)->isSelected())
if ((Segments[i]->widgetitem) != nullptr) if ((Segments[i]->widgetitem)->isSelected())
{
Segments[i]->Activated = false;
RefreshOneSegmentItem(Segments[i]->widgetitem, i);
Expand All @@ -1861,7 +1862,7 @@ void MainWindowImpl::on_SegmentMoveUp_pressed()
{
for (int i = 0; i < SegmentCount; i++)
{
if ((Segments[i]->widgetitem) > 0)
if ((Segments[i]->widgetitem) != nullptr)
if ((Segments[i]->widgetitem)->isSelected())
{
//found selected
Expand Down Expand Up @@ -1908,7 +1909,7 @@ void MainWindowImpl::on_SegmentMoveDown_pressed()
{
for (int i = 0; i < SegmentCount; i++)
{
if ((Segments[i]->widgetitem) > 0)
if ((Segments[i]->widgetitem) != nullptr)
if ((Segments[i]->widgetitem)->isSelected())
{
//found selected
Expand Down
8 changes: 4 additions & 4 deletions src/mainwindowimpl2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ void MainWindowImpl::on_SegmentDelete_pressed()
QList <int> list;
for (int i = 0; i < SegmentCount; i++)
{
if ((Segments[i]->widgetitem) > 0)
if ((Segments[i]->widgetitem) != nullptr)
if ((Segments[i]->widgetitem)->isSelected())
{
list.append(i);
Expand Down Expand Up @@ -1463,7 +1463,7 @@ void MainWindowImpl::on_CurveDelete_pressed()
QList <int> list;
for (int i = 0; i < CurveCount; i++)
{
if ((Curves[i]->widgetitem) > 0)
if ((Curves[i]->widgetitem) != nullptr)
if ((Curves[i]->widgetitem)->isSelected())
{
list.append(i);
Expand Down Expand Up @@ -1560,7 +1560,7 @@ void MainWindowImpl::on_CurveMoveUp_pressed()
{
for (int i = 0; i < CurveCount; i++)
{
if ((Curves[i]->widgetitem) > 0)
if ((Curves[i]->widgetitem) != nullptr)
if ((Curves[i]->widgetitem)->isSelected())
{
//found selected
Expand Down Expand Up @@ -1606,7 +1606,7 @@ void MainWindowImpl::on_CurveMoveDown_pressed()
{
for (int i = 0; i < CurveCount; i++)
{
if ((Curves[i]->widgetitem) > 0)
if ((Curves[i]->widgetitem) != nullptr)
if ((Curves[i]->widgetitem)->isSelected())
{
//found selected
Expand Down

0 comments on commit ffa7f4f

Please sign in to comment.