diff -r 359217d2a49b -r 69d648a0a15b mapeditor.cpp --- a/mapeditor.cpp Thu Mar 23 12:38:54 2006 +0000 +++ b/mapeditor.cpp Thu Mar 23 12:38:55 2006 +0000 @@ -219,6 +219,9 @@ blockReposition=false; blockSaveState=false; + + hidemode=HideNone; + isInteractive=interactive; if (isInteractive) // Create temporary files @@ -1038,13 +1041,39 @@ return pix; } +void MapEditor::setHideTmpMode (HideTmpMode mode) +{ + hidemode=mode; + mapCenter->setHideTmp (hidemode); + mapCenter->reposition(); + adjustCanvasSize(); + canvas()->update(); +} + +HideTmpMode MapEditor::getHideTmpMode() +{ + return hidemode; +} + void MapEditor::exportImage(QString fn) { // Finish open lineEdits if (lineedit) finishedLineEditNoSave(); + setExportMode (true); QPixmap pix (getPixmap()); pix.save(fn, "PNG"); + setExportMode (false); +} + +void MapEditor::setExportMode (bool b) +{ + // should be called before and after exports + // depending on the settings + if (b && settings.readEntry("/vym/export/useHideExport","yes")) + setHideTmpMode (HideExport); + else + setHideTmpMode (HideNone); } void MapEditor::exportImage(QString fn, int item) @@ -1052,8 +1081,10 @@ // Finish open lineEdits if (lineedit) finishedLineEditNoSave(); + setExportMode (true); QPixmap pix (getPixmap()); pix.save(fn, exportImageFormatMenu->text(item) ); + setExportMode (false); } void MapEditor::exportOOPresentation(const QString &fn, const QString &cf) @@ -1061,13 +1092,21 @@ ExportOO ex; ex.setFile (fn); ex.setMapCenter(mapCenter); - if (ex.setConfigFile(cf)) ex.exportPresentation(); + if (ex.setConfigFile(cf)) + { + setExportMode (true); + ex.exportPresentation(); + setExportMode (false); + } } void MapEditor::exportXML(const QString &dir) { + // Hide stuff during export, if settings want this + setExportMode (true); + // Create subdirectories makeSubDirs (dir); @@ -1091,6 +1130,8 @@ // Now write image, too exportImage (dir+"/images/"+mapName+".png"); + + setExportMode (false); } void MapEditor::clear() @@ -2970,15 +3011,30 @@ void MapEditor::testFunction() { cout << "MapEditor::testFunction() called\n"; - mapCenter->reposition(); - adjustCanvasSize(); - - /* - if (selection && (typeid(*selection) == typeid(BranchObj))) + + if (hidemode==HideNone) { - cout << "Note:\n"<<((BranchObj*)selection)->getNoteOpenDoc()<calcBBoxSizeWithChilds(); + QRect totalBBox=mapCenter->getTotalBBox(); + QRect mapRect=totalBBox; + QCanvasRectangle *frame=NULL; + + cout << " map has =("<setBrush (QColor(white)); + frame->setPen (QColor(black)); + frame->setZ(0); + frame->show(); + } + else + { + setHideTmpMode (HideNone); + } + cout <<" hidemode="<