no message

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 796d46c51e8c953f65bb92b812fe01f9b210c5b2..7017b47744d204e1472a795fb877356bad65c384 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -833,14 +833,20 @@ void wxContourMainFrame :: createMirrorContourOf ( std::string anExistingKName,
        _theViewPanel->getSceneManager()->createCopyContourOf( anExistingKName, cloneName, manualModel , append );
 }
 
+//EED04
 void wxContourMainFrame ::loadState(std::string filename){
+       
+       deleteAllContours();
+       onLoadContours(filename,false);
+       
+       /* EED Borrame
        char tmp[255];
        FILE *pFile=fopen(filename.c_str(),"r+");
 
        fscanf(pFile,"%s",tmp); // --CreaContour--
 
        fscanf(pFile,"%s",tmp); // Version
-       fscanf(pFile,"%s",tmp); // 1.0.2 || 1.0.1 || 1.0.0
+       fscanf(pFile,"%s",tmp); // 1.0.3 || 1.0.2 || 1.0.1 || 1.0.0
 
        deleteAllContours();
 
@@ -848,21 +854,28 @@ void wxContourMainFrame ::loadState(std::string filename){
        loadContours(pFile, true);
 
        fclose(pFile);
+       */
 }
 
-void wxContourMainFrame ::loadContours( FILE *pFile, bool staticContour )
+
+//EED03
+/*EED Borrame
+void wxContourMainFrame::loadContours( FILE *pFile, bool staticContour )
 {
        char tmp[255];
 
-       fscanf(pFile,"%s",tmp); // ImageDimensions
-       fscanf(pFile,"%s",tmp); // X
-       fscanf(pFile,"%s",tmp); // Y
-       fscanf(pFile,"%s",tmp); // Z
+       if (staticContour==false)
+       {
+               fscanf(pFile,"%s",tmp); // ImageDimensions
+               fscanf(pFile,"%s",tmp); // X
+               fscanf(pFile,"%s",tmp); // Y
+               fscanf(pFile,"%s",tmp); // Z
 
-       fscanf(pFile,"%s",tmp); // ImageSpacing
-       fscanf(pFile,"%s",tmp); // X
-       fscanf(pFile,"%s",tmp); // Y
-       fscanf(pFile,"%s",tmp); // Z
+               fscanf(pFile,"%s",tmp); // ImageSpacing
+               fscanf(pFile,"%s",tmp); // X
+               fscanf(pFile,"%s",tmp); // Y
+               fscanf(pFile,"%s",tmp); // Z
+       }
 
        fscanf(pFile,"%s",tmp); // NumberOfContours
        fscanf(pFile,"%s",tmp); // ##
@@ -922,6 +935,8 @@ void wxContourMainFrame ::loadContours( FILE *pFile, bool staticContour )
                }
        }// for  numberOfContours
 }
+*/
+
 
 void wxContourMainFrame::onLoad()
 {
@@ -937,14 +952,12 @@ void wxContourMainFrame::onLoad()
                }
        }
 
-       onLoadContours(fileNameContourROI);
+       onLoadContours(fileNameContourROI,true);
 }
 
 
