From 3de3a1d277802c36213ed1b5e66d72e22b566421 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Wed, 3 Nov 2010 19:44:43 +0000 Subject: [PATCH] *** empty log message *** --- .../wxWindows/widgets/manualPaint/FillFilter.cpp | 3 ++- .../widgets/pPlotter/HistogramDialogComboBox.cxx | 12 +++++++++++- lib/maracasVisuLib/src/kernel/marTypes.h | 14 +++++++------- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp index 32d6827..a94e39f 100644 --- 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 edd43e3..649ade6 100644 --- 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 56c5c19..93bee0a 100644 --- 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 +#include "creaSystem.h" // This redefinitions shoul be useless using uint8_t, etc // JPR -- 2.45.1