Merge pull request #464 from stevenweaver/master

HyPhy - 2.2.7
veg · Aug 15, 2016 · fd90f0c · fd90f0c
2 parents e935653 + f9371f9
commit fd90f0c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/gui/HYChartWindow.cpp b/src/gui/HYChartWindow.cpp
@@ -100,16 +100,16 @@ extern      _String                             donotWarnAgain,
             windowTypeDistribTable;
 
 _HYColor            chartColors [HY_CHART_COLOR_COUNT] = {
-    {255*.94, 255*.12, 255*.11 },//(Red)
-    {255*.41, 255*.46, 255*.91 },//(Evening Blue)
-    {255    , 255*.91, 255*.34 },//(Banana)
-    {255*.18, 255*.55, 255*.13 },//(Clover)
-    {255*.55, 255*.38, 255*.21 },//(Dirt)
-    {255*.42, 255*.09, 255*.69 },//(Royal Violet)
-    {255*.09, 255*.29, 255*.51 },//(Sea Blue)
-    {255   ,  255*.57, 255*.09 },//(Orange)
-    {255*.67, 255*.67, 255*.67 },//(Concrete)
-    {255*.85, 255*.27, 255*.42 } //(Carnation)
+    {255*94/100, 255*12/100, 255*11/100 },//(Red)
+    {255*41/100, 255*46/100, 255*91/100 },//(Evening Blue)
+    {255    , 255*91/100, 255*34/100 },//(Banana)
+    {255*18/100, 255*55/100, 255*13/100 },//(Clover)
+    {255*55/100, 255*38/100, 255*21/100 },//(Dirt)
+    {255*42/100, 255*9/100, 255*69/100 },//(Royal Violet)
+    {255*9/100, 255*29/100, 255*51/100 },//(Sea Blue)
+    {255   ,  255*57/100, 255*9/100 },//(Orange)
+    {255*67/100, 255*67/100, 255*67/100 },//(Concrete)
+    {255*85/100, 255*27/100, 255*42/100 } //(Carnation)
 };
 
 extern      _Parameter  pi_const;
@@ -3007,7 +3007,7 @@ bool    ReadDataFromFile (_String fileName, char delimiter, _Matrix& data, _List
             for (long k=0; k<columns; k++) {
                 _String * thisString = (_String*)readStrings (lastRead*columns+k);
                 if ((thisString->sLength)&&(thisString->FirstNonSpaceIndex (0,-1)>=0)) {
-                    _Formula f (*thisString,nil,false);
+                    _Formula f (*thisString,nil,nil);
                     v.SetValue (k);
                     if (!f.IsEmpty()) {
                         data.MStore (&h,&v,f);
@@ -4527,7 +4527,7 @@ void    _HYDistributionChartWindow::AddVariable (_String * expr)
 
         aPrompt = newExpression;
 
-        _Formula f (newExpression, nil,false);
+        _Formula f (newExpression, nil, nil);
 
         if (f.IsEmpty()) {
             newExpression = _String("Failed to parse the expression :") & aPrompt;

diff --git a/src/gui/HYModelWindow.cpp b/src/gui/HYModelWindow.cpp
@@ -857,7 +857,7 @@ bool    _HYModelWindow::ProcessEvent (_HYEvent* e)
             _HYButtonBar* bb3 = (_HYButtonBar*)GetCellObject (MODEL_BUTTON_ROW,6);
 
             _String cText (tl->GetText());
-            _Formula f (cText,nil,false);
+            _Formula f (cText,nil,nil);
             if (f.GetList().lLength) {
                 clipboardString = cText;
                 SyncEditBox ();

diff --git a/src/gui/gtk/WindowClasses/HYPlatformModelWindow.cpp b/src/gui/gtk/WindowClasses/HYPlatformModelWindow.cpp
@@ -173,7 +173,7 @@ bool _HYModelWindow::_CheckClipboard (void)
     {
         _String cText ((char*)scrapHandle);
         skipWarningMessages = true;
-        _Formula f (cText,nil,false);
+        _Formula f (cText,nil,nil);
         skipWarningMessages = false;
         if (f.GetList().lLength)
         {