Skip to content

Commit

Permalink
Reorder GUI files + fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@editeodoro
editeodoro committed Jan 29, 2021
1 parent 08b4988 commit 9a97658
Show file tree
Hide file tree
Showing 17 changed files with 8,733 additions and 74 deletions.
17 changes: 7 additions & 10 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,26 +233,24 @@ cleangui:
gui :
cd ./src/GUI && mv BbaroloGUI.pro BbaroloGUI.or && \
cp BbaroloGUI.or BbaroloGUI.pro && \
echo "LIBS += $(LIBS) -static-libgcc -static-libstdc++" >> BbaroloGUI.pro && \
echo "QMAKE_FLAGS += $(OPT) $(CINC)" >> BbaroloGUI.pro && \
echo "QMAKE_FLAGS -= -stdlib=libc++" >> BbaroloGUI.pro && \
echo "QMAKE_CC = $(CC) $(OPT) " >> BbaroloGUI.pro &&\
echo "QMAKE_CXX = $(CXX) $(OPT) " >> BbaroloGUI.pro &&\
echo "QMAKE_LINK = $(CXX) $(OPT) " >> BbaroloGUI.pro &&\
echo "QMAKE_LFLAGS -= -stdlib=libc++" >> BbaroloGUI.pro && \
echo "QMAKE_CC = $(CC)" >> BbaroloGUI.pro &&\
echo "QMAKE_CXX = $(CXX)" >> BbaroloGUI.pro &&\
echo "QMAKE_LINK = $(CXX)" >> BbaroloGUI.pro &&\
echo "QMAKE_CFLAGS -= -stdlib=libc++" >> BbaroloGUI.pro && \
echo "QMAKE_CXXFLAGS -= -stdlib=libc++" >> BbaroloGUI.pro && \
echo "LIBS += $(LIBS) -static-libgcc -static-libstdc++" >> BbaroloGUI.pro && \
qmake && \
rm BbaroloGUI.pro && mv BbaroloGUI.or BbaroloGUI.pro && \
make
ifeq ($(OPS),MACOSX)
cp BBarolo ./BBaroloGUI.app/Contents/MacOS/
cp $(BASE)/GUI/Bbarolo.tiff ./BBaroloGUI.app/Contents/Resources/
endif

justgui :
cd ./src/GUI && make
ifeq ($(OPS),MACOSX)
cp BBarolo ./BBaroloGUI.app/Contents/MacOS/
cp $(BASE)/GUI/Bbarolo.tiff ./BBaroloGUI.app/Contents/Resources/
endif

all:
Expand All @@ -263,8 +261,7 @@ static: builddir $(OBJECTS)

guistatic :
rm -rf ./BBaroloGUI.app/Contents/Resources/qt.conf
macdeployqt ./BBaroloGUI.app/ -no-plugins
cp $(BASE)/GUI/Bbarolo.tiff ./BBaroloGUI.app/Contents/Resources/
macdeployqt ./BBaroloGUI.app
$(LINK) -o ./BBaroloGUI.app/Contents/MacOS/BBarolo $(OBJECTS) $(STATICLIBS) -static-libgcc -static-libstdc++

