mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-06-25 02:19:37 +02:00
bugfix 2545,2544
This commit is contained in:
@@ -1184,6 +1184,12 @@ QRect RuleSetView::calculateCellSize( int row, int col )
|
||||
|
||||
case Comment:
|
||||
{
|
||||
if (rule==NULL)
|
||||
{
|
||||
hc = item_h;
|
||||
wc = RuleElementSpacing/2;
|
||||
break ;
|
||||
}
|
||||
QRect br=p.boundingRect(QRect(0,0,1000,1000),
|
||||
Qt::AlignLeft|Qt::AlignVCenter,
|
||||
QString::fromUtf8(rule->getComment().c_str()) );
|
||||
@@ -1195,6 +1201,12 @@ QRect RuleSetView::calculateCellSize( int row, int col )
|
||||
|
||||
case Metric:
|
||||
{
|
||||
if (rule==NULL)
|
||||
{
|
||||
hc = item_h;
|
||||
wc = RuleElementSpacing/2;
|
||||
break ;
|
||||
}
|
||||
QRect br=p.boundingRect(QRect(0, 0, 1000, 1000),
|
||||
Qt::AlignLeft|Qt::AlignVCenter,
|
||||
QString::fromUtf8(RoutingRule::cast(rule)->getMetricAsString().c_str()) );
|
||||
@@ -4212,7 +4224,7 @@ void RuleSetView::updateAll()
|
||||
//dirtyRows[r] = 1;
|
||||
|
||||
repaint();
|
||||
// updateGroups();
|
||||
updateGroups();
|
||||
// update();
|
||||
}
|
||||
|
||||
@@ -4306,6 +4318,8 @@ RuleElement* PolicyView::getRE( Rule* r, int col )
|
||||
string ret;
|
||||
if (col==0)
|
||||
return NULL;
|
||||
if (r==NULL)
|
||||
return NULL;
|
||||
switch (getColType(col))
|
||||
{
|
||||
case Object:
|
||||
@@ -4406,6 +4420,8 @@ RuleElement* InterfacePolicyView::getRE( Rule *r, int col )
|
||||
string ret;
|
||||
if (col==0)
|
||||
return NULL;
|
||||
if (r==NULL)
|
||||
return NULL;
|
||||
switch (getColType(col))
|
||||
{
|
||||
case Object:
|
||||
@@ -4495,6 +4511,8 @@ RuleElement* NATView::getRE( Rule *r, int col )
|
||||
string ret;
|
||||
if (col==0)
|
||||
return NULL;
|
||||
if (r==NULL)
|
||||
return NULL;
|
||||
switch (getColType(col))
|
||||
{
|
||||
case Object:
|
||||
@@ -4576,6 +4594,8 @@ RuleElement* RoutingView::getRE( Rule *r, int col )
|
||||
string ret;
|
||||
if (col==0)
|
||||
return NULL;
|
||||
if (r==NULL)
|
||||
return NULL;
|
||||
switch (getColType(col))
|
||||
{
|
||||
case Object:
|
||||
|
||||
Reference in New Issue
Block a user