From: asl Date: Wed, 1 Jun 2005 06:57:51 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: T3_0_0_a1~48 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=977e4730547a6a832568353a604db52b6db6719e;p=modules%2Fgui.git *** empty log message *** --- diff --git a/src/Qtx/QtxStdOperations.cxx b/src/Qtx/QtxStdOperations.cxx index a1613c40d..a81c1aad6 100644 --- a/src/Qtx/QtxStdOperations.cxx +++ b/src/Qtx/QtxStdOperations.cxx @@ -346,6 +346,7 @@ QtxParser::Error QtxLogic::calculate( const QString& op, { QtxParser::Error err = QtxParser::OK; if( v1.isValid() && v2.isValid() ) + { if( op=="and" || op=="&&" ) set( v1, v1.toBool() && v2.toBool() ); else if( op=="or" || op=="||" ) @@ -356,7 +357,7 @@ QtxParser::Error QtxLogic::calculate( const QString& op, set( v1, !v1.toBool() || v2.toBool() ); else if( op=="=" ) set( v1, v1.toBool()==v2.toBool() ); - + } else if( op=="not" || op=="!" ) v2 = !v2.toBool();