Created Na2DViewer class in preparation for common focus mechanism fo…

…r NaLargeMipWidget and NaZStackWidget. Updated Creator v3d.files after recent reorganization. Moved CTEST continuous build variables to client configuration file (out of svn)
Vaa3D · Jun 21, 2011 · b14f7f1 · b14f7f1
1 parent 10c1e28
commit b14f7f1
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 44 deletions.
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
@@ -6,11 +6,9 @@
 ##   INCLUDE(CTest)
 set(CTEST_PROJECT_NAME "V3D")
 set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
-# specify how long to run the continuous in minutes
-SET (CTEST_CONTINUOUS_DURATION 650)
-SET (CTEST_CONTINUOUS_MINIMUM_INTERVAL 15)
 
 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "my.cdash.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=V3D")
 set(CTEST_DROP_SITE_CDASH TRUE)
+
diff --git a/v3d.files b/v3d.files
@@ -2297,13 +2297,6 @@ v3d_main/neuron_annotator/NeuronAnnotatorResultNode.h
 v3d_main/neuron_annotator/NeuronAnnotatorResultNode.cpp
 v3d_main/neuron_annotator/TimebasedIdentifierGenerator.h
 v3d_main/neuron_annotator/TimebasedIdentifierGenerator.cpp
-v3d_main/neuron_annotator/Na3DWidget.cpp
-v3d_main/neuron_annotator/RendererNeuronAnnotator.h
-v3d_main/neuron_annotator/RendererNeuronAnnotator.cpp
-v3d_main/neuron_annotator/NaZStackWidget.cpp
-v3d_main/neuron_annotator/NaZStackWidget.h
-v3d_main/neuron_annotator/NaLargeMIPWidget.cpp
-v3d_main/neuron_annotator/NaLargeMIPWidget.h
 v3d_main/webservice/v3dwebservice.hpp
 v3d_main/webservice/v3dwebservice_conf.h
 v3d_main/webservice/v3dwebserver.h
@@ -2323,21 +2316,15 @@ v3d_main/webservice/soapdep/soapv3dwebserverService.cpp
 v3d_main/webservice/soapdep/soapStub.h
 v3d_main/webservice/soapdep/soapH.h
 v3d_main/webservice/soapdep/soapC.cpp
-v3d_main/neuron_annotator/GalleryButton.h
-v3d_main/neuron_annotator/GalleryButton.cpp
 released_plugins/v3d_plugins/HDRfilter/hdrfilter.h
 released_plugins/v3d_plugins/HDRfilter/hdrfilter_gui.h
 released_plugins/v3d_plugins/HDRfilter/hdrfilter.cpp
-v3d_main/neuron_annotator/NaViewer.h
-v3d_main/neuron_annotator/NaViewer.cpp
 v3d_main/neuron_annotator/geometry/Rotation3D.h
 v3d_main/neuron_annotator/geometry/Rotation3D.cpp
 v3d_main/neuron_annotator/geometry/Vector3D.h
 v3d_main/neuron_annotator/geometry/Vector3D.cpp
 v3d_main/neuron_annotator/geometry/CameraModel.h
 v3d_main/neuron_annotator/geometry/CameraModel.cpp
-v3d_main/neuron_annotator/GammaWidget.h
-v3d_main/neuron_annotator/GammaWidget.cpp
 v3d_main/neuron_annotator/NeuronSelector.cpp
 v3d_main/neuron_annotator/NeuronSelector.h
 released_plugins/v3d_plugins/mapview/mapviewer.pro
@@ -2351,16 +2338,8 @@ released_plugins/v3d_plugins/mapview/mg_image_lib11.cpp
 released_plugins/v3d_plugins/mapview/mapviewer.cpp
 v3d_main/neuron_annotator/MipData.h
 v3d_main/neuron_annotator/MipData.cpp
-v3d_main/neuron_annotator/MouseClickManager.h
-v3d_main/neuron_annotator/MouseClickManager.cpp
 v3d_main/neuron_annotator/NeuronMipManager.h
 v3d_main/neuron_annotator/NeuronNipManager.cpp
-v3d_main/neuron_annotator/ImageColorizer.h
-v3d_main/neuron_annotator/ImageColorizer.cpp
-v3d_main/neuron_annotator/BrightnessCalibrator.h
-v3d_main/neuron_annotator/BrightnessCalibrator.cpp
-v3d_main/neuron_annotator/AngleWidget.h
-v3d_main/neuron_annotator/AngleWidget.cpp
 v3d_main/neuron_annotator/CMakeLists.txt
 v3d_main/neuron_annotator/gui/angle_widget_designer_plugin/AngleWidgetPlugin.pro
 v3d_main/neuron_annotator/gui/angle_widget_designer_plugin/AngleWidgetPlugin.h
