]> OCCT Git - occt-copy.git/commitdiff
Correction for a regression cased by "0030268: Inspectors - improvements in VInspecto...
authornds <nds@opencascade.com>
Thu, 8 Nov 2018 13:04:05 +0000 (16:04 +0300)
committernds <nds@opencascade.com>
Thu, 8 Nov 2018 13:04:05 +0000 (16:04 +0300)
src/Quantity/Quantity_Color.cxx

index c6c478adf4a0b7b04d4917733c6cc2c8885a7205..3c056ff8ebf889c653cfd42a668d8808c99a2336 100644 (file)
@@ -14,7 +14,6 @@
 // commercial license or contractual agreement.
 
 #include <Quantity_Color.hxx>
-#include <Quantity.hxx>
 
 #include <Quantity_ColorDefinitionError.hxx>
 #include <Standard_ErrorHandler.hxx>
@@ -48,8 +47,6 @@ static Standard_Real TheEpsilon = 0.0001;
 Standard_Boolean Quantity_Color::ColorFromName (const Standard_CString theName,
                                                 Quantity_NameOfColor&  theColor)
 {
-  return Quantity::NameOfColorFromString (theName, theColor);
-  /*
   TCollection_AsciiString aName (theName);
   aName.UpperCase();
   if (aName.Search("QUANTITY_NOC_") == 1)
@@ -66,7 +63,7 @@ Standard_Boolean Quantity_Color::ColorFromName (const Standard_CString theName,
       return Standard_True;
     }
   }
-  return Standard_False;*/
+  return Standard_False;
 }
 
 Quantity_Color::Quantity_Color () {
@@ -2043,8 +2040,6 @@ switch (AName) {
 Standard_CString Quantity_Color::StringName (
                                  const Quantity_NameOfColor AName) {
 
-  return Quantity::NameOfColorToString (AName);
-/*
 Standard_CString TheName;
  
 switch (AName) {
@@ -3605,7 +3600,7 @@ switch (AName) {
                throw Standard_OutOfRange("Bad name");
        break;
 }
-return (TheName);*/
+return (TheName);
 }
 
 //\f