*** empty log message ***

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
index 32d682779874ed9b65493bf13184d5b8c00884de..a94e39fbb2e5760be22b93c69059219546cee2e4 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
@@ -1,4 +1,4 @@
-
+/*
 #include "ManualPaintModel.h"
 
 
@@ -386,3 +386,4 @@ void ManualPaintModel::SetDirection(int direction)
 {
     _direction = direction;
 }
+*/

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index edd43e33126f898837e80ef1ae28a00c5e4a26c5..649ade65563bd4614e045f91e24a171ba7b17983 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
@@ -25,7 +25,13 @@ HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent)
 printf("EED HistogramDialogComboBox\n");
 #ifdef LINUX
        std::string currentpath = crea::System::GetExecutablePath();
-       currentpath.append("../share/creaMaracasVisu/data/");
+
+
+    currentpath.append("../share/creaMaracasVisu/data/");
+printf("EED JCP OOOOJJJOOO cambiar esto HistogramDialogComboBox::HistogramDialog writting in this directory\n");
+    currentpath = "/home/davila/dataHistogram";
+
+
        crea::System::createDirectory(currentpath.c_str());
 #endif
 }
@@ -243,6 +249,10 @@ wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements()
 #ifdef LINUX
        currentpath = crea::System::GetExecutablePath();
        currentpath.append("../share/CreaMaracasVisu/data/");
+
+printf("EED JCP OOOOJJJOOO cambiar esto HistogramDialogComboBox::HistogramDialog writting in this file ******************\n");
+    currentpath = "/home/davila/dataHistogram";
+
 #endif
        currentpath.append(FILENAME);
 

diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h
index 56c5c1996a12c4b0a50dd4ccc612301cd8fa9b56..93bee0a9b455c31a5e1d9513c4bc66273c1ebd1a 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marTypes.h
+++ b/lib/maracasVisuLib/src/kernel/marTypes.h
@@ -3,14 +3,14 @@
   Program:   wxMaracas
   Module:    $RCSfile: marTypes.h,v $
   Language:  C++
-  Date:      $Date: 2010/04/20 14:42:44 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2010/11/03 19:44:45 $
+  Version:   $Revision: 1.9 $
 
   Copyright: (c) 2002, 2003
   License:
-  
-     This software is distributed WITHOUT ANY WARRANTY; without even 
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
@@ -41,7 +41,7 @@
                #define MARACASVISULIB_EXPORTS __declspec( dllimport )
        #endif //maracasvisulib_EXPORTS
 #else
-       #define MARACASVISULIB_EXPORTS 
+       #define MARACASVISULIB_EXPORTS
 #endif
        */
 // LG 15/01/09 : Now use crea mechanism
@@ -83,7 +83,7 @@
  *  This file is included by all project files.
  */
 
-#include <creaSystem.h>
+#include "creaSystem.h"
 
 // This redefinitions shoul be useless using uint8_t, etc  // JPR