Update of /cvsroot/echempp/GUI/Windows/Qt/EChem++/Model
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25484
Modified Files:
Makefile.am
Log Message:
Extended to include batchExperimentDialog and SVM related dialogs.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/echempp/GUI/Windows/Qt/EChem++/Model/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Makefile.am 11 May 2007 14:50:50 -0000 1.42
--- Makefile.am 19 Dec 2007 11:51:20 -0000 1.43
***************
*** 19,22 ****
--- 19,24 ----
helpWindowBase.ui \
solverDialogBase.ui \
+ svmParametersDialogBase.ui \
+ batchExperimentDialogBase.ui \
textPropertiesBase.ui
***************
*** 81,85 ****
.ui/userDefinedEtExcitationFunctionDialogBase.cpp \
.ui/userDefinedItExcitationFunctionDialogBase.h \
! .ui/userDefinedItExcitationFunctionDialogBase.cpp
.ui/helpWindowBase.h: helpWindowBase.ui
--- 83,93 ----
.ui/userDefinedEtExcitationFunctionDialogBase.cpp \
.ui/userDefinedItExcitationFunctionDialogBase.h \
! .ui/userDefinedItExcitationFunctionDialogBase.cpp \
! .ui/svmParametersDialogBase.h \
! .ui/svmParametersDialogBase.cpp \
! .ui/svmDataDialogBase.h \
! .ui/svmDataDialogBase.cpp \
! .ui/batchExperimentDialogBase.h \
! .ui/batchExperimentDialogBase.cpp
.ui/helpWindowBase.h: helpWindowBase.ui
***************
*** 123,126 ****
--- 131,140 ----
.ui/userDefinedItExcitationFunctionDialogBase.h: ../Experiment/userDefinedItExcitationFunctionDialogBase.ui
.ui/userDefinedItExcitationFunctionDialogBase.cpp: ../Experiment/userDefinedItExcitationFunctionDialogBase.ui .ui/userDefinedItExcitationFunctionDialogBase.h
+ .ui/svmParametersDialogBase.h: svmParametersDialogBase.ui
+ .ui/svmParametersDialogBase.cpp: svmParametersDialogBase.ui .ui/svmParametersDialogBase.h
+ .ui/svmDataDialogBase.h: svmDataDialogBase.ui
+ .ui/svmDataDialogBase.cpp: svmDataDialogBase.ui .ui/svmDataDialogBase.h
+ .ui/svmDataDialogBase.h: batchExperimentDialogBase.ui
+ .ui/svmDataDialogBase.cpp: batchExperimentDialogBase.ui .ui/batchExperimentDialogBase.h
***************
*** 165,169 ****
.moc/moc_userDefinedEtExcitationFunctionDialog.cpp \
.moc/moc_userDefinedItExcitationFunctionDialogBase.cpp \
! .moc/moc_userDefinedItExcitationFunctionDialog.cpp
ModSim_SOURCES = helpWindow.hpp \
--- 179,189 ----
.moc/moc_userDefinedEtExcitationFunctionDialog.cpp \
.moc/moc_userDefinedItExcitationFunctionDialogBase.cpp \
! .moc/moc_userDefinedItExcitationFunctionDialog.cpp \
! .moc/moc_svmParametersDialogBase.cpp \
! .moc/moc_svmParametersDialog.cpp \
! .moc/moc_svmDataDialogBase.cpp \
! .moc/moc_svmDataDialog.cpp \
! .moc/moc_batchExperimentDialogBase.cpp \
! .moc/moc_batchExperimentDialog.cpp
ModSim_SOURCES = helpWindow.hpp \
***************
*** 217,220 ****
--- 237,248 ----
scalingDialog.hpp \
scalingDialog.cpp \
+ svmParametersDialog.hpp \
+ svmParametersDialog.cpp \
+ svmDataDialog.hpp \
+ svmDataDialog.cpp \
+ batchExperimentDialog.hpp \
+ batchExperimentDialog.cpp \
+ logger.hpp \
+ logger.cpp \
mediator.hpp \
mediator.cpp \
***************
*** 249,252 ****
--- 277,281 ----
BUILT_SOURCES = $(ModSim_MOC) $(ModSim_UI)
+ #ModSim_LDFLAGS = -Wl,--allow-multiple-definition $(GUI_LDFLAGS)
ModSim_LDFLAGS = $(GUI_LDFLAGS)
***************
*** 261,267 ****
# of `deprecated' warnings generated by vtk 5.0
ModSim_CXXFLAGS = -DTIXML_USE_STL $(CXXFLAGS) $(QT_CXXFLAGS) -Wall -pedantic-errors\
! -Wno-non-virtual-dtor -Wno-deprecated -Wno-long-long -Wno-strict-aliasing
- ModSim_LDADD = ../../../../../Analysis/Data/libeppDataold.la ../../../../../Model/Problem/libeppProblem.la ../../../../../Model/Adapters/libeppAdapters.la ../../../../../Model/Ecco/libeppEcco.la ../../../../../Model/Solvers/libeppSolvers.la ../../../../../Model/Numerics/libeppNumerics.la ../../../../../Experiment/ExcitationFunction/libeppExcitationFunction.la ../../../../Visualization/libeppVisualization.la -L$(QUANTITIESLIB) -lPhysicalQuantities -lQuantity -L$(BSUTILITIESLIB) -lBSUtilities -L$(LOKILIB) -lloki -L$(GINACLIB) -lginac $(LDADD) $(QT_LDADD) $(VTK_LDADD) $(MODEL_LDADD) -lboost_serialization
CLEANFILES = $(BUILT_SOURCES)
--- 290,297 ----
# of `deprecated' warnings generated by vtk 5.0
ModSim_CXXFLAGS = -DTIXML_USE_STL $(CXXFLAGS) $(QT_CXXFLAGS) -Wall -pedantic-errors\
! -Wno-non-virtual-dtor -Wno-deprecated -Wno-long-long -Wno-strict-aliasing
!
! ModSim_LDADD = ../../../../../Analysis/Classification/libeppClassification.la ../../../../../Analysis/Data/libeppDataold.la ../../../../../Model/Problem/libeppProblem.la ../../../../../Model/Adapters/libeppAdapters.la ../../../../../Model/Ecco/libeppEcco.la ../../../../../Model/Solvers/libeppSolvers.la ../../../../../Model/Numerics/libeppNumerics.la ../../../../../Experiment/ExcitationFunction/libeppExcitationFunction.la ../../../../../Experiment/Data/libeppData.la ../../../../../Experiment/Experiment/libeppExperiment.la ../../../../Visualization/libeppVisualization.la -L$(QUANTITIESLIB) -lPhysicalQuantities -lQuantity -L$(BSUTILITIESLIB) -lBSUtilities -L$(LOKILIB) -lloki -L$(GINACLIB) -lginac $(LDADD) $(QT_LDADD) $(VTK_LDADD) $(MODEL_LDADD) -lboost_serialization -lboost_date_time
CLEANFILES = $(BUILT_SOURCES)
|
