Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:brassh:branches:science
ElmerFEM
qt5-include.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File qt5-include.patch of Package ElmerFEM
--- elmerfem/./ElmerGUI/Application/src/convergenceview.cpp 2019-02-23 12:49:17.201526898 +0100 +++ elmerfem-patched/./ElmerGUI/Application/src/convergenceview.cpp 2019-02-17 18:05:12.905364940 +0100 @@ -38,7 +38,13 @@ * * *****************************************************************************/ -#include <QtGui> +//#include <QtGui> +#include <QAction> +#include <QMenu> +#include <QMenuBar> +#include <QStatusBar> +#include <QFileInfo> +#include <QFileDialog> #include <iostream> #include "convergenceview.h" --- elmerfem/./ElmerGUI/Application/vtkpost/colorbar.cpp 2019-02-23 12:49:17.205526894 +0100 +++ elmerfem-patched/./ElmerGUI/Application/vtkpost/colorbar.cpp 2019-02-17 18:12:19.484738331 +0100 @@ -189,7 +189,7 @@ colorBarActor->GetTitleTextProperty()->SetColor(0, 0, 1); if(annotate) { - colorBarActor->SetTitle(fieldName.toAscii().data()); + colorBarActor->SetTitle(fieldName.toLatin1().data()); } else { colorBarActor->SetTitle(""); } --- elmerfem/./ElmerGUI/Application/vtkpost/ecmaconsole.cpp 2019-02-23 12:49:17.205526894 +0100 +++ elmerfem-patched/./ElmerGUI/Application/vtkpost/ecmaconsole.cpp 2019-02-17 18:47:12.221546089 +0100 @@ -52,6 +52,8 @@ #include <QCompleter> #include <QStringListModel> #include <QScrollBar> +#include <QAbstractItemView> + #include <iostream> using namespace std; @@ -210,9 +212,10 @@ QMetaMethod::Access access = method.access(); QMetaMethod::MethodType methodType = method.methodType(); if((access == QMetaMethod::Public) && (methodType == QMetaMethod::Slot)) { - QString signature = method.signature(); - int j = signature.indexOf("("); - QString slotName = signature.left(j); + //QString signature = method.methodSignature(); + //int j = signature.indexOf("("); + //QString slotName = signature.left(j); + QString slotName = method.name(); publicSlots << slotName; } } --- elmerfem/./ElmerGUI/Application/vtkpost/matc.cpp 2019-02-23 12:49:17.209526891 +0100 +++ elmerfem-patched/./ElmerGUI/Application/vtkpost/matc.cpp 2019-02-17 18:49:59.597174095 +0100 @@ -63,18 +63,18 @@ mtc_init( NULL, stdout, stderr ); QString elmerGuiHome = getenv("ELMERGUI_HOME"); QString mcIniLoad = "source(\"" + elmerGuiHome.replace("\\", "/") + "/edf/mc.ini\")"; - mtc_domath( mcIniLoad.toAscii().data() ); + mtc_domath( mcIniLoad.toLatin1().data() ); - com_init( (char *)"grad", FALSE, FALSE, com_grad, 1, 1, + com_init( (char *)"grad", false, false, com_grad, 1, 1, (char *)"r = grad(f): compute gradient of a scalar variable f.\n") ; - com_init( (char *)"div", FALSE, FALSE, com_div, 1, 1, + com_init( (char *)"div", false, false, com_div, 1, 1, (char *)"r = div(f): compute divergence of a vector variable f.\n") ; - com_init( (char *)"curl", FALSE, FALSE, com_curl, 1, 1, + com_init( (char *)"curl", false, false, com_curl, 1, 1, (char *)"r = curl(f): compute curl of a vector variable f.\n") ; - com_init( (char *)"display", FALSE, FALSE, com_display, 0, 0, (char *)"display\n" ); + com_init( (char *)"display", false, false, com_display, 0, 0, (char *)"display\n" ); } @@ -280,7 +280,7 @@ QString cmd=ui.mcEdit->text().trimmed(); ui.mcEdit->clear(); - ptr=mtc_domath(cmd.toAscii().data()); + ptr=mtc_domath(cmd.toLatin1().data()); ui.mcHistory->append(cmd); res = ""; if ( ptr ) { --- elmerfem/./ElmerGUI/Application/vtkpost/readepfile.cpp 2019-02-23 12:49:17.209526891 +0100 +++ elmerfem-patched/./ElmerGUI/Application/vtkpost/readepfile.cpp 2019-02-17 18:13:59.875363885 +0100 @@ -38,7 +38,9 @@ * * *****************************************************************************/ -#include <QtGui> +//#include <QtGui> +#include <QFileDialog> +#include <QTextStream> #include <iostream> #include "readepfile.h" --- elmerfem/./ElmerGUI/Application/vtkpost/streamline.cpp 2019-02-23 12:49:17.209526891 +0100 +++ elmerfem-patched/./ElmerGUI/Application/vtkpost/streamline.cpp 2019-02-17 18:37:18.576499656 +0100 @@ -50,7 +50,8 @@ #include <vtkPointData.h> #include <vtkPointSource.h> #include <vtkLineSource.h> -#include <vtkStreamLine.h> +//#include <vtkStreamLine.h> +#include <vtkStreamTracer.h> #include <vtkRungeKutta4.h> #include <vtkRibbonFilter.h> #include <vtkPolyDataMapper.h> @@ -289,7 +290,7 @@ } } - vtkStreamLine* streamer = vtkStreamLine::New(); + vtkStreamTracer* streamer = vtkStreamTracer::New(); vtkRungeKutta4* integrator = vtkRungeKutta4::New(); #if VTK_MAJOR_VERSION <= 5 @@ -313,17 +314,17 @@ } streamer->SetIntegrator(integrator); - streamer->SetMaximumPropagationTime(propagationTime); - streamer->SetIntegrationStepLength(integStepLength); + streamer->SetMaximumPropagation(propagationTime); + streamer->SetInitialIntegrationStep(integStepLength); if(forward && backward) { - streamer->SetIntegrationDirectionToIntegrateBothDirections(); + streamer->SetIntegrationDirectionToBoth(); } else if(forward) { streamer->SetIntegrationDirectionToForward(); } else { streamer->SetIntegrationDirectionToBackward(); } - streamer->SetStepLength(stepLength); - streamer->SetNumberOfThreads(threads); + // streamer->SetStepLength(stepLength); + // streamer->SetNumberOfThreads(threads); vtkRibbonFilter* ribbon = vtkRibbonFilter::New(); --- elmerfem/./ElmerGUI/Application/vtkpost/text.cpp 2019-02-23 12:49:17.209526891 +0100 +++ elmerfem-patched/./ElmerGUI/Application/vtkpost/text.cpp 2019-02-17 18:47:42.874211848 +0100 @@ -102,7 +102,7 @@ if(textActor == NULL) return; textActor->SetDisplayPosition(posX, posY); - textActor->SetInput(message.toAscii().data()); + textActor->SetInput(message.toLatin1().data()); vtkTextProperty* tprop = textActor->GetTextProperty(); if(tprop == NULL) return; --- elmerfem/./ElmerGUI/Application/vtkpost/timestep.cpp 2019-02-23 12:49:17.209526891 +0100 +++ elmerfem-patched/./ElmerGUI/Application/vtkpost/timestep.cpp 2019-02-17 18:38:19.229848610 +0100 @@ -38,7 +38,8 @@ * * *****************************************************************************/ -#include <QtGui> +//#include <QtGui> +#include <QFileDialog> #include <iostream> #include <vtkRenderWindow.h> #include <vtkWindowToImageFilter.h> @@ -131,7 +132,7 @@ vtkPNGWriter *writer = vtkPNGWriter::New(); writer->SetInputConnection(image->GetOutputPort()); - writer->SetFileName(fileName.toAscii().data()); + writer->SetFileName(fileName.toLatin1().data()); renderWindow->Render(); writer->Write(); --- elmerfem/./ElmerGUI/Application/vtkpost/vtkpost.cpp 2019-02-23 12:49:17.209526891 +0100 +++ elmerfem-patched/./ElmerGUI/Application/vtkpost/vtkpost.cpp 2019-02-17 18:11:20.991184446 +0100 @@ -38,8 +38,15 @@ * * *****************************************************************************/ -#include <QtGui> +//#include <QtGui> +#include <QAction> +#include <QMenu> +#include <QMenuBar> +#include <QToolBar> #include <QScriptEngine> +#include <QFileDialog> +#include <QProgressDialog> +#include <QMessageBox> #include <iostream> #include "epmesh.h" @@ -1039,7 +1046,7 @@ for(int i = 0; i < scalarFields; i++ ) { ScalarField *sf = &scalarField[i]; #ifdef EG_MATC - QByteArray nm = sf->name.trimmed().toAscii(); + QByteArray nm = sf->name.trimmed().toLatin1(); var_delete( nm.data() ); #else if(sf->value) free(sf->value); @@ -1065,8 +1072,8 @@ fieldType = fieldType.trimmed(); fieldName = fieldName.trimmed(); - cout << fieldType.toAscii().data() << ": "; - cout << fieldName.toAscii().data() << endl; + cout << fieldType.toLatin1().data() << ": "; + cout << fieldName.toLatin1().data() << endl; if(fieldType == "scalar") addScalarField(fieldName, nodes*timesteps, NULL); @@ -1184,8 +1191,8 @@ name = sf->name.mid(0,n); QString cmd = name+"="+name+"(0:2,0:"+QString::number(sf->values-1)+")"; - mtc_domath(cmd.toAscii().data()); - VARIABLE *var = var_check(name.toAscii().data()); + mtc_domath(cmd.toLatin1().data()); + VARIABLE *var = var_check(name.toLatin1().data()); sf = &scalarField[ifield]; sf->value = &M(var,0,0); @@ -1205,7 +1212,7 @@ } else { size=sf->values*sizeof(double); - VARIABLE *var = var_check(name.toAscii().data()); + VARIABLE *var = var_check(name.toLatin1().data()); sf->value = (double *)ALLOC_PTR(realloc( ALLOC_LST(sf->value), ALLOC_SIZE(size)) ); MATR(var) = sf->value; @@ -1288,7 +1295,7 @@ { #ifdef EG_MATC - QByteArray nm=fieldName.trimmed().toAscii(); + QByteArray nm=fieldName.trimmed().toLatin1(); char *name = (char *)malloc( nm.count()+1 ); strcpy(name,nm.data()); @@ -1324,7 +1331,7 @@ if ( !sf->value ) { #ifdef EG_MATC - QByteArray nm=fieldName.trimmed().toAscii(); + QByteArray nm=fieldName.trimmed().toLatin1(); char *name = (char *)malloc( nm.count()+1 ); strcpy(name,nm.data()); @@ -2713,7 +2720,7 @@ vtkPNGWriter* writer = vtkPNGWriter::New(); writer->SetInputConnection(image->GetOutputPort()); - writer->SetFileName(fileName.toAscii().data()); + writer->SetFileName(fileName.toLatin1().data()); qvtkWidget->GetRenderWindow()->Render(); writer->Write();
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor