add collaborate function

v3d_main/3drenderer/nstroke.cpp

@@ -1648,6 +1648,9 @@ void Renderer_gl1::segEnd2SegIDmapping(My4DImage* curImg)
 	//this->tail2SegIDmap.clear();
 	for (vector<V_NeuronSWC>::iterator it = curImg->tracedNeuron.seg.begin(); it != curImg->tracedNeuron.seg.end(); ++it)
 	{
+        if(it->row.size() == 0){
+            continue;
+        }
 		double xLabelTail = it->row.begin()->x;
 		double yLabelTail = it->row.begin()->y;
 		double zLabelTail = it->row.begin()->z;

v3d_main/3drenderer/nstroke_tracing.cpp

@@ -4788,8 +4788,9 @@ set<size_t> Renderer_gl1::segEndRegionCheck(My4DImage* curImg, size_t inputSegID
 		//cout << *headIt << " ";
 		for (vector<V_NeuronSWC_unit>::iterator nodeIt = curImg->tracedNeuron.seg[*headIt].row.begin(); nodeIt != curImg->tracedNeuron.seg[*headIt].row.end(); ++nodeIt)
 		{
-			if (nodeIt->x == (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->x && nodeIt->y == (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->y && nodeIt->z == (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->z)
-				otherConnectedSegs.insert(*headIt);
+//			if (nodeIt->x == (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->x && nodeIt->y == (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->y && nodeIt->z == (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->z)
+            if (fabs(nodeIt->x - (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->x) < 1e-5 && fabs(nodeIt->y - (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->y) < 1e-5 && fabs(nodeIt->z - (curImg->tracedNeuron.seg[inputSegID].row.end() - 1)->z) < 1e-5)
+                otherConnectedSegs.insert(*headIt);
 		}
 	}
 	//cout << endl << " Tail region segs:";
@@ -4803,8 +4804,9 @@ set<size_t> Renderer_gl1::segEndRegionCheck(My4DImage* curImg, size_t inputSegID
 		//cout << *tailIt << " ";
 		for (vector<V_NeuronSWC_unit>::iterator nodeIt = curImg->tracedNeuron.seg[*tailIt].row.begin(); nodeIt != curImg->tracedNeuron.seg[*tailIt].row.end(); ++nodeIt)
 		{
-			if (nodeIt->x == curImg->tracedNeuron.seg[inputSegID].row.begin()->x && nodeIt->y == curImg->tracedNeuron.seg[inputSegID].row.begin()->y && nodeIt->z == curImg->tracedNeuron.seg[inputSegID].row.begin()->z)
-				otherConnectedSegs.insert(*tailIt);
+//			if (nodeIt->x == curImg->tracedNeuron.seg[inputSegID].row.begin()->x && nodeIt->y == curImg->tracedNeuron.seg[inputSegID].row.begin()->y && nodeIt->z == curImg->tracedNeuron.seg[inputSegID].row.begin()->z)
+            if (fabs(nodeIt->x - curImg->tracedNeuron.seg[inputSegID].row.begin()->x) < 1e-5 && fabs(nodeIt->y - curImg->tracedNeuron.seg[inputSegID].row.begin()->y) < 1e-5 && fabs(nodeIt->z - curImg->tracedNeuron.seg[inputSegID].row.begin()->z) < 1e-5)
+                otherConnectedSegs.insert(*tailIt);
 		}
 	}
 	//cout << endl;

v3d_main/3drenderer/v3dr_glwidget.cpp

@@ -5870,12 +5870,12 @@ bool V3dR_GLWidget::simpleConnectExecutor(V_NeuronSWC_list& segments, vector<seg
         //            qDebug()<<"(zll-debug)branchSeg.head_tail="<<branchSeg.head_tail;
         if (branchSeg.head_tail == -1) // head to head
         {
-                for (vector<V_NeuronSWC_unit>::iterator itNextSeg = segments.seg[branchSeg.segID].row.end() - 1;
-                     itNextSeg >= segments.seg[branchSeg.segID].row.begin(); --itNextSeg)
-                {
+            for (vector<V_NeuronSWC_unit>::iterator itNextSeg = segments.seg[branchSeg.segID].row.end() - 1;
+                itNextSeg >= segments.seg[branchSeg.segID].row.begin(); --itNextSeg)
+            {
                 itNextSeg->seg_id = branchSeg.segID;
                 segments.seg[mainSeg.segID].row.push_back(*itNextSeg);
-                }
+            }
         }
         else if (branchSeg.head_tail == 2) // head to tail
         {

v3d_main/terafly/src/control/CPlugin.cpp

@@ -141,6 +141,13 @@ void TeraFly::doaction(const QString &action_name)
 }
 }
 
+void TeraFly::closePMain(){
+    if(PMain::getInstance()){
+            PMain::uninstance();
+            PMain::getInstance()->deleteLater();
+    }
+}
+
 // returns true if version >= min_required_version, where version format is version.major.minor
 bool TeraFly::checkVersion(std::string version, std::string min_required_version)
 {

v3d_main/terafly/src/control/CPlugin.h

@@ -891,6 +891,7 @@ class terafly::TeraFly : public QObject
         // access points
         static void domenu(const QString &menu_name, V3DPluginCallback2 &callback, QWidget *parent);
         static void doaction(const QString &action_name);
+        static void closePMain();
 
         // returns true if version >= min_required_version, where version format is version.major.minor
         static bool checkVersion(std::string version, std::string min_required_version);

v3d_main/terafly/src/presentation/PMain.cpp

@@ -137,7 +137,7 @@ PMain* PMain::getInstance()
     else
     {
         tf::warning("TeraFly not yet instantiated", __itm__current__function__);
-        QMessageBox::critical(0,QObject::tr("Error"), QObject::tr("TeraFly not yet instantiated"),QObject::tr("Ok"));
+//        QMessageBox::critical(0,QObject::tr("Error"), QObject::tr("TeraFly not yet instantiated"),QObject::tr("Ok"));
 		return 0;
     }
 }
@@ -185,6 +185,13 @@ PMain::~PMain()
     /**/tf::debug(tf::LEV1, 0, __itm__current__function__);
 }
 
+QIcon PMain::getIcon(QString path, int w, int h){
+    QPixmap pixmap(path);
+    QPixmap scaledPixmap = pixmap.scaled(w, h, Qt::KeepAspectRatio);
+    QIcon icon(scaledPixmap);
+    return icon;
+}
+
 PMain::PMain(V3DPluginCallback2 *callback, QWidget *parent) : QWidget(parent)
 {
     /**/tf::debug(tf::LEV1, 0, __itm__current__function__);
@@ -226,7 +233,7 @@ PMain::PMain(V3DPluginCallback2 *callback, QWidget *parent) : QWidget(parent)
     closeVolumeAction = new QAction(QIcon(":/icons/close.png"), "Close image", this);
     //saveandchangetype=new QAction(QIcon(":/icons/changetype.png"),"Change curren types",this);
     //returntochangedtype=new QAction(QIcon(":/icons/returntype.png"),"Return curren types",this);
-    loadAnnotationsAction = new QAction(QIcon(":/icons/open_ano.png"), "Load annotations", this);
+    loadAnnotationsAction = new QAction(getIcon(":/icons/open_ano.png", 50, 50), "Load annotations", this);
     saveAnnotationsAction = new QAction(QIcon(":/icons/save.png"), "Save annotations", this);
     saveAnnotationsAfterRemoveDupNodesAction=new QAction("Remove dup nodes before saving annotations",this);
     saveAnnotationsAsAction = new QAction(QIcon(":/icons/saveas.png"), "Save annotations as", this);
@@ -277,6 +284,7 @@ PMain::PMain(V3DPluginCallback2 *callback, QWidget *parent) : QWidget(parent)
     fileMenu->addAction(clearAnnotationsAction);
     fileMenu->addSeparator();
     fileMenu->addAction(exitAction);
+//    fileMenu->setStyleSheet("QMenu::item { min-height: 30px; }");
 #ifdef __ALLOW_VR_FUNCS__
     /*----------------collaborate mdoe-------------------*/
     collaborateMenu=menuBar->addMenu("Collaborate");
@@ -1221,7 +1229,7 @@ PMain::PMain(V3DPluginCallback2 *callback, QWidget *parent) : QWidget(parent)
     layout->setSpacing(0);
     setContentsMargins(0, 0, 0, 0);
     setLayout(layout);
-    setWindowTitle(QString("TeraFly v").append(terafly::version.c_str()));
+    setWindowTitle(QString("CAR-WS v").append(terafly::version.c_str()));
     this->setFont(tinyFont);
 
     // signals and slots
@@ -1373,8 +1381,8 @@ void PMain::reset()
 //    T0_sbox->setValue(0);
 //    T1_sbox->setValue(0);
     frameCoord->setText("");
-    refSys->setXRotation(200);
-    refSys->setYRotation(50);
+    refSys->setXRotation(180);
+    refSys->setYRotation(40);
     refSys->setZRotation(0);
     refSys->setFilled(true);
     refSys->setDims(1,1,1);
@@ -2455,6 +2463,14 @@ void PMain::importDone(RuntimeException *ex, qint64 elapsed_time)
             info_page->showVirtualPyramidTab();
         }
 
+        // 获取屏幕尺寸
+        QRect screenGeometry = QApplication::primaryScreen()->geometry();
+        int screenWidth = screenGeometry.width();
+        int screenHeight = screenGeometry.height();
+        int curWidth = uniqueInstance->width();
+        uniqueInstance->resize(curWidth, screenHeight - 100);
+
+        new_win->resize(screenWidth - curWidth - 100, screenHeight - 100);
     }
 
     //resetting some widgets
@@ -2951,13 +2967,19 @@ void PMain::doTeraflyVRView()
     }
 }
 
+void PMain::doimageVRView(bool flag){
+    CViewer *cur_win = CViewer::getCurrent();
+    cur_win->view3DWidget->doimageVRView(flag);
+}
+
 void PMain::showPMain(){
     this->show();
 }
 
 void PMain::doCollaborationVRView()
 {
 	qDebug()<<"PMain::doCollaborationVRView()";
+    timerCheckConn->stop();
 	try
     {
         CViewer *cur_win = CViewer::getCurrent();

v3d_main/terafly/src/presentation/PMain.h

@@ -68,6 +68,7 @@ class terafly::PMain : public QWidget
         static PMain* uniqueInstance;
         PMain(){    /**/tf::debug(tf::LEV1, 0, __itm__current__function__);   }
         PMain(V3DPluginCallback2 *callback, QWidget *parent);
+        QIcon getIcon(QString path, int w, int h);
 
         //members
         V3DPluginCallback2* V3D_env;    //handle of V3D environment

v3d_main/v3d/mainwindow.cpp

@@ -283,7 +283,7 @@ MainWindow::MainWindow()
 ////qDebug()<<"jazz---------------debug---------------4";
     //const GLubyte* OpenGLVersion = glGetString(GL_VERSION);
 ////qDebug()<<"jazz---------------debug---------------5";
-
+    func_open_terafly();
 }
 
 //void MainWindow::postClose() //090812 RZC
@@ -312,7 +312,9 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
     //if (workspace)  workspace->deleteLater(); //110802 RZC //will call ~XFormView to raise BAD_ACCESS
     disconnect(workspace, SIGNAL(windowActivated(QWidget *)),  this, SLOT(updateMenus())); //instead of above line
+    terafly::TeraFly::closePMain();
     V3dApplication::handleCloseEvent(event);
+    return;
 }
 void MainWindow::transactionStart()
 {

v3d_main/vrrenderer/v3dr_gl_vr.cpp

@@ -3776,7 +3776,8 @@ void CMainApplication::ProcessVREvent( const vr::VREvent_t & event )
             }
 
             //special situation for splitnode in head or end
-            if((nearestNode==*nearestNT.listNeuron.begin())||(nearestNode==nearestNT.listNeuron.back())/*||nearestNT.listNeuron.size()<=3||nearestNode==*(nearestNT.listNeuron.begin()+1)||nearestNode==*(nearestNT.listNeuron.end()-2)*/)
+            if((nearestNode==*nearestNT.listNeuron.begin())||(nearestNode==nearestNT.listNeuron.back())/*||nearestNT.listNeuron.size()<=3||nearestNode==*
+            (nearestNT.listNeuron.begin()+1)||nearestNode==*(nearestNT.listNeuron.end()-2)*/)
             {
                 qDebug()<<"split node in hear/end or neuron is too short";
                 break;