guistaticlinux :
Expand Down
2 changes: 1 addition & 1 deletion src/Arrays/param.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ struct GALFIT_PAR : GALMOD_PAR {
float DISTANCE = -1; ///< Distance of the galaxy to convert arcs to kpc.
bool flagADRIFT = false; ///< Whether correcting for asymmetric drift.
bool PLOTMASK = false; ///< Whether to show the mask in output plots
string REVERSE = "auto"; ///< Whether to use a reverse cumulative fitting.
string REVERSE = "false"; ///< Whether to use a reverse cumulative fitting.
bool NORMALCUBE = true; ///< Whether to normalize the input flux values.
bool flagBADOUT = false; ///< Whether to write bad rings (with flag) in output.

Expand Down
Binary file removed src/GUI/Bbarolo.tiff
View file
Binary file not shown.
9 changes: 8 additions & 1 deletion src/GUI/BbaroloGUI.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
TARGET = BBaroloGUI
TEMPLATE = app

CONFIG += qt

DESTDIR= ../../
OBJECTS_DIR= ../Build
MOC_DIR= ../Build
Expand Down Expand Up @@ -67,4 +69,9 @@ HEADERS += bbarolowindow.h \

FORMS += bbarolowindow.ui

ICON = Bbarolo.icns
ICON = resources/Bbarolo.icns

RESOURCES += \
resources.qrc

INCLUDEPATH += /usr/local/include ../
Binary file removed src/GUI/Bbarolo_ico.png
View file
Binary file not shown.
Binary file removed src/GUI/Bbarolo_ico2.png
View file
Binary file not shown.
45 changes: 30 additions & 15 deletions src/GUI/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ MAKEFILE = Makefile

####### Compiler, tools and options

CC = gcc -O2 -ftree-vectorize -fPIC -Wuninitialized -std=c++11 -fopenmp
CXX = g++ -O2 -ftree-vectorize -fPIC -Wuninitialized -std=c++11 -fopenmp
CC = gcc -O2 -ftree-vectorize -fPIC -Wuninitialized -std=c++11 -fopenmp -DHAVE_GNUPLOT -DHAVE_FFTW3 -DHAVE_PYTHON -DMACOSX
CXX = g++ -O2 -ftree-vectorize -fPIC -Wuninitialized -std=c++11 -fopenmp -DHAVE_GNUPLOT -DHAVE_FFTW3 -DHAVE_PYTHON -DMACOSX
DEFINES = -DQT_NO_DEBUG -DQT_PRINTSUPPORT_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB
CFLAGS = -pipe -O2 -Wall -W -fPIC $(DEFINES)
CXXFLAGS = -pipe -stdlib=libc++ -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtPrintSupport.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtWidgets.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtGui.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtCore.framework/Headers -I../Build -I/System/Library/Frameworks/OpenGL.framework/Headers -I/System/Library/Frameworks/AGL.framework/Headers/ -I. -I/Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang -F/Users/edt/Programs/QT/5.7/clang_64/lib
CXXFLAGS = -pipe -O2 -Wall -W -fPIC $(DEFINES)
INCPATH = -I. -isystem /usr/local/include -I.. -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtPrintSupport.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtWidgets.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtGui.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtCore.framework/Headers -I../Build -I/System/Library/Frameworks/OpenGL.framework/Headers -I/System/Library/Frameworks/AGL.framework/Headers/ -I. -I/Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang -F/Users/edt/Programs/QT/5.7/clang_64/lib
QMAKE = /Users/edt/Programs/QT/5.7/clang_64/bin/qmake
DEL_FILE = rm -f
CHK_DIR_EXISTS= test -d
Expand All @@ -34,7 +34,7 @@ TAR = tar -cf
COMPRESS = gzip -9f
DISTNAME = BBaroloGUI1.0.0
DISTDIR = /Users/edt/Dropbox/Codex/BBarolo/src/Build/BBaroloGUI1.0.0
LINK = g++ -O2 -ftree-vectorize -fPIC -Wuninitialized -std=c++11 -fopenmp
LINK = g++ -O2 -ftree-vectorize -fPIC -Wuninitialized -std=c++11 -fopenmp -DHAVE_GNUPLOT -DHAVE_FFTW3 -DHAVE_PYTHON -DMACOSX
LFLAGS = -headerpad_max_install_names -Wl,-rpath,/Users/edt/Programs/QT/5.7/clang_64/lib
LIBS = $(SUBLIBS) -F/Users/edt/Programs/QT/5.7/clang_64/lib -L/usr/local/lib -lfftw3 -lcfitsio -lwcs -lm -static-libgcc -static-libstdc++ -framework QtPrintSupport -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL
AR = ar cq
Expand All @@ -58,7 +58,8 @@ SOURCES = main.cpp \
../Arrays/header.cpp \
../Utilities/interpolation.cpp \
../Utilities/fitsUtils.cpp \
qcustomplot.cpp ../Build/moc_bbarolowindow.cpp \
qcustomplot.cpp qrc_resources.cpp \
../Build/moc_bbarolowindow.cpp \
../Build/moc_qcustomplot.cpp
OBJECTS = ../Build/main.o \
../Build/bbarolowindow.o \
Expand All @@ -71,6 +72,7 @@ OBJECTS = ../Build/main.o \
../Build/interpolation.o \
../Build/fitsUtils.o \
../Build/qcustomplot.o \
../Build/qrc_resources.o \
../Build/moc_bbarolowindow.o \
../Build/moc_qcustomplot.o
DIST = /Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/spec_pre.prf \
Expand Down Expand Up @@ -205,13 +207,13 @@ DIST = /Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/spec_pre.pr
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/default_post.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/mac/default_post.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/mac/objective_c.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/warn_on.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/qt.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/resources.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/moc.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/unix/opengl.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/uic.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/unix/thread.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/warn_on.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/file_copies.prf \
BbaroloGUI.pro bbarolowindow.h \
../Arrays/header.hh \
Expand Down Expand Up @@ -372,15 +374,16 @@ Makefile: BbaroloGUI.pro /Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang/
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/default_post.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/mac/default_post.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/mac/objective_c.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/warn_on.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/qt.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/resources.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/moc.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/unix/opengl.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/uic.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/unix/thread.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/warn_on.prf \
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/file_copies.prf \
BbaroloGUI.pro \
resources.qrc \
/Users/edt/Programs/QT/5.7/clang_64/lib/QtPrintSupport.framework/QtPrintSupport.prl \
/Users/edt/Programs/QT/5.7/clang_64/lib/QtWidgets.framework/QtWidgets.prl \
/Users/edt/Programs/QT/5.7/clang_64/lib/QtGui.framework/QtGui.prl \
Expand Down Expand Up @@ -518,15 +521,16 @@ Makefile: BbaroloGUI.pro /Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang/
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/default_post.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/mac/default_post.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/mac/objective_c.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/warn_on.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/qt.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/resources.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/moc.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/unix/opengl.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/uic.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/unix/thread.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/warn_on.prf:
/Users/edt/Programs/QT/5.7/clang_64/mkspecs/features/file_copies.prf:
BbaroloGUI.pro:
resources.qrc:
/Users/edt/Programs/QT/5.7/clang_64/lib/QtPrintSupport.framework/QtPrintSupport.prl:
/Users/edt/Programs/QT/5.7/clang_64/lib/QtWidgets.framework/QtWidgets.prl:
/Users/edt/Programs/QT/5.7/clang_64/lib/QtGui.framework/QtGui.prl:
Expand All @@ -548,10 +552,10 @@ qmake_all: FORCE
@test -d ../../BBaroloGUI.app/Contents || mkdir -p ../../BBaroloGUI.app/Contents
@$(DEL_FILE) ../../BBaroloGUI.app/Contents/Info.plist
@sed -e "s,@SHORT_VERSION@,1.0,g" -e "s,@FULL_VERSION@,1.0.0,g" -e "s,@TYPEINFO@,????,g" -e "s,@BUNDLEIDENTIFIER@,com.yourcompany.BBaroloGUI,g" -e "s,@ICON@,Bbarolo.icns,g" -e "s,@EXECUTABLE@,BBaroloGUI,g" -e "s,@LIBRARY@,BBaroloGUI,g" -e "s,@TYPEINFO@,????,g" /Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang/Info.plist.app >../../BBaroloGUI.app/Contents/Info.plist
../../BBaroloGUI.app/Contents/Resources/Bbarolo.icns: Bbarolo.icns
../../BBaroloGUI.app/Contents/Resources/Bbarolo.icns: resources/Bbarolo.icns
@test -d ../../BBaroloGUI.app/Contents/Resources/ || mkdir -p ../../BBaroloGUI.app/Contents/Resources/
@$(DEL_FILE) ../../BBaroloGUI.app/Contents/Resources/Bbarolo.icns
@$(COPY_FILE) Bbarolo.icns ../../BBaroloGUI.app/Contents/Resources/Bbarolo.icns
@$(COPY_FILE) resources/Bbarolo.icns ../../BBaroloGUI.app/Contents/Resources/Bbarolo.icns

all: Makefile \
../../BBaroloGUI.app/Contents/PkgInfo \
Expand All @@ -565,6 +569,7 @@ dist: distdir FORCE
distdir: FORCE
@test -d $(DISTDIR) || mkdir -p $(DISTDIR)
$(COPY_FILE) --parents $(DIST) $(DISTDIR)/
$(COPY_FILE) --parents resources.qrc $(DISTDIR)/
$(COPY_FILE) --parents bbarolowindow.h ../Arrays/header.hh ../Arrays/param.hh ../Utilities/utils.hh qcustomplot.h $(DISTDIR)/
$(COPY_FILE) --parents main.cpp bbarolowindow.cpp bbarolowindow_run.cpp ../Arrays/param.cpp ../Utilities/utils.cpp ../Utilities/wcsUtils.cpp ../Utilities/string.cpp ../Arrays/header.cpp ../Utilities/interpolation.cpp ../Utilities/fitsUtils.cpp qcustomplot.cpp $(DISTDIR)/
$(COPY_FILE) --parents bbarolowindow.ui $(DISTDIR)/
Expand All @@ -587,19 +592,26 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean

mocables: compiler_moc_header_make_all compiler_moc_source_make_all

compiler_rcc_make_all:
compiler_rcc_make_all: qrc_resources.cpp
compiler_rcc_clean:
-$(DEL_FILE) qrc_resources.cpp
qrc_resources.cpp: resources.qrc \
/Users/edt/Programs/QT/5.7/clang_64/bin/rcc \
resources/bbarolo.png \
resources/Bbarolo.icns
/Users/edt/Programs/QT/5.7/clang_64/bin/rcc -name resources resources.qrc -o qrc_resources.cpp

compiler_moc_header_make_all: ../Build/moc_bbarolowindow.cpp ../Build/moc_qcustomplot.cpp
compiler_moc_header_clean:
-$(DEL_FILE) ../Build/moc_bbarolowindow.cpp ../Build/moc_qcustomplot.cpp
../Build/moc_bbarolowindow.cpp: ../Arrays/param.hh \
bbarolowindow.h \
/Users/edt/Programs/QT/5.7/clang_64/bin/moc
/Users/edt/Programs/QT/5.7/clang_64/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang -I/Users/edt/Dropbox/Codex/BBarolo/src/GUI -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtPrintSupport.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtWidgets.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtGui.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtCore.framework/Headers -I/usr/include/c++/6.2.1 -I/usr/include/c++/6.2.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.2.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include-fixed -I/usr/include -F/Users/edt/Programs/QT/5.7/clang_64/lib bbarolowindow.h -o ../Build/moc_bbarolowindow.cpp
/Users/edt/Programs/QT/5.7/clang_64/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang -I/Users/edt/Dropbox/Codex/BBarolo/src/GUI -I/usr/local/include -I/Users/edt/Dropbox/Codex/BBarolo/src -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtPrintSupport.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtWidgets.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtGui.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtCore.framework/Headers -I/usr/include/c++/6.2.1 -I/usr/include/c++/6.2.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.2.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include-fixed -I/usr/include -F/Users/edt/Programs/QT/5.7/clang_64/lib bbarolowindow.h -o ../Build/moc_bbarolowindow.cpp

../Build/moc_qcustomplot.cpp: qcustomplot.h \
/Users/edt/Programs/QT/5.7/clang_64/bin/moc
/Users/edt/Programs/QT/5.7/clang_64/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang -I/Users/edt/Dropbox/Codex/BBarolo/src/GUI -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtPrintSupport.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtWidgets.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtGui.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtCore.framework/Headers -I/usr/include/c++/6.2.1 -I/usr/include/c++/6.2.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.2.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include-fixed -I/usr/include -F/Users/edt/Programs/QT/5.7/clang_64/lib qcustomplot.h -o ../Build/moc_qcustomplot.cpp
/Users/edt/Programs/QT/5.7/clang_64/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/Users/edt/Programs/QT/5.7/clang_64/mkspecs/macx-clang -I/Users/edt/Dropbox/Codex/BBarolo/src/GUI -I/usr/local/include -I/Users/edt/Dropbox/Codex/BBarolo/src -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtPrintSupport.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtWidgets.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtGui.framework/Headers -I/Users/edt/Programs/QT/5.7/clang_64/lib/QtCore.framework/Headers -I/usr/include/c++/6.2.1 -I/usr/include/c++/6.2.1/x86_64-pc-linux-gnu -I/usr/include/c++/6.2.1/backward -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include -I/usr/local/include -I/usr/lib/gcc/x86_64-pc-linux-gnu/6.2.1/include-fixed -I/usr/include -F/Users/edt/Programs/QT/5.7/clang_64/lib qcustomplot.h -o ../Build/moc_qcustomplot.cpp

compiler_moc_source_make_all:
compiler_moc_source_clean:
Expand All @@ -611,7 +623,7 @@ ui_bbarolowindow.h: bbarolowindow.ui \
qcustomplot.h
/Users/edt/Programs/QT/5.7/clang_64/bin/uic bbarolowindow.ui -o ui_bbarolowindow.h

compiler_clean: compiler_moc_header_clean compiler_uic_clean
compiler_clean: compiler_rcc_clean compiler_moc_header_clean compiler_uic_clean

####### Compile

Expand Down Expand Up @@ -656,6 +668,9 @@ compiler_clean: compiler_moc_header_clean compiler_uic_clean
../Build/qcustomplot.o: qcustomplot.cpp qcustomplot.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../Build/qcustomplot.o qcustomplot.cpp

../Build/qrc_resources.o: qrc_resources.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../Build/qrc_resources.o qrc_resources.cpp

../Build/moc_bbarolowindow.o: ../Build/moc_bbarolowindow.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ../Build/moc_bbarolowindow.o ../Build/moc_bbarolowindow.cpp

Expand Down
Binary file removed src/GUI/bbarolo.pdf
View file
Binary file not shown.
32 changes: 0 additions & 32 deletions src/GUI/bbarologui_plugin_import.cpp
View file

This file was deleted.

Binary file removed src/GUI/bbarolonew.tiff
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/GUI/bbarolowindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ BBaroloWindow::BBaroloWindow(QWidget *parent) :
ui->plot4->setInteraction(QCP::iRangeZoom, true);

Hide_All_3DFit_file(true);
ui->Logolabel->setPixmap(QPixmap(currentPath.path()+"/BBaroloGUI.app/Contents/Resources/Bbarolo.tiff"));
ui->Logolabel->setPixmap(QPixmap(":resources/bbarolo.png"));
ui->AutocheckBox->setHidden(true);
ui->MaskThreshSpinBox->setHidden(true);

Expand Down
Loading

0 comments on commit 9a97658

Please sign in to comment.