Back out some unwanted/meaningless mozak changes.

Vaa3D · Feb 18, 2016 · d8a861c · d8a861c
1 parent a64cee7
commit d8a861c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 1,927 deletions.
diff --git a/v3d.files b/v3d.files
@@ -25199,7 +25199,7 @@ v3d_main/terafly/src/control/QUndoMarkerDeleteROI.cpp
 v3d_main/terafly/src/control/QUndoMarkerDeleteROI.h
 v3d_main/terafly/src/control/V3Dsubclasses.cpp
 v3d_main/terafly/src/control/V3Dsubclasses.h
-v3d_main/terafly/src/core/crossmips/compute_funcs.cpp
+v3d_main/terafly/src/core/crossmips/compute_funcs.cpp 
 v3d_main/terafly/src/core/crossmips/compute_funcs.h
 v3d_main/terafly/src/core/crossmips/CrossMIPs.h
 v3d_main/terafly/src/core/crossmips/libcrossmips.cpp

diff --git a/v3d.includes b/v3d.includes
diff --git a/v3d_main/3drenderer/nstroke_tracing.cpp b/v3d_main/3drenderer/nstroke_tracing.cpp
@@ -1139,7 +1139,7 @@ void Renderer_gl1::solveCurveFromMarkersFastMarching()
 void Renderer_gl1::adaptiveCurveResampling(vector <XYZ> &loc_vec, vector <XYZ> &loc_vec_resampled, int stepsize)
 {
      int N = loc_vec.size();
-     if (N<=0 || stepsize<=0) return;
+	if (N<=0 || stepsize<=0) return;
 
      loc_vec_resampled.clear();
      loc_vec_resampled.push_back(loc_vec.at(0)); //should have at least one entry now

diff --git a/v3d_main/3drenderer/renderer_hit.cpp b/v3d_main/3drenderer/renderer_hit.cpp
@@ -2071,7 +2071,6 @@ void Renderer_gl1::endSelectMode()
 	listMarkerPos.clear();
 	b_ablation = false; //by Jianlong Zhou, 20120726
 	b_lineAblation = false; //by Jianlong Zhou, 20120801
-
 	if (selectMode != smObject)
 	{
 		selectMode = smObject;

diff --git a/v3d_main/3drenderer/renderer_obj.cpp b/v3d_main/3drenderer/renderer_obj.cpp
@@ -32,6 +32,7 @@ Peng, H, Ruan, Z., Atasoy, D., and Sternson, S. (2010) “Automatic reconstructi
 #include "../io/asc_to_swc.h"
 //#include "../../../vaa3d_tools/released_plugins/v3d_plugins/resample_swc/resampling.h"
 
+
 #define CALL_glutSolidTorus glutSolidTorus
 #define CALL_glutSolidDode  glutSolidDodecahedron
 // if error then just warning
@@ -988,7 +989,7 @@ void Renderer_gl1::addCurveSWC(vector<XYZ> &loc_list, int chno)
 
             NeuronTree oldtree = listNeuronTree.at(realCurEditingNeuron_inNeuronTree);
             NeuronTree curTree  = curImg->proj_trace_add_curve_segment_append_to_a_neuron(loc_list, chno,
-                                                                                          oldtree, currentTraceType);
+                                                                                          oldtree, 3);
             listNeuronTree.replace(realCurEditingNeuron_inNeuronTree, curTree);
             curImg->update_3drenderer_neuron_view(w, this);
         }

diff --git a/v3d_main/build.macx b/v3d_main/build.macx
@@ -409,13 +409,13 @@ done;
 
 #now automatically execute v3d
 
-# if [ $DOIT == "YES" ] && [ $SKIPV3DAPP == "NO" ]; then
-#   if [ $SYSTEMBITS == "32" ]; then
-#     open bin/vaa3d.app &
-#   fi
-#   if [ $SYSTEMBITS == "64" ]; then
-#     open bin/vaa3d64.app &
-#   fi
-# fi
+if [ $DOIT == "YES" ] && [ $SKIPV3DAPP == "NO" ]; then
+  if [ $SYSTEMBITS == "32" ]; then
+    open bin/vaa3d.app &
+  fi
+  if [ $SYSTEMBITS == "64" ]; then
+    open bin/vaa3d64.app &
+  fi
+fi
 
 
diff --git a/v3d_main/v3d/v3d_core.cpp b/v3d_main/v3d/v3d_core.cpp
@@ -1627,7 +1627,7 @@ void XFormView::mouseDoubleClickEvent(QMouseEvent * e)
 
         switch(mb.exec()) {
             case QMessageBox::Yes:
-                //move the location: 080101
+				//move the location: 080101
 				setMouseTracking(false); //"false" should be the default, but I set it again here to assure the mouseMove event is captured only when one mouse button is pressed
 				b_moveCurrentLandmark=true;
 				ind_landmarkToBeChanged=ind_min;
@@ -6547,7 +6547,6 @@ void load_segment_neuron(My4DImage* curImg, Renderer_gl1* curRen) // 090622 RZC:
 }
 void load_merged_neuron(My4DImage* curImg, Renderer_gl1* curRen)
 {
-    cout << "load merged neuron " << endl;
 	V_NeuronSWC merged_neuron = merge_V_NeuronSWC_list(curImg->tracedNeuron);
 	merged_neuron.name = curImg->tracedNeuron.name;
 	merged_neuron.file = curImg->tracedNeuron.file;

diff --git a/v3d_main/v3d/v3d_essential.pro b/v3d_main/v3d/v3d_essential.pro
@@ -380,11 +380,6 @@ FORMS += landmark_property.ui \
     dialog_update_downloading.ui \
     dialog_update_checking.ui
 
-DEFINES += CGS_AUTOLAUNCH
-DEFINES += V3D_SKIP_AUTO_VERSION_CHECK
-DEFINES += RENDERER_RIGHT_CLICK_MENU_DISABLED
-#DEFINES += HIDE_ANO_TOOLBAR # show this for now, rather than re-implementing load/save annotation buttons
-DEFINES += FORCE_BBOX_MODE
 RESOURCES += ../mozak/mozak.qrc
 HEADERS +=  ../mozak/MozakUI.h \
             ../mozak/Mozak3DView.h