-
-void wxContourMainFrame::onLoadContours(std::string fileNameContourROI)
+void wxContourMainFrame::onLoadContours(std::string fileNameContourROI, bool interactiveInterface)
 {
-printf("EED2 wxContourMainFrame::onLoadContours 01 \n");
        char tmp[255];
        char tmpD[255];
 
@@ -961,7 +974,7 @@ printf("EED2 wxContourMainFrame::onLoadContours 01 \n");
                {
                        fscanf(pFileData,"%s",tmpD); // --CreaContour--
                        fscanf(pFileData,"%s",tmpD); // Version
-                       fscanf(pFileData,"%s",tmpD); // 1.0.2 || 1.0.1 || 1.0.0
+                       fscanf(pFileData,"%s",tmpD); // 1.0.3 || 1.0.2 || 1.0.1 || 1.0.0
 
                        fscanf(pFileData,"%s",tmpD); // onePixelSize
                        fscanf(pFileData,"%s",tmpD); // #
@@ -973,17 +986,26 @@ printf("EED2 wxContourMainFrame::onLoadContours 01 \n");
                fscanf(pFile,"%s",tmp); // --CreaContour--
 
                fscanf(pFile,"%s",tmp); // Version
-               fscanf(pFile,"%s",tmp); // 1.0.2 || 1.0.1 || 1.0.0
+               fscanf(pFile,"%s",tmp); // 1.0.3 || 1.0.2 || 1.0.1 || 1.0.0
                std::string version(tmp);
 
                //AD:02-06-09
         _tmpReadFileTypeOfTransformation=-1;
-               if (version=="1.0.2")
+               if (version=="1.0.3")
                {
-                   readDimSpc(pFile);
+                   readDimSpc(pFile,interactiveInterface);   // DimSpc interactive ON
                        openContours(pFile,pFileData,false);
                        openContours(pFile,pFileData,true);     //Load StaticContours
                }
+               
+               if (version=="1.0.2")
+               {
+//EED001
+                   readDimSpc(pFile,interactiveInterface);  // DimSpc interactive ON
+                       openContours(pFile,pFileData,false);
+                   readDimSpc(pFile,false);  // DimSpc interactive OFF
+                       openContours(pFile,pFileData,true);     //Load StaticContours
+               }
 
                //AD:02-06-09
                else if (version=="1.0.1")
@@ -1022,7 +1044,7 @@ void wxContourMainFrame::onImport(){
                filenamecontours = kernelManager->parseOsirixFile(filename);
 
                if(filenamecontours.compare("") != 0){
-                       onLoadContours(filenamecontours);
+                       onLoadContours(filenamecontours,true);
                }
 
        }
@@ -1081,11 +1103,11 @@ void wxContourMainFrame::saveFileWithContours( std::string filename )
        int i,sizeLstNameThings;
 
        fprintf(pFile,"--CreaContour--\n");
-       fprintf(pFile,"Version %s\n", "1.0.2" );
+       fprintf(pFile,"Version %s\n", "1.0.3" );
 
 //CMRU 03-09-09-----------------------------------------------------------------------------------------------
        fprintf(pFileData,"--CreaContour--\n");
-       fprintf(pFileData,"Version %s\n", "1.0.2" );
+       fprintf(pFileData,"Version %s\n", "1.0.3" );
        fprintf(pFileData,"OnePixelSize %f\n", _onePixelSize);
 
 //------------------------------------------------------------------------------------------------------------
@@ -1129,9 +1151,8 @@ void wxContourMainFrame::saveFileWithContours( std::string filename )
 
        //-- Static Contours
 
-       fprintf(pFile,"ImageDimensions %d %d %d\n", dimRange[0], dimRange[1], dimRange[2] );
-
-       fprintf(pFile,"ImageSpacing %f %f %f\n", spaRange[0], spaRange[1], spaRange[2] );
+//     fprintf(pFile,"ImageDimensions %d %d %d\n", dimRange[0], dimRange[1], dimRange[2] );
+//     fprintf(pFile,"ImageSpacing %f %f %f\n", spaRange[0], spaRange[1], spaRange[2] );
 
        lstNameThings           = kernelManager->GetLstNameThingsStatic();
        sizeLstNameThings       = lstNameThings.size();
@@ -1151,8 +1172,8 @@ void wxContourMainFrame::saveFileWithContours( std::string filename )
 }
 
 
-
-void wxContourMainFrame::readDimSpc(FILE *pFile)
+//EED02
+void wxContourMainFrame::readDimSpc(FILE *pFile, bool interactiveOption)
 {
        char tmp[255];
        int             imageDim[3];
@@ -1178,50 +1199,52 @@ void wxContourMainFrame::readDimSpc(FILE *pFile)
     _tmpReadFileImageSpac[2] = atof(tmp);
 
 
-    //Compare Spacing and Dims in X and Y (Necessary in Z?) - Just for Version 2
-    if (imageDim[0]!=_tmpReadFileImageDim[0] || imageDim[1]!=_tmpReadFileImageDim[1] || imageSpac[0]!=_tmpReadFileImageSpac[0] || imageSpac[1]!=_tmpReadFileImageSpac[1])
+       if (interactiveOption==true)
     {
-               wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(260,160));
-               wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
-               wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL);
-
-               wxString lstOptOperation[2];
-               lstOptOperation[0]=_T("By Dimension");
-               lstOptOperation[1]=_T("By Spacing");
-               wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(270,45), 2 , lstOptOperation,  2, wxRA_SPECIFY_COLS);
-
-               dialSizer->Add( new wxStaticText(dial,-1,_T("The image resolution is not compatible with the "))  , 0, wxGROW );
-               dialSizer->Add( new wxStaticText(dial,-1,_T("selected Roi file. Do you want to tranform it?"))  , 0, wxGROW );
-               dialSizer->Add( new wxStaticText(dial,-1,_T(" "))  , 0, wxGROW );
-               dialSizer->Add(radioOpts,0,wxGROW);
-               dialSizer->Add( new wxStaticText(dial,-1,_T(" "))  , 0, wxGROW );
-               dialSizer->Add(buttonsSizer,0,wxGROW);
-               dial->SetSizer(dialSizer, true);
-               dial->Layout();
-               dial->ShowModal();
-
-               int _tmpReadFileTypeOfTransformation = -1;
-               bool transform = false;
-
-               if (dial->GetReturnCode() == wxID_OK)
+               //Compare Spacing and Dims in X and Y (Necessary in Z?) - Just for Version 2
+               if (imageDim[0]!=_tmpReadFileImageDim[0] || imageDim[1]!=_tmpReadFileImageDim[1] || imageSpac[0]!=_tmpReadFileImageSpac[0] || imageSpac[1]!=_tmpReadFileImageSpac[1])
                {
-                       _tmpReadFileTypeOfTransformation    = radioOpts->GetSelection();
-               }// if wxOK
-
-    } // if dim spc
+                       wxDialog* dial = new wxDialog (this,-1,_T("Tools"),wxDefaultPosition, wxSize(260,160));
+                       wxSizer* buttonsSizer = dial->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+                       wxBoxSizer *dialSizer = new wxBoxSizer(wxVERTICAL);
+
+                       wxString lstOptOperation[2];
+                       lstOptOperation[0]=_T("By Dimension");
+                       lstOptOperation[1]=_T("By Spacing");
+                       wxRadioBox * radioOpts = new wxRadioBox(dial, -1, _T("Type of Transformation"), wxDefaultPosition, wxSize(270,45), 2 , lstOptOperation,  2, wxRA_SPECIFY_COLS);
+
+                       dialSizer->Add( new wxStaticText(dial,-1,_T("The image resolution is not compatible with the "))  , 0, wxGROW );
+                       dialSizer->Add( new wxStaticText(dial,-1,_T("selected Roi file. Do you want to tranform it?"))  , 0, wxGROW );
+                       dialSizer->Add( new wxStaticText(dial,-1,_T(" "))  , 0, wxGROW );
+                       dialSizer->Add(radioOpts,0,wxGROW);
+                       dialSizer->Add( new wxStaticText(dial,-1,_T(" "))  , 0, wxGROW );
+                       dialSizer->Add(buttonsSizer,0,wxGROW);
+                       dial->SetSizer(dialSizer, true);
+                       dial->Layout();
+                       dial->ShowModal();
+
+                       int _tmpReadFileTypeOfTransformation = -1;
+                       bool transform = false;
+
+                       if (dial->GetReturnCode() == wxID_OK)
+                       {
+                               _tmpReadFileTypeOfTransformation    = radioOpts->GetSelection();
+                       }// if wxOK
 
