lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-23 10:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source 
Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: Dale Lear <dalelear@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi Aaltonen <jussi@mcneel.com>
Co-authored-by: Lowell <lowell@mcneelcom>
Co-authored-by: Tim Hemmelman <tim@mcneel.com>
Co-authored-by: piac <giulio@mcneel.com>
This commit is contained in:
Bozo The Builder
2020-05-03 10:07:05 -07:00
parent a59f3b7565
commit 044356876d
38 changed files with 2987 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
opennurbs_compstat.cpp
View File

@@ -559,6 +559,40 @@ bool ON_ComponentStatus::NoEqualStates(
return (mask == (s1 ^ s2));
}
ON_AggregateComponentStatus::ON_AggregateComponentStatus(const ON_AggregateComponentStatusEx& src)
{
memcpy(this, &src, sizeof(*this));
}
ON_AggregateComponentStatus& ON_AggregateComponentStatus::operator=(const ON_AggregateComponentStatusEx& src)
{
memcpy(this, &src, sizeof(*this));
return *this;
}
ON_AggregateComponentStatusEx::ON_AggregateComponentStatusEx(const ON_AggregateComponentStatus& src)
: ON_AggregateComponentStatus(src)
{
Internal_ChangeStatusSerialNumber();
}
ON_AggregateComponentStatusEx& ON_AggregateComponentStatusEx::operator=(const ON_AggregateComponentStatus& src)
{
ON_AggregateComponentStatus::operator=(src);
Internal_ChangeStatusSerialNumber();
return *this;
}
ON__UINT64 ON_AggregateComponentStatusEx::ComponentStatusSerialNumber() const
{
return m_component_status_serial_number;
}
void ON_AggregateComponentStatusEx::Internal_ChangeStatusSerialNumber()
{
m_component_status_serial_number = ON_NextContentSerialNumber();
}
bool ON_AggregateComponentStatus::ClearAllStates()
{
if (m_current <= 1)
@@ -573,6 +607,12 @@ bool ON_AggregateComponentStatus::ClearAllStates()
return false;
}
bool ON_AggregateComponentStatusEx::ClearAllStates()
{
Internal_ChangeStatusSerialNumber();
return ON_AggregateComponentStatus::ClearAllStates();
}
bool ON_AggregateComponentStatus::ClearAggregateStatus(
ON_ComponentStatus states_to_clear
)
@@ -608,15 +648,34 @@ bool ON_AggregateComponentStatus::ClearAggregateStatus(
return false;
}
bool ON_AggregateComponentStatusEx::ClearAggregateStatus(
ON_ComponentStatus states_to_clear
)
{
Internal_ChangeStatusSerialNumber();
return ON_AggregateComponentStatus::ClearAggregateStatus(states_to_clear);
}
bool ON_AggregateComponentStatus::IsEmpty() const
{
return (0 == m_current);
}
bool ON_AggregateComponentStatusEx::IsEmpty() const
{
return ON_AggregateComponentStatus::IsEmpty();
}
bool ON_AggregateComponentStatus::IsCurrent() const
{
return (1 == m_current);
}
bool ON_AggregateComponentStatusEx::IsCurrent() const
{
return ON_AggregateComponentStatus::IsCurrent();
}
void ON_AggregateComponentStatus::MarkAsNotCurrent()
{
if (2 != m_current)
@@ -626,43 +685,90 @@ void ON_AggregateComponentStatus::MarkAsNotCurrent()
}
}
void ON_AggregateComponentStatusEx::MarkAsNotCurrent()
{
Internal_ChangeStatusSerialNumber();
return ON_AggregateComponentStatus::MarkAsNotCurrent();
}
ON_ComponentStatus ON_AggregateComponentStatus::AggregateStatus() const
{
return m_aggregate_status;
}
ON_ComponentStatus ON_AggregateComponentStatusEx::AggregateStatus() const
{
return ON_AggregateComponentStatus::AggregateStatus();
}
unsigned int ON_AggregateComponentStatus::ComponentCount() const
{
return m_component_count;
}
unsigned int ON_AggregateComponentStatusEx::ComponentCount() const
{
return ON_AggregateComponentStatus::ComponentCount();
}
unsigned int ON_AggregateComponentStatus::SelectedCount() const
{
return m_selected_count;
}
unsigned int ON_AggregateComponentStatusEx::SelectedCount() const
{
return ON_AggregateComponentStatus::SelectedCount();
}
unsigned int ON_AggregateComponentStatus::SelectedPersistentCount() const
{
return m_selected_persistent_count;
}
unsigned int ON_AggregateComponentStatusEx::SelectedPersistentCount() const
{
return ON_AggregateComponentStatus::SelectedPersistentCount();
}
unsigned int ON_AggregateComponentStatus::HighlightedCount() const
{
return m_highlighted_count;
}
unsigned int ON_AggregateComponentStatusEx::HighlightedCount() const
{
return ON_AggregateComponentStatus::HighlightedCount();
}
unsigned int ON_AggregateComponentStatus::HiddenCount() const
{
return m_hidden_count;
}
unsigned int ON_AggregateComponentStatusEx::HiddenCount() const
{
return ON_AggregateComponentStatus::HiddenCount();
}
unsigned int ON_AggregateComponentStatus::LockedCount() const
{
return m_locked_count;
}
unsigned int ON_AggregateComponentStatusEx::LockedCount() const
{
return ON_AggregateComponentStatus::LockedCount();
}
unsigned int ON_AggregateComponentStatus::DamagedCount() const
{
return m_locked_count;
return m_damaged_count;
}
unsigned int ON_AggregateComponentStatusEx::DamagedCount() const
{
return ON_AggregateComponentStatus::DamagedCount();
}
bool ON_AggregateComponentStatus::Add(
@@ -712,6 +818,14 @@ bool ON_AggregateComponentStatus::Add(
return true;
}
bool ON_AggregateComponentStatusEx::Add(
const ON_AggregateComponentStatus& aggregate_status
)
{
Internal_ChangeStatusSerialNumber();
return ON_AggregateComponentStatus::Add(aggregate_status);
}
bool ON_AggregateComponentStatus::Add(
ON_ComponentStatus component_status
)
@@ -748,6 +862,14 @@ bool ON_AggregateComponentStatus::Add(
}
bool ON_AggregateComponentStatusEx::Add(
ON_ComponentStatus component_status
)
{
Internal_ChangeStatusSerialNumber();
return ON_AggregateComponentStatus::Add(component_status);
}
/////////////////////////////////////////////////////////////////
//
// ON_Object component status virtual interface