@@ -2374,8 +2353,6 @@ v3d_main/neuron_annotator/utility/ColorSeparatorConsolidator.h
 v3d_main/neuron_annotator/utility/ColorSeparatorConsolidator.cpp
 v3d_main/cell_counter/CellCounter3D.cpp
 v3d_main/cell_counter/CellCounter3D.h
-
-
 v3d_main/neuron_annotator/utility/SingleNeuronLsmSetReader.h
 v3d_main/neuron_annotator/utility/SingleNeuronLsmSetReader.cpp
 v3d_main/neuron_annotator/gui/ZoomWidget.h
@@ -2410,3 +2387,5 @@ v3d_main/neuron_annotator/gui/ZoomWidget.ui
 v3d_main/neuron_annotator/gui/NaMainWindow.ui
 v3d_main/neuron_annotator/gui/GammaWidget.ui
 v3d_main/neuron_annotator/gui/AngleWidget.ui
+v3d_main/neuron_annotator/gui/Na2DViewer.h
+v3d_main/neuron_annotator/gui/Na2DViewer.cpp
diff --git a/v3d_main/neuron_annotator/CMakeLists.txt b/v3d_main/neuron_annotator/CMakeLists.txt
@@ -23,6 +23,7 @@ QT4_WRAP_CPP(NA_MOC_SRCS
     MipData.h
     MipLayer.h
     gui/MouseClickManager.h
+    gui/Na2DViewer.h
     gui/Na3DWidget.h
     gui/NaLargeMIPWidget.h
     gui/NaMainWindow.h

diff --git a/v3d_main/neuron_annotator/gui/Na2DViewer.cpp b/v3d_main/neuron_annotator/gui/Na2DViewer.cpp
@@ -0,0 +1,3 @@
+#include "Na2DViewer.h"
+
+
diff --git a/v3d_main/neuron_annotator/gui/Na2DViewer.h b/v3d_main/neuron_annotator/gui/Na2DViewer.h
@@ -0,0 +1,23 @@
+#ifndef NA2DVIEWER_H
+#define NA2DVIEWER_H
+
+#include <QWidget>
+#include <QPainter>
+#include <QTransform>
+#include <QPixmap>
+#include "NaViewer.h"
+
+// Na2DViewer is the common base class of NaLargeMipWidget and NaZStackWidget
+class Na2DViewer : public QWidget, public NaViewer
+{
+public:
+    Na2DViewer(QWidget * parent = NULL) : QWidget(parent) {}
+
+protected:
+    QPixmap pixmap;
+    QPainter painter;
+    QTransform X_img_view;
+    QTransform X_view_img;
+};
+
+#endif // NA2DVIEWER_H
diff --git a/v3d_main/neuron_annotator/gui/NaLargeMIPWidget.cpp b/v3d_main/neuron_annotator/gui/NaLargeMIPWidget.cpp
@@ -147,14 +147,14 @@ void MipDisplayImage::toggleNeuronDisplay(int neuronIx, bool checked)
 //////////////////////////////
 
 NaLargeMIPWidget::NaLargeMIPWidget(QWidget * parent)
-    : QWidget(parent)
+    : Na2DViewer(parent)
     , mipImage(NULL)
     , imageUpdateThread(this)
-    , pixmap(200, 200)
     , highlightedNeuronMaskPixmap(200, 200)
     , highlightedNeuronIndex(-1)
 {
     // Test image
+    pixmap = QPixmap(200, 200);
     pixmap.fill(Qt::black);
     highlightedNeuronMaskPixmap.fill(Qt::transparent);
     updateDefaultScale();

diff --git a/v3d_main/neuron_annotator/gui/NaLargeMIPWidget.h b/v3d_main/neuron_annotator/gui/NaLargeMIPWidget.h
@@ -6,7 +6,7 @@
 #include <QImage>
 #include <QPixmap>
 #include <QPainter>
-#include "NaViewer.h"
+#include "Na2DViewer.h"
 #include "MouseClickManager.h"
 #include "BrightnessCalibrator.h"
 
@@ -50,7 +50,7 @@ public slots:
 
 // Large maximum intensity projection viewer for Neuron Annotator
 // mode of V3D
-class NaLargeMIPWidget : public QWidget, public NaViewer
+class NaLargeMIPWidget : public Na2DViewer
 {
     Q_OBJECT
 
@@ -97,15 +97,11 @@ protected slots:
     void updatePixmap();
 
     MipDisplayImage * mipImage;
-    QPixmap pixmap;
 
     // QImage * highlightedNeuronMaskImage;
     QPixmap highlightedNeuronMaskPixmap;
     int highlightedNeuronIndex;
 
-    QPainter painter;
-    QTransform X_img_view;
-    QTransform X_view_img;
     QThread imageUpdateThread;
     QProgressBar * progressBar;
     // Help distinguish between single clicks and double clicks

diff --git a/v3d_main/neuron_annotator/gui/NaZStackWidget.cpp b/v3d_main/neuron_annotator/gui/NaZStackWidget.cpp
@@ -103,7 +103,7 @@ template <class T> QPixmap getXYPlane(const T * pdata, V3DLONG sx, V3DLONG sy, V
 }
 
 NaZStackWidget::NaZStackWidget(QWidget * parent)
-    : QWidget(parent)
+    : Na2DViewer(parent)
 {
     pData1d = NULL;
     pDispData1d = NULL;
@@ -152,8 +152,7 @@ NaZStackWidget::~NaZStackWidget() {}
 
 void NaZStackWidget::paintEvent(QPaintEvent *event)
 {
-    QPainter painter(this);
-    //painter.save()
+    painter.begin(this);
 
     // Color background black
     painter.fillRect(0, 0, width(), height(), Qt::black);
@@ -179,10 +178,12 @@ void NaZStackWidget::paintEvent(QPaintEvent *event)
 
     painter.drawPixmap(0, 0, pixmap);
 
-    if(!runHDRFILTER) return; // Z Stack
+    if(runHDRFILTER) { // Z Stack
+        // ROI
+        drawROI(&painter);
+    }
 
-    // ROI
-    drawROI(&painter);
+    painter.end();
 }
 
 void NaZStackWidget::drawROI(QPainter *painter)

diff --git a/v3d_main/neuron_annotator/gui/NaZStackWidget.h b/v3d_main/neuron_annotator/gui/NaZStackWidget.h
@@ -14,7 +14,7 @@ class QRectF;
 #include "../../basic_c_fun/v3d_basicdatatype.h"
 #include "../../basic_c_fun/basic_4dimage.h"
 #include "../../v3d/v3d_core.h"
-#include "NaViewer.h"
+#include "Na2DViewer.h"
 #include "BrightnessCalibrator.h"
 
 // NaZStackWidget is a viewer for successive slices of a 3D volume.
@@ -25,7 +25,7 @@ class QRectF;
 #define MINSZBOX 2
 #define NCLRCHNNL 5
 
-class NaZStackWidget : public QWidget, public NaViewer
+class NaZStackWidget : public Na2DViewer
 {
     Q_OBJECT
 
@@ -152,8 +152,6 @@ public slots:
     void *pDispData1d; // display
     void *pData1d; // ori
 
-    QPixmap pixmap;
-
     float min_img[NCLRCHNNL], max_img[NCLRCHNNL], scale_img[NCLRCHNNL]; // assume max color channel is 3
 
     // roi

diff --git a/v3d_main/v3d/v3d.pro b/v3d_main/v3d/v3d.pro
@@ -197,6 +197,7 @@ HEADERS += ../basic_c_fun/mg_utilities.h \
     v3d_version_info.h \
     v3d_application.h \
     ../neuron_annotator/gui/NaViewer.h \
+    ../neuron_annotator/gui/Na2DViewer.h \
     ../neuron_annotator/gui/NaMainWindow.h \
     ../neuron_annotator/gui/Na3DWidget.h \
     ../neuron_annotator/gui/NaZStackWidget.h \
@@ -314,6 +315,7 @@ SOURCES += ../basic_c_fun/mg_utilities.cpp \
     v3d_version_info.cpp \
     v3d_application.cpp \
     ../neuron_annotator/gui/NaViewer.cpp \
+    ../neuron_annotator/gui/Na2DViewer.h \
     ../neuron_annotator/gui/NaMainWindow.cpp \
     ../neuron_annotator/gui/Na3DWidget.cpp \
     ../neuron_annotator/gui/NaZStackWidget.cpp \