+               } // if dim spc
+    } // if interactiveOption
 }
 
 
 
+
 //AD:04-06-09
 void wxContourMainFrame::openContours( FILE *pFile, FILE *pFileData, bool staticContour )
 {
 
-printf("EED1 wxContourMainFrame::openContours 01 \n");
        char tmp[255];
 
-       vtkImageData    *image          = _images[0];
+       vtkImageData    *image = _images[0];
 
        int             imageDim[3];
        double          imageSpac[3];
@@ -1301,7 +1324,6 @@ printf("EED1 wxContourMainFrame::openContours 01 \n");
        else if (compatible==false)
        {
 */
-printf("EED wxContourMainFrame::openContours 02 \n");
 
                int i;
                for (i=0;i<numberOfContours;i++)

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 3e643b1a07079d20f6183ce217cad0c80404fded..90361d379e70f17022f0f82cca6f918c118a69e3 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -368,7 +368,7 @@ private:
     int             _tmpReadFileImageDim[3];
        double          _tmpReadFileImageSpac[3];
     int             _tmpReadFileTypeOfTransformation;
-    void readDimSpc(FILE *pFile);
+    void readDimSpc(FILE *pFile, bool interactiveOption);
 
 
        /*DECLARE_CLASS(wxContourMainFrame)
@@ -383,9 +383,11 @@ private:
 
        void saveState();
        void loadState(std::string filename);
-       void loadContours( FILE *pFile, bool staticContour );
+       
+//     void loadContours( FILE *pFile, bool staticContour );
+       
        void saveFileWithContours( std::string filename );
-       void onLoadContours(std::string fileNameContourROI);
+       void onLoadContours(std::string fileNameContourROI, bool interactiveInterface);
 
        int                         inredo;
        int                         